X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=6d900591e5f416d02aabfed1a21615023d3b210f;hb=58b4414c1a1119bd6ad0372bdfc609f26d7c1402;hp=cefa59be66270ea0d25e87a230187b55b9379143;hpb=ba37cb93f56a3a2ddd9cf540b8bcb5b638eed2ed;p=live-boot-grml.git diff --git a/debian/live-boot.init b/debian/live-boot.init index cefa59b..6d90059 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 @@ -115,6 +115,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 @@ -150,6 +156,8 @@ do_stop () esac done + mount -o remount,ro /live/cow + if [ -z ${QUICKREBOOT} ] then @@ -167,7 +175,7 @@ do_stop () MESSAGE="Please remove the USB flash drive" 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 @@ -217,8 +225,6 @@ case "${1}" in [ "${VERBOSE}" != no ] && log_end_msg 1 ;; esac - - mount -o remount,ro /live/cow ;; *)