chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clear out /boot in the squashfs

Browse source 
Copy System.map instead of moving from /usr/livecd

svn path=/trunk/; revision=535
This commit is contained in:
Andrew Gaffney 2008-06-11 14:50:46 +00:00
parent c8c5a57489
commit 0dd1ba6c0b
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/2008.0/ChangeLog
View file

@ -2,6 +2,10 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
11 Jun 2008; Andrew Gaffney <agaffney@gentoo.org> scripts/livecd.sh:
Clear out /boot in the squashfs
Copy System.map instead of moving from /usr/livecd
06 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> scripts/livecd.sh: 06 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> scripts/livecd.sh:
Don't run the kernel copying code unless we're booting from CD. Don't run the kernel copying code unless we're booting from CD.

3
releases/2008.0/scripts/livecd.sh
View file

@ -45,6 +45,7 @@ echo "tmpfs /boot tmpfs defaults 0 0" >> /etc/fstab
# pull /boot from the CD # pull /boot from the CD
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
rm -rf /boot/*
cat << EOF >> /etc/conf.d/local.start cat << EOF >> /etc/conf.d/local.start
if [ -n "$(ls /mnt/cdrom)" ] if [ -n "$(ls /mnt/cdrom)" ]
then then
@ -55,7 +56,7 @@ then
kernel=`grep kernel /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/*/${INITRAMFS} /boot/${initramfs}
cp -f /mnt/cdrom/*/${KERNEL} /boot/${kernel} cp -f /mnt/cdrom/*/${KERNEL} /boot/${kernel}
mv -f /usr/livecd/System.map* /boot cp -f /usr/livecd/System.map* /boot
fi fi
EOF EOF