X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=f0982a8e9aad130120dc19258c5a030b19926128;hb=1b79297f3f0777d9178f74e83bbd6f13255f9f69;hp=c947e125324a30556b9b5e629a570810569bd8ca;hpb=3c6ccf74fb3500571f2f35db5571135bebfd548f;p=live-boot-grml.git diff --git a/debian/live-boot.init b/debian/live-boot.init index c947e12..f0982a8 100644 --- a/debian/live-boot.init +++ b/debian/live-boot.init @@ -49,7 +49,7 @@ cache_path() then if [ -x "${path}" ] then - if file "${path}" | grep -q 'dynamically linked' + if file -L "${path}" | grep -q 'dynamically linked' then for lib in $(ldd "${path}" | awk '{ print $3 }') do @@ -114,6 +114,12 @@ do_stop () return 0 fi + # check for toram + if grep -qs toram /proc/cmdline + then + return 0 + fi + # Don't prompt to eject the SD card on Babbage board, where we reuse it # as a quasi-boot-floppy. Technically this uses a bit of ubiquity # (archdetect), but since this is mostly only relevant for @@ -130,7 +136,7 @@ do_stop () fi prompt=1 - if grep -qs noprompt /proc/cmdline + if [ "${NOPROMPT}" = "Yes" ] then prompt= fi @@ -149,6 +155,8 @@ do_stop () esac done + mount -o remount,ro /live/cow + if [ -z ${QUICKREBOOT} ] then @@ -164,15 +172,26 @@ do_stop () # failes because they actually remember the # "ejected" state even after reboot MESSAGE="Please remove the USB flash drive" + + if [ "${NOPROMPT}" = "usb" ] + then + prompt= + fi + else # ejecting is a very good idea here - MESSAGE="Please remove the disc, close the the tray (if any)" + MESSAGE="Please remove the disc, close the tray (if any)" if [ -x /usr/bin/eject ] then eject -p -m /live/image >/dev/null 2>&1 fi + if [ ${NOPROMPT} = "cd" ] + then + prompt= + fi + fi [ "$prompt" ] || return 0 @@ -216,8 +235,6 @@ case "${1}" in [ "${VERBOSE}" != no ] && log_end_msg 1 ;; esac - - mount -o remount,ro /live/cow ;; *)