diff options
| author | Michal Suchanek <hramrach@centrum.cz> | 2010-06-07 15:12:17 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:53:26 +0100 |
| commit | 4848c6bdfe9726ae21ab0b9c31444c2a99c4fbca (patch) | |
| tree | faa80dfeef78700f80b9ed0f57adcc1438281d4c | |
| parent | 942a8f0a95556e1a51c9b5b0d2d67bf9709374f0 (diff) | |
| download | live-boot-4848c6bdfe9726ae21ab0b9c31444c2a99c4fbca.tar.gz live-boot-4848c6bdfe9726ae21ab0b9c31444c2a99c4fbca.zip | |
Moving check for iso image in initscript from the start to the end before ejecting media.
| -rw-r--r-- | debian/live-boot.init | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/live-boot.init b/debian/live-boot.init index 298295d..bb079ee 100644 --- a/debian/live-boot.init +++ b/debian/live-boot.init @@ -25,9 +25,6 @@ DO_SNAPSHOT=/sbin/live-snapshot # Exit if system was not booted by live-boot 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 @@ -153,6 +150,9 @@ do_stop () if [ -z ${QUICKREBOOT} ] then + + # Exit if the system was booted from an ISO image rather than a physical CD + grep -qs find_iso= /proc/cmdline && return 0 # TODO: i18n BOOT_DEVICE="$(get_boot_device)" |