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
c90fa8c
..
c88f71f
100755
(executable)
--- a/
etc/init.d/grml-reboot
+++ b/
etc/init.d/grml-reboot
@@
-149,7
+149,8
@@
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
-if [ "$(/usr/bin/imvirt 2>/dev/null)" != "Physical" ] ; then
+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
log_begin_msg "System seems to be a virtual machine, assuming noprompt as default."
NOPROMPT=true
log_end_msg 0