Gentoo Archives: gentoo-commits

From: "Andrew Gaffney (agaffney)" <agaffney@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] releng r555 - in trunk/releases/2008.0: . scripts
Date: Mon, 30 Jun 2008 20:17:44
Message-Id: E1KDPoh-0001MR-Cm@stork.gentoo.org
1 Author: agaffney
2 Date: 2008-06-30 20:17:38 +0000 (Mon, 30 Jun 2008)
3 New Revision: 555
4
5 Modified:
6 trunk/releases/2008.0/ChangeLog
7 trunk/releases/2008.0/scripts/livecd.sh
8 Log:
9 Look for a .igz extension on the initramfs instead of .gz
10
11 Modified: trunk/releases/2008.0/ChangeLog
12 ===================================================================
13 --- trunk/releases/2008.0/ChangeLog 2008-06-30 18:32:30 UTC (rev 554)
14 +++ trunk/releases/2008.0/ChangeLog 2008-06-30 20:17:38 UTC (rev 555)
15 @@ -3,6 +3,9 @@
16 # $Header: $
17
18 30 Jun 2008; Andrew Gaffney <agaffney@g.o> scripts/livecd.sh:
19 + Look for a .igz extension on the initramfs instead of .gz
20 +
21 + 30 Jun 2008; Andrew Gaffney <agaffney@g.o> scripts/livecd.sh:
22 Quote EOF in fsscript to prevent interpolation at build time
23
24 13 Jun 2008; Brent Baude <ranger@g.o>
25
26 Modified: trunk/releases/2008.0/scripts/livecd.sh
27 ===================================================================
28 --- trunk/releases/2008.0/scripts/livecd.sh 2008-06-30 18:32:30 UTC (rev 554)
29 +++ trunk/releases/2008.0/scripts/livecd.sh 2008-06-30 20:17:38 UTC (rev 555)
30 @@ -49,9 +49,9 @@
31 cat << 'EOF' >> /etc/conf.d/local.start
32 if [ -n "$(ls /mnt/cdrom)" ]
33 then
34 - INITR_TMP=`ls -1 /mnt/cdrom/*/*.gz | head -n 1`
35 + INITR_TMP=`ls -1 /mnt/cdrom/{boot,isolinux}/*.igz | head -n 1`
36 INITRAMFS=`basename ${INITR_TMP}`
37 - KERNEL=${INITRAMFS/.gz/}
38 + KERNEL=${INITRAMFS/.igz/}
39 initramfs=`grep initr /usr/livecd/bootfiles.txt | head -n 1`
40 kernel=`grep kernel /usr/livecd/bootfiles.txt | head -n 1`
41 cp -f /mnt/cdrom/*/${INITRAMFS} /boot/${initramfs}
42
43 --
44 gentoo-commits@l.g.o mailing list