log to boot.log, not live-boot.log
authorEvgeni Golov <evgeni@grml.org>
Sun, 18 Aug 2013 11:04:41 +0000 (13:04 +0200)
committerEvgeni Golov <evgeni@grml.org>
Sun, 18 Aug 2013 11:04:41 +0000 (13:04 +0200)
debian/patches/12_uuid_support.patch
debian/patches/27_support_static_ip.patch

index 810e811..13d4ebe 100644 (file)
@@ -25,12 +25,12 @@ Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
 +      path="$1"
 +
 +      if [ -n "$IGNORE_BOOTID" ] ; then
-+              echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/live-boot.log
++              echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/boot.log
 +              return 0
 +      fi
 +
 +      if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then
-+              echo "  * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/live-boot.log
++              echo "  * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/boot.log
 +              return 1
 +      fi
 +
@@ -40,15 +40,15 @@ Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
 +
 +      if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
 +      then
-+              echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/live-boot.log
++              echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/boot.log
 +              return 1
 +      fi
 +
 +      if [ "$BOOTID" = "$bootid_conf" ]
 +      then
-+              echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/live-boot.log
++              echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/boot.log
 +      else
-+              echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/live-boot.log
++              echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/boot.log
 +              return 1
 +      fi
 +
index 776a0c9..d57ac8e 100644 (file)
@@ -103,7 +103,7 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
 +              for dev in $devlist ; do
 +                      param="$(get_ipconfig_para $dev)"
 +                      if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] ; then
-+                              echo "Ignoring network device $dev due to nodhcp." | tee -a /live-boot.log
++                              echo "Ignoring network device $dev due to nodhcp." | tee -a /boot.log
 +                              continue
                        fi
 +                      echo "Executing ipconfig -t $ETHDEV_TIMEOUT $param"