projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
942a8f0
)
Moving check for iso image in initscript from the start to the end before ejecting...
author
Michal Suchanek
<hramrach@centrum.cz>
Mon, 7 Jun 2010 13:12:17 +0000
(15:12 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:53:26 +0000
(17:53 +0100)
debian/live-boot.init
patch
|
blob
|
history
diff --git
a/debian/live-boot.init
b/debian/live-boot.init
index
298295d
..
bb079ee
100644
(file)
--- 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 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
# 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
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)"
# TODO: i18n
BOOT_DEVICE="$(get_boot_device)"