livecd: functions-live, installer/installer.sh, remaster/livecd_ge...
havner
havner at pld-linux.org
Thu Jan 26 21:26:48 CET 2006
Author: havner Date: Thu Jan 26 20:26:47 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- dont use $KERNEL-VERSION anymore
- s/kernel/kernel-grsecurity
---- Files affected:
livecd:
functions-live (1.8 -> 1.9)
livecd/installer:
installer.sh (1.114 -> 1.115)
livecd/remaster:
livecd_gen_initrd (1.1 -> 1.2)
---- Diffs:
================================================================
Index: livecd/functions-live
diff -u livecd/functions-live:1.8 livecd/functions-live:1.9
--- livecd/functions-live:1.8 Thu Jan 26 20:54:12 2006
+++ livecd/functions-live Thu Jan 26 21:26:42 2006
@@ -1,5 +1,4 @@
LIVECD_VERSION=1.0-rc3
-KERNEL_VERSION=2.6.10
NVIDIA_VERSION=1.0.6629
SYMLINKS="
================================================================
Index: livecd/installer/installer.sh
diff -u livecd/installer/installer.sh:1.114 livecd/installer/installer.sh:1.115
--- livecd/installer/installer.sh:1.114 Thu Jan 26 20:49:26 2006
+++ livecd/installer/installer.sh Thu Jan 26 21:26:42 2006
@@ -457,7 +457,9 @@
show "Generating initrd"
busy
- chroot /tmp/dst geninitrd -f /boot/initrd $KERNEL_VERSION
+ V=`rpm --qf "%{VERSION}" -q kernel-grsecurity`
+ R=`rpm --qf "%{RELEASE}" -q kernel-grsecurity`
+ chroot /tmp/dst geninitrd -f /boot/initrd $V-$R
ok
show "Cleaning"
================================================================
Index: livecd/remaster/livecd_gen_initrd
diff -u livecd/remaster/livecd_gen_initrd:1.1 livecd/remaster/livecd_gen_initrd:1.2
--- livecd/remaster/livecd_gen_initrd:1.1 Sun May 22 18:42:44 2005
+++ livecd/remaster/livecd_gen_initrd Thu Jan 26 21:26:42 2006
@@ -172,8 +172,8 @@
rm -rf *
echo "Preparing new directory tree..."
-V=`rpm --root $ROOTFS --qf "%{VERSION}" -q kernel`
-R=`rpm --root $ROOTFS --qf "%{RELEASE}" -q kernel`
+V=`rpm --root $ROOTFS --qf "%{VERSION}" -q kernel-grsecurity`
+R=`rpm --root $ROOTFS --qf "%{RELEASE}" -q kernel-grsecurity`
mkdir -p $V-$R/kernel
ln -s $V-$R $V
cd $V-$R/kernel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/functions-live?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/livecd/installer/installer.sh?r1=1.114&r2=1.115&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_gen_initrd?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list