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

Another attempt to fix this stupid /boot bait-and-switch

Browse source 
svn path=/trunk/; revision=558
This commit is contained in:
Andrew Gaffney 2008-07-06 20:43:49 +00:00
parent 51e026d44f
commit ab96461dc2
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
releases/2008.0/ChangeLog
View file

@ -2,6 +2,9 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
06 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> scripts/livecd.sh:
Another attempt to fix this stupid /boot bait-and-switch
13 Jun 2008; Brent Baude <ranger@gentoo.org>
kconfig/powerpc/installcd-ppc32apple-2.6.24.config, kconfig/powerpc/installcd-ppc64apple-2.6.24.config
kconfig/powerpc/installcd-ibm-2.6.24.config

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

@ -40,7 +40,7 @@ echo "#####################################################" >> /etc/fstab
echo "tmpfs / tmpfs defaults 0 0" >> /etc/fstab
echo "tmpfs /lib/firmware tmpfs defaults 0 0" >> /etc/fstab
echo "tmpfs /usr/portage tmpfs defaults 0 0" >> /etc/fstab
echo "tmpfs /boot tmpfs defaults 0 0" >> /etc/fstab
#echo "tmpfs /boot tmpfs defaults 0 0" >> /etc/fstab
# pull /boot from the CD
cd /boot && ls -1 | grep -v boot > /usr/livecd/bootfiles.txt
@ -49,13 +49,15 @@ rm -rf /boot/*
cat << 'EOF' >> /etc/conf.d/local.start
if [ -n "$(ls /mnt/cdrom)" ]
then
INITR_TMP=`ls -1 /mnt/cdrom/{boot,isolinux}/*.igz | head -n 1`
INITRAMFS=`basename ${INITR_TMP}`
rm /boot
mkdir /boot
mount -t tmpfs tmpfs /boot
INITRAMFS=`ls -1 /mnt/cdrom/{boot,isolinux}/*.igz 2>/dev/null | head -n 1`
KERNEL=${INITRAMFS/.igz/}
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}
cp -f ${INITRAMFS} /boot/${initramfs}
cp -f ${KERNEL} /boot/${kernel}
cp -f /usr/livecd/System.map* /boot
fi
EOF