Don't run the kernel copying code unless we're booting from CD.

svn path=/trunk/; revision=534
This commit is contained in:
Chris Gianelloni 2008-06-06 04:04:00 +00:00
parent 8ee6fcfdbe
commit c8c5a57489
2 changed files with 14 additions and 8 deletions

View file

@ -2,6 +2,9 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
06 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> scripts/livecd.sh:
Don't run the kernel copying code unless we're booting from CD.
06 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> scripts/livecd.sh:
Re-create /etc/fstab in the fsscript and add code to local.start to copy the
kernel/initramfs from the CD's root and rename it to what was built by

View file

@ -46,13 +46,16 @@ echo "tmpfs /boot tmpfs defaults 0 0" >> /etc/fstab
cd /boot && ls -1 | grep -v boot > /usr/livecd/bootfiles.txt
mv -f System.map* /usr/livecd
cat << EOF >> /etc/conf.d/local.start
INITR_TMP=`ls -1 /mnt/cdrom/*/*.gz | head -n 1`
INITRAMFS=`basename ${INITR_TMP}`
KERNEL=${INITRAMFS/.gz/}
initramfs=`grep initr /usr/livecd/bootfiles.txt | head -n 1`
kernel=`grep kernel /usr/livecd/bootfiles.txt | head -n 1`
cp -f /mnt/cdrom/*/${INITRAMFS} /boot/${initramfs}
cp -f /mnt/cdrom/*/${KERNEL} /boot/${kernel}
mv -f /usr/livecd/System.map* /boot
if [ -n "$(ls /mnt/cdrom)" ]
then
INITR_TMP=`ls -1 /mnt/cdrom/*/*.gz | head -n 1`
INITRAMFS=`basename ${INITR_TMP}`
KERNEL=${INITRAMFS/.gz/}
initramfs=`grep initr /usr/livecd/bootfiles.txt | head -n 1`
kernel=`grep kernel /usr/livecd/bootfiles.txt | head -n 1`
cp -f /mnt/cdrom/*/${INITRAMFS} /boot/${initramfs}
cp -f /mnt/cdrom/*/${KERNEL} /boot/${kernel}
mv -f /usr/livecd/System.map* /boot
fi
EOF