+ 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
+
+
+ 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
+
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