log to boot.log, not live-boot.log evgeni/boot_log
authorEvgeni Golov <evgeni@grml.org>
Wed, 13 Feb 2013 21:00:33 +0000 (22:00 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 13 Feb 2013 21:00:33 +0000 (22:00 +0100)
debian/patches/12_uuid_support.patch
debian/patches/27_support_static_ip.patch

index ed51916..ef1c648 100644 (file)
 +      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
 +
 +
 +      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 5f7a679..bb1f5a4 100644 (file)
@@ -102,7 +102,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"