public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] releng r559 - in trunk/releases/2008.0: . scripts
@ 2008-07-06 22:14 Andrew Gaffney (agaffney)
  0 siblings, 0 replies; only message in thread
From: Andrew Gaffney (agaffney) @ 2008-07-06 22:14 UTC (permalink / raw
  To: gentoo-commits

Author: agaffney
Date: 2008-07-06 22:14:25 +0000 (Sun, 06 Jul 2008)
New Revision: 559

Modified:
   trunk/releases/2008.0/ChangeLog
   trunk/releases/2008.0/scripts/livecd.sh
Log:
Be more specific in grep for kernel filename

Modified: trunk/releases/2008.0/ChangeLog
===================================================================
--- trunk/releases/2008.0/ChangeLog	2008-07-06 20:43:49 UTC (rev 558)
+++ trunk/releases/2008.0/ChangeLog	2008-07-06 22:14:25 UTC (rev 559)
@@ -3,6 +3,9 @@
 # $Header: $
 
   06 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> scripts/livecd.sh:
+  Be more specific in grep for kernel filename
+
+  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> 

Modified: trunk/releases/2008.0/scripts/livecd.sh
===================================================================
--- trunk/releases/2008.0/scripts/livecd.sh	2008-07-06 20:43:49 UTC (rev 558)
+++ trunk/releases/2008.0/scripts/livecd.sh	2008-07-06 22:14:25 UTC (rev 559)
@@ -55,7 +55,7 @@
 	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`
+	kernel=`grep '^kernel-' /usr/livecd/bootfiles.txt | head -n 1`
 	cp -f ${INITRAMFS} /boot/${initramfs}
 	cp -f ${KERNEL} /boot/${kernel}
 	cp -f /usr/livecd/System.map* /boot

-- 
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 22:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-06 22:14 [gentoo-commits] releng r559 - 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