From 2ad3c30d9ef0cc1ea2c7df7e7f0862c4dc6dad5d Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Fri, 3 Jun 2011 00:08:30 +0200 Subject: [PATCH] Change output to live-boot.log --- debian/patches/12_uuid_support.dpatch | 8 ++++---- scripts/live | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/12_uuid_support.dpatch b/debian/patches/12_uuid_support.dpatch index 364c5b3..3d60325 100755 --- a/debian/patches/12_uuid_support.dpatch +++ b/debian/patches/12_uuid_support.dpatch @@ -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 + diff --git a/scripts/live b/scripts/live index 57a4d32..5681362 100755 --- a/scripts/live +++ b/scripts/live @@ -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 -- 2.1.4