X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Finit.d%2Fgrml-reboot;h=157d04f8ee821809292e84cc69c84c3085724942;hb=49b93c6e0e6288dc3e94e000619045d741f330f1;hp=81ab23aebaba47a7b2eb9cb0200e278251f96b98;hpb=308ed4eacfe963fb690bad2c3f4a378173435c9c;p=grml-etc.git diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot index 81ab23a..157d04f 100755 --- a/etc/init.d/grml-reboot +++ b/etc/init.d/grml-reboot @@ -8,6 +8,7 @@ export PATH=/sbin:/bin:/usr/bin:/usr/sbin +. /usr/lib/grml/core.sh . /etc/grml_colors . /etc/grml/lsb-functions @@ -23,16 +24,15 @@ REMOVABLE=false USB_DEVICE=false NOPROMPT=${NOPROMPT:-false} NOEJECT=${NOEJECT:-false} -CMDLINE="$(cat /proc/cmdline 2>/dev/null)" # Check if we are running from a GRML-CD or HD [ -e /etc/grml_cd ] || INSTALLED=true # Assume that we don't want the eject+prompt stuff when running in one # of the special modes: -grep -qe 'toram' -qe '2ram' -qe 'usb' -qe 'serial' \ - -qe 'fromhd' -qe 'isofrom' -qe 'fromiso' -qe 'findiso' \ - /proc/cmdline && INSTALLED=true +checkbootparam 'toram' || checkbootparam '2ram' || checkbootparam 'usb' \ +checkbootparam 'serial' || checkbootparam 'fromhd' || checkbootparam 'isofrom' \ +checkbootparam 'fromiso' || checkbootparam 'findiso' && INSTALLED=true # detect cdrom device if ! $INSTALLED ; then