From 899ef33564704d947c8c3abe95ec2455e1dcd43c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 7 Nov 2011 11:33:45 +0100 Subject: [PATCH] grml-reboot: detect virtual machines + assume noprompt for them, add imvirt to Depends --- debian/control | 2 +- etc/init.d/grml-reboot | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 8de6c60..d39b19c 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Architecture: all Replaces: automount-knoppix Suggests: grml-desktop, grml-docs, grml-x, policyrcd-script-zg2 Recommends: eterm, python, vim (>= 7.0) -Depends: ${misc:Depends}, grml-scripts (>= 0.9), grml-etc-core (>= 0.3) +Depends: ${misc:Depends}, grml-scripts (>= 0.9), grml-etc-core (>= 0.3), imvirt Description: ecetera files for the grml system This package includes /etc files for the Grml system. Whereas the grml-etc-core package is limited to some diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot index 0b0b17d..c90fa8c 100755 --- a/etc/init.d/grml-reboot +++ b/etc/init.d/grml-reboot @@ -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 -- 2.1.4