Change output to live-boot.log
authorUlrich Dangel <mru@grml.org>
Thu, 2 Jun 2011 22:08:30 +0000 (00:08 +0200)
committerUlrich Dangel <mru@grml.org>
Fri, 3 Jun 2011 00:28:18 +0000 (02:28 +0200)
debian/patches/12_uuid_support.dpatch
scripts/live

index 364c5b3..3d60325 100755 (executable)
@@ -54,7 +54,7 @@ index abce3cd..851796c 100755
 +      fi
 +
 +      if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then
-+              echo "  * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/live.log
++              echo "  * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/live-boot.log
 +              return 1
 +      fi
 +
@@ -64,15 +64,15 @@ index abce3cd..851796c 100755
 +
 +      if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
 +      then
-+              echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/live.log
++              echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/live-boot.log
 +              return 1
 +      fi
 +
 +      if [ "$BOOTID" = "$bootid_conf" ]
 +      then
-+              echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/live.log
++              echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/live-boot.log
 +      else
-+              echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/live.log
++              echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/live-boot.log
 +              return 1
 +      fi
 +
index 57a4d32..5681362 100755 (executable)
@@ -1590,7 +1590,7 @@ check_dev ()
                                loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
                        else
-                               echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
+                               echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
                        fi
                fi
        fi