[Lunar-commits] r23168 - in moonbase/trunk/utils/lilo: . plugin.d

[Moritz Heiber]

Author: moe
Date: 2007-02-07 19:16:09 +0100 (Wed, 07 Feb 2007)
New Revision: 23168

Modified:
   moonbase/trunk/utils/lilo/DETAILS
   moonbase/trunk/utils/lilo/plugin.d/bootloader-lilo.plugin
Log:
Fixing bug #169 with sofar's suggestion. Works pretty well.
Also bumped the updated field as per sofar's request.



Modified: moonbase/trunk/utils/lilo/DETAILS
===================================================================
--- moonbase/trunk/utils/lilo/DETAILS	2007-02-07 14:05:11 UTC (rev 23167)
+++ moonbase/trunk/utils/lilo/DETAILS	2007-02-07 18:16:09 UTC (rev 23168)
@@ -8,7 +8,7 @@
      SOURCE2_VFY=sha1:ba31e2b3e36f07fbb8ee6b3bc407cb3d0ed154b4
         WEB_SITE=http://home.san.rr.com/johninsd/pub/linux/lilo/
          ENTERED=20010922
-         UPDATED=20060831
+         UPDATED=20070207
            SHORT="Boot loader for Linux/x86 and other PC operating systems."
 cat << EOF
 Lilo is a Boot loader for Linux/x86 and other PC operating systems.

Modified: moonbase/trunk/utils/lilo/plugin.d/bootloader-lilo.plugin
===================================================================
--- moonbase/trunk/utils/lilo/plugin.d/bootloader-lilo.plugin	2007-02-07 14:05:11 UTC (rev 23167)
+++ moonbase/trunk/utils/lilo/plugin.d/bootloader-lilo.plugin	2007-02-07 18:16:09 UTC (rev 23168)
@@ -70,7 +70,7 @@
 		(( IMAGE_COUNT=0 ))
 		unset IMAGE OTHER LABEL OPTIONS
 		# list old images
-		while read LINE ; do
+		sed -n '/other\|image/,$p' /etc/lilo.conf | while read LINE ; do
 			if echo $LINE | grep -qw "image\|other" ; then
 				(( IMAGE_COUNT++ ))
 				
@@ -99,8 +99,7 @@
 					OPTIONS=( "${OPTIONS[@]}" "$LINE" )
 					;;
 			esac
-		done < <(sed -n '/other\|image/,$p' /etc/lilo.conf)
-
+		done;
 		# write the last one too
 		if [ -n "$LABEL" ] ;then
 			output_image $1 $2