X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=f8471b68635bb2ab5386335dd9d5d75ce0163061;hb=d738b45d42f1e62c3de523d641f3daaeafc23139;hp=6c3e665a70a23a48c9bf40368f735dd207a1b1da;hpb=8705e0f269bf7e592c32d835ac6685612fb39ad3;p=live-boot-grml.git diff --git a/debian/live-boot.init b/debian/live-boot.init index 6c3e665..f8471b6 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 @@ -97,6 +97,7 @@ do_stop () { if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline then + # ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file if [ ! -z "${ROOTSNAP}" ] then ${DO_SNAPSHOT} --resync-string="${ROOTSNAP}" @@ -114,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 @@ -149,6 +156,8 @@ do_stop () esac done + mount -o remount,ro /live/cow + if [ -z ${QUICKREBOOT} ] then @@ -216,8 +225,6 @@ case "${1}" in [ "${VERBOSE}" != no ] && log_end_msg 1 ;; esac - - mount -o remount,ro /live/cow ;; *)