commit lilo

12 Sep 2007

Hello community,

here is the log from the commit of package lilo
checked in at Wed Sep 12 16:54:29 CEST 2007.

--------

--- arch/ppc/lilo/lilo.changes	2007-08-28 13:33:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes	2007-09-11 11:56:43.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 11 11:55:58 CEST 2007 - olh@suse.de
+
+- add quotes about shell variables, and handle missing initrd
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.sM4073/_old	2007-09-12 16:53:45.000000000 +0200
+++ /var/tmp/diff_new_pack.sM4073/_new	2007-09-12 16:53:45.000000000 +0200
@@ -24,7 +24,7 @@
 Requires:       binutils
 Requires:       parted
 Version:        10.1.22
-Release:        66
+Release:        69
 Source0:        lilo-%{version}.tar.bz2
 Source1:        http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
 # $Id: lilo.spec 985 2007-07-26 10:53:09Z olh $
@@ -155,6 +155,8 @@
 %doc %{_mandir}/*/*
 
 %changelog
+* Tue Sep 11 2007 - olh@suse.de
+- add quotes about shell variables, and handle missing initrd
 * Tue Aug 28 2007 - olh@suse.de
 - add a timeout=20 to initial kboot.conf on PS3
 * Tue Aug 28 2007 - olh@suse.de

++++++ lilo-10.1.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/lilo.new new/lilo-10.1.22/lilo.new
--- old/lilo-10.1.22/lilo.new	2007-08-28 13:33:16.000000000 +0200
+++ new/lilo-10.1.22/lilo.new	2007-09-11 11:56:43.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/bash
 # vim: syntax=sh ts=4
-# $Id: lilo.new 1020 2007-08-28 11:33:16Z olh $
+# $Id: lilo.new 1023 2007-09-11 09:56:43Z olh $
 #
 # a simple lilo to store the boot loader and the kernel images 
 # in bash2 ... Think different [tm]
@@ -878,7 +878,7 @@
     fi
     
     for (( i=1; i < CONFIG_IMAGE_COUNT; i++ )); do
-	if [ -f ${CONFIG_IMAGE_FILE[$i]} ] ; then
+	if [ -f "${CONFIG_IMAGE_FILE[$i]}" ] ; then
 	    CONFIG_IMAGE_FILE_DISK_DEVICE[$i]="`collect_path_info disk_name ${CONFIG_IMAGE_FILE[$i]}`"
 	    CONFIG_IMAGE_FILE_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${CONFIG_IMAGE_FILE[$i]}`"
 	    CONFIG_IMAGE_FILE_PATH_ON_FILESYSTEM[$i]="`get_relative_path_on_filesystem ${CONFIG_IMAGE_FILE[$i]}`"
@@ -890,17 +890,19 @@
 		CONFIG_IMAGE_OPTIONAL[$i]="skip"
 	    fi
 	fi
-	if [ -f ${CONFIG_IMAGE_INITRD[$i]} ] ; then
-	    CONFIG_IMAGE_INITRD_DISK_DEVICE[$i]="`collect_path_info disk_name ${CONFIG_IMAGE_INITRD[$i]}`"
-	    CONFIG_IMAGE_INITRD_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${CONFIG_IMAGE_INITRD[$i]}`"
-	    CONFIG_IMAGE_INITRD_PATH_ON_FILESYSTEM[$i]="`get_relative_path_on_filesystem ${CONFIG_IMAGE_INITRD[$i]}`"
-	else
-	    if [ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
-		error   "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
-	    else
-		warning "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
-		CONFIG_IMAGE_OPTIONAL[$i]="skip"
-	    fi
+	if [ ! -z "${CONFIG_IMAGE_INITRD[$i]}" ] ; then
+		if [ -f "${CONFIG_IMAGE_INITRD[$i]}" ] ; then
+		    CONFIG_IMAGE_INITRD_DISK_DEVICE[$i]="`collect_path_info disk_name ${CONFIG_IMAGE_INITRD[$i]}`"
+		    CONFIG_IMAGE_INITRD_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${CONFIG_IMAGE_INITRD[$i]}`"
+		    CONFIG_IMAGE_INITRD_PATH_ON_FILESYSTEM[$i]="`get_relative_path_on_filesystem ${CONFIG_IMAGE_INITRD[$i]}`"
+		else
+		    if [ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
+				error   "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
+		    else
+				warning "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]}: No such file or directory"
+				CONFIG_IMAGE_OPTIONAL[$i]="skip"
+		    fi
+		fi
 	fi
     done
     

++++++ yaboot-10.1.22-r1016.tar.bz2 ++++++


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)