Don't run the kernel copying code unless we're booting from CD.
svn path=/trunk/; revision=534
This commit is contained in:
parent
8ee6fcfdbe
commit
c8c5a57489
2 changed files with 14 additions and 8 deletions
|
@ -2,6 +2,9 @@
|
||||||
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
|
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
|
||||||
# $Header: $
|
# $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:
|
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
|
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
|
kernel/initramfs from the CD's root and rename it to what was built by
|
||||||
|
|
|
@ -46,13 +46,16 @@ echo "tmpfs /boot tmpfs defaults 0 0" >> /etc/fstab
|
||||||
cd /boot && ls -1 | grep -v boot > /usr/livecd/bootfiles.txt
|
cd /boot && ls -1 | grep -v boot > /usr/livecd/bootfiles.txt
|
||||||
mv -f System.map* /usr/livecd
|
mv -f System.map* /usr/livecd
|
||||||
cat << EOF >> /etc/conf.d/local.start
|
cat << EOF >> /etc/conf.d/local.start
|
||||||
INITR_TMP=`ls -1 /mnt/cdrom/*/*.gz | head -n 1`
|
if [ -n "$(ls /mnt/cdrom)" ]
|
||||||
INITRAMFS=`basename ${INITR_TMP}`
|
then
|
||||||
KERNEL=${INITRAMFS/.gz/}
|
INITR_TMP=`ls -1 /mnt/cdrom/*/*.gz | head -n 1`
|
||||||
initramfs=`grep initr /usr/livecd/bootfiles.txt | head -n 1`
|
INITRAMFS=`basename ${INITR_TMP}`
|
||||||
kernel=`grep kernel /usr/livecd/bootfiles.txt | head -n 1`
|
KERNEL=${INITRAMFS/.gz/}
|
||||||
cp -f /mnt/cdrom/*/${INITRAMFS} /boot/${initramfs}
|
initramfs=`grep initr /usr/livecd/bootfiles.txt | head -n 1`
|
||||||
cp -f /mnt/cdrom/*/${KERNEL} /boot/${kernel}
|
kernel=`grep kernel /usr/livecd/bootfiles.txt | head -n 1`
|
||||||
mv -f /usr/livecd/System.map* /boot
|
cp -f /mnt/cdrom/*/${INITRAMFS} /boot/${initramfs}
|
||||||
|
cp -f /mnt/cdrom/*/${KERNEL} /boot/${kernel}
|
||||||
|
mv -f /usr/livecd/System.map* /boot
|
||||||
|
fi
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue