X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Finit.d%2Fgrml-reboot;h=c90fa8c3aad689dd5aa299432a9abb9a9fdd2cac;hb=2320c44851ea247a46d387ac58091b1a52d744ba;hp=81ab23aebaba47a7b2eb9cb0200e278251f96b98;hpb=a216e231483af45806a84360a4d7bfa97efb28e6;p=grml-etc.git

diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot
index 81ab23a..c90fa8c 100755
--- a/etc/init.d/grml-reboot
+++ b/etc/init.d/grml-reboot
@@ -79,8 +79,8 @@ case "$0" in
 esac
 
 mysleep() {
-  for i in $(seq 1 40) ; do
-    usleep 75000
+  for i in $(seq 1 30) ; do
+    sleep 0.1
     echo -n "$1.${NORMAL}"
   done
   echo ""
@@ -149,6 +149,12 @@ esac
 [ -r /etc/noprompt ] && NOPROMPT=true
 [ -r /etc/noeject ]  && NOPROMPT=true && NOEJECT=true
 
+if [ "$(/usr/bin/imvirt 2>/dev/null)" != "Physical" ] ; 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