projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 3.0~a17-1+grml.01.
[live-boot-grml.git]
/
debian
/
live-boot.init
diff --git
a/debian/live-boot.init
b/debian/live-boot.init
index
1a85267
..
f0982a8
100644
(file)
--- a/
debian/live-boot.init
+++ b/
debian/live-boot.init
@@
-136,7
+136,7
@@
do_stop ()
fi
prompt=1
fi
prompt=1
- if
grep -qs noprompt /proc/cmdline
+ if
[ "${NOPROMPT}" = "Yes" ]
then
prompt=
fi
then
prompt=
fi
@@
-155,6
+155,8
@@
do_stop ()
esac
done
esac
done
+ mount -o remount,ro /live/cow
+
if [ -z ${QUICKREBOOT} ]
then
if [ -z ${QUICKREBOOT} ]
then
@@
-170,15
+172,26
@@
do_stop ()
# failes because they actually remember the
# "ejected" state even after reboot
MESSAGE="Please remove the USB flash drive"
# failes because they actually remember the
# "ejected" state even after reboot
MESSAGE="Please remove the USB flash drive"
+
+ if [ "${NOPROMPT}" = "usb" ]
+ then
+ prompt=
+ fi
+
else
# ejecting is a very good idea here
else
# ejecting is a very good idea here
- MESSAGE="Please remove the disc, close the t
he t
ray (if any)"
+ MESSAGE="Please remove the disc, close the tray (if any)"
if [ -x /usr/bin/eject ]
then
eject -p -m /live/image >/dev/null 2>&1
fi
if [ -x /usr/bin/eject ]
then
eject -p -m /live/image >/dev/null 2>&1
fi
+ if [ ${NOPROMPT} = "cd" ]
+ then
+ prompt=
+ fi
+
fi
[ "$prompt" ] || return 0
fi
[ "$prompt" ] || return 0
@@
-222,8
+235,6
@@
case "${1}" in
[ "${VERBOSE}" != no ] && log_end_msg 1
;;
esac
[ "${VERBOSE}" != no ] && log_end_msg 1
;;
esac
-
- mount -o remount,ro /live/cow
;;
*)
;;
*)