projects
/
grml-etc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssh init script: sync with Debian's 1:5.9p1-5 openssh-server package
[grml-etc.git]
/
etc
/
init.d
/
grml-reboot
diff --git
a/etc/init.d/grml-reboot
b/etc/init.d/grml-reboot
index
7f14558
..
c88f71f
100755
(executable)
--- a/
etc/init.d/grml-reboot
+++ b/
etc/init.d/grml-reboot
@@
-49,7
+49,7
@@
if ! $INSTALLED ; then
DEVICE=""
if [ -n "$CDROM" ] ; then
DEVICE="${CDROM##/dev/}"
DEVICE=""
if [ -n "$CDROM" ] ; then
DEVICE="${CDROM##/dev/}"
- DEVICE="${DEVICE%%[0-9]*}"
+
[ -d /sys/block/${DEVICE} ] ||
DEVICE="${DEVICE%%[0-9]*}"
if [ -n "$DEVICE" ] ; then
# is it a removable device?
if [ -n "$DEVICE" ] ; then
# is it a removable device?
@@
-79,8
+79,8
@@
case "$0" in
esac
mysleep() {
esac
mysleep() {
- for i in $(seq 1
4
0) ; do
- usleep 75000
+ for i in $(seq 1
3
0) ; do
+ sleep 0.1
echo -n "$1.${NORMAL}"
done
echo ""
echo -n "$1.${NORMAL}"
done
echo ""
@@
-149,6
+149,13
@@
esac
[ -r /etc/noprompt ] && NOPROMPT=true
[ -r /etc/noeject ] && NOPROMPT=true && NOEJECT=true
[ -r /etc/noprompt ] && NOPROMPT=true
[ -r /etc/noeject ] && NOPROMPT=true && NOEJECT=true
+VIRT_WHAT=$(/usr/sbin/virt-what 2>/dev/null)
+if [ -n "$VIRT_WHAT" ] ; then
+ log_begin_msg "System seems to be a virtual machine, assuming noprompt as default."
+ NOPROMPT=true
+ log_end_msg 0
+fi
+
# Turn on autoeject of CD-ROMs
if $NOEJECT ; then
for dev in /proc/sys/dev/cdrom*/lock; do [ -f "$dev" ] && echo 0 > "$dev"; done
# Turn on autoeject of CD-ROMs
if $NOEJECT ; then
for dev in /proc/sys/dev/cdrom*/lock; do [ -f "$dev" ] && echo 0 > "$dev"; done