* [gentoo-commits] releng r558 - in trunk/releases/2008.0: . scripts
@ 2008-07-06 20:43 Andrew Gaffney (agaffney)
0 siblings, 0 replies; only message in thread
From: Andrew Gaffney (agaffney) @ 2008-07-06 20:43 UTC (permalink / raw
To: gentoo-commits
Author: agaffney
Date: 2008-07-06 20:43:49 +0000 (Sun, 06 Jul 2008)
New Revision: 558
Modified:
trunk/releases/2008.0/ChangeLog
trunk/releases/2008.0/scripts/livecd.sh
Log:
Another attempt to fix this stupid /boot bait-and-switch
Modified: trunk/releases/2008.0/ChangeLog
===================================================================
--- trunk/releases/2008.0/ChangeLog 2008-07-01 15:20:31 UTC (rev 557)
+++ trunk/releases/2008.0/ChangeLog 2008-07-06 20:43:49 UTC (rev 558)
@@ -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
Modified: trunk/releases/2008.0/scripts/livecd.sh
===================================================================
--- trunk/releases/2008.0/scripts/livecd.sh 2008-07-01 15:20:31 UTC (rev 557)
+++ trunk/releases/2008.0/scripts/livecd.sh 2008-07-06 20:43:49 UTC (rev 558)
@@ -40,7 +40,7 @@
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 @@
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
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-07-06 20:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-06 20:43 [gentoo-commits] releng r558 - in trunk/releases/2008.0: . scripts Andrew Gaffney (agaffney)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox