livecd: remaster/livecd_gen_initrd, remaster/livecd_gen_iso - kern...
havner
havner at pld-linux.org
Thu Jan 26 21:49:24 CET 2006
Author: havner Date: Thu Jan 26 20:49:24 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- kernel checking
- initrd preparation script runned inside gen_iso
---- Files affected:
livecd/remaster:
livecd_gen_initrd (1.3 -> 1.4) , livecd_gen_iso (1.11 -> 1.12)
---- Diffs:
================================================================
Index: livecd/remaster/livecd_gen_initrd
diff -u livecd/remaster/livecd_gen_initrd:1.3 livecd/remaster/livecd_gen_initrd:1.4
--- livecd/remaster/livecd_gen_initrd:1.3 Thu Jan 26 21:36:02 2006
+++ livecd/remaster/livecd_gen_initrd Thu Jan 26 21:49:19 2006
@@ -174,8 +174,16 @@
rm -rf *
echo "Preparing new directory tree..."
-V=`rpm --root $ROOTFS --qf "%{VERSION}" -q kernel-grsecurity`
-R=`rpm --root $ROOTFS --qf "%{RELEASE}" -q kernel-grsecurity`
+if rpm --root $ROOTFS -q kernel-grsecurity > /dev/null; then
+ KERNEL=kernel-grsecurity
+elif rpm --root $ROOTFS -q kernel > /dev/null; then
+ KERNEL=kernel
+else
+ echo "There is no kernel installed in $ROOTFS"
+ exit 1
+fi
+V=`rpm --root $ROOTFS --qf "%{VERSION}" -q $KERNEL`
+R=`rpm --root $ROOTFS --qf "%{RELEASE}" -q $KERNEL`
mkdir -p $V-$R/kernel
ln -s $V-$R $V
cd $V-$R/kernel
================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.11 livecd/remaster/livecd_gen_iso:1.12
--- livecd/remaster/livecd_gen_iso:1.11 Thu Jan 26 21:08:24 2006
+++ livecd/remaster/livecd_gen_iso Thu Jan 26 21:49:19 2006
@@ -34,6 +34,17 @@
exit 1
fi
+# preparation, external scripts
+
+if [ ! -f "`which livecd_gen_initrd`" ]; then
+ echo "There is no livecd_gen_initrd script."
+ exit 1
+fi
+if ! livecd_gen_initrd; then
+ echo "Initrd preparation script failed."
+ exit 1
+fi
+
echo Running fix_live
chroot $ROOTFS /usr/local/bin/fix_live
echo done
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/remaster/livecd_gen_initrd?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_gen_iso?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list