X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-initramfs.init;h=07f707c581fbb6a68d0cadcf8c32d257c6785148;hb=f2a96ee75e6376f3674fbaf8a78b03c28e03c692;hp=cbad459ce49e2998d54763236f70eff32dc258ee;hpb=74f8c4c954a06ebc99be06ad8b77e0ef0880b30e;p=live-boot-grml.git

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index cbad459..07f707c 100644
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -24,6 +24,9 @@ DO_SNAPSHOT=/sbin/live-snapshot
 # Exit if system was not booted by live-initramfs
 grep -qs boot=live /proc/cmdline || exit 0
 
+# Exit if the system was booted from an ISO image rather than a physical CD
+grep -qs find_iso= /proc/cmdline && exit 0
+
 # Read configuration variable file if it is present
 [ -r /etc/live.conf ] && . /etc/live.conf
 
@@ -36,82 +39,163 @@ grep -qs boot=live /proc/cmdline || exit 0
 
 # Try to cache everything we're likely to need after ejecting.  This
 # is fragile and simple-minded, but our options are limited.
-cache_path() {
-    path="$1"
-
-    if [ -d "$path" ]; then
-        find "$path" -type f | xargs cat > /dev/null 2>&1
-    elif [ -f "$path" ]; then
-        if [ -x "$path" ]; then
-            if file "$path" | grep -q 'dynamically linked'; then
-                for lib in $(ldd "$path" | awk '{ print $3 }'); do
-                    cache_path "$lib"
-                done
-            fi
-        fi
-        cat "$path" >/dev/null 2>&1
-    fi
+cache_path()
+{
+	path="${1}"
+
+	if [ -d "${path}" ]
+	then
+		find "${path}" -type f | xargs cat > /dev/null 2>&1
+	elif [ -f "${path}" ]
+	then
+		if [ -x "${path}" ]
+		then
+			if file "${path}" | grep -q 'dynamically linked'
+			then
+				for lib in $(ldd "${path}" | awk '{ print $3 }')
+				do
+					cache_path "${lib}"
+				done
+			fi
+		fi
+
+		cat "${path}" >/dev/null 2>&1
+	fi
+}
+
+get_boot_device()
+{
+	# search in /proc/mounts for the device that is mounted at /live/image
+	while read DEVICE MOUNT REST
+	do
+		if [ "${MOUNT}" = "/live/image" ]
+		then
+			echo "${DEVICE}"
+			exit 0
+		fi
+	done < /proc/mounts
+}
+
+device_is_USB_flash_drive()
+{
+	# remove leading "/dev/" and all trailing numbers from input
+	DEVICE=$(expr substr ${1} 6 3)
+
+	# check that device starts with "sd"
+	[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
+
+	# check that the device is an USB device
+	if readlink /sys/block/${DEVICE} | grep -q usb ||
+	   readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
+	then
+		return 0
+	fi
+
+	return 1
 }
 
 do_stop ()
 {
-    if [ ! -z "${ROOTSNAP}" ]; then
-        $DO_SNAPSHOT --resync-string="${ROOTSNAP}"
-    fi
-
-    if [ ! -z "${HOMESNAP}" ]; then
-        $DO_SNAPSHOT --resync-string="${HOMESNAP}"
-    fi
-
-    # check for netboot
-    if [ ! -z "${NETBOOT}" ] || grep -qs netboot /proc/cmdline || grep -qsi root=/dev/nfs /proc/cmdline  || grep -qsi root=/dev/cifs /proc/cmdline ; then
-        return 0
-    fi
-
-    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do
-        cache_path "$path"
-    done
-
-    for x in $(cat /proc/cmdline); do
-	case $x in
-	    quickreboot)
-		QUICKREBOOT="Yes"
-	    ;;
-	esac
-    done
-
-    if [ -z ${QUICKREBOOT} ]; then
-	if [ -x /usr/bin/eject ]
+	if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
 	then
-		eject -p -m /live_media >/dev/null 2>&1
+		if [ ! -z "${ROOTSNAP}" ]
+		then
+			${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
+		fi
+
+		if [ ! -z "${HOMESNAP}" ]
+		then
+			${DO_SNAPSHOT} --resync-string="${HOMESNAP}"
+		fi
 	fi
 
-	# XXX - i18n
-	echo "Please remove the disc and close the tray (if any) then press ENTER: "
-	if [ -x /sbin/usplash_write ]; then
-	    /sbin/usplash_write "TIMEOUT 86400"
-	    /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
-	    /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+	# check for netboot
+	if [ ! -z "${NETBOOT}" ] || grep -qs netboot /proc/cmdline || grep -qsi root=/dev/nfs /proc/cmdline  || grep -qsi root=/dev/cifs /proc/cmdline
+	then
+		return 0
 	fi
 
-	read x < /dev/console
-    fi
+	prompt=1
+	if grep -qs noprompt /proc/cmdline
+	then
+		prompt=
+	fi
+
+	for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty)
+	do
+		cache_path "${path}"
+	done
+
+	for x in $(cat /proc/cmdline)
+	do
+		case ${x} in
+			quickreboot)
+				QUICKREBOOT="Yes"
+				;;
+		esac
+	done
+
+	if [ -z ${QUICKREBOOT} ]
+	then
+		# TODO: i18n
+		BOOT_DEVICE="$(get_boot_device)"
+
+		if device_is_USB_flash_drive ${BOOT_DEVICE}
+		then
+			# do NOT eject USB flash drives!
+			# otherwise rebooting with most USB flash drives
+			# failes because they actually remember the
+			# "ejected" state even after reboot
+			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)"
+
+			if [ -x /usr/bin/eject ]
+			then
+				eject -p -m /live/image >/dev/null 2>&1
+			fi
+
+			[ "$prompt" ] || return 0
+		fi
+
+		stty sane < /dev/console
+
+		printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
+
+		if [ -x /sbin/usplash_write ]
+		then
+			/sbin/usplash_write "TIMEOUT 86400"
+			/sbin/usplash_write "TEXT-URGENT ${MESSAGE}"
+			/sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+		fi
+
+		read x < /dev/console
+	fi
 }
 
-case "$1" in
-    start|restart|reload|force-reload|status)
-        [ "$VERBOSE" != no ] && log_end_msg 0
-        ;;
-    stop)
-        log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..."
-        do_stop
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    *)
-        log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-        exit 3
-        ;;
+case "${1}" in
+	start|restart|reload|force-reload|status)
+		[ "${VERBOSE}" != no ] && log_end_msg 0
+		;;
+
+	stop)
+		log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..."
+		do_stop
+
+		case "${?}" in
+			0|1)
+				[ "${VERBOSE}" != no ] && log_end_msg 0
+				;;
+
+			2)
+				[ "${VERBOSE}" != no ] && log_end_msg 1
+				;;
+		esac
+		;;
+
+	*)
+		log_success_msg "Usage: ${SCRIPTNAME} {start|stop|restart|force-reload}" >&2
+		exit 3
+		;;
 esac