From f8d383ed7f00d93bb170120d934e60b4fb9011f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 11 Jan 2011 22:41:50 +0000 Subject: [PATCH] - cleanups & unify Changed files: VirtualBox-vboxdrv.init -> 1.8 VirtualBox-vboxguest.init -> 1.2 VirtualBox-vboxnetadp.init -> 1.2 VirtualBox-vboxnetflt.init -> 1.3 VirtualBox-vboxsf.init -> 1.4 --- VirtualBox-vboxdrv.init | 46 +++++++++++++------------- VirtualBox-vboxguest.init | 66 +++++++++++++++++++++----------------- VirtualBox-vboxnetadp.init | 9 +++--- VirtualBox-vboxnetflt.init | 18 ++++++----- VirtualBox-vboxsf.init | 9 +++--- 5 files changed, 81 insertions(+), 67 deletions(-) diff --git a/VirtualBox-vboxdrv.init b/VirtualBox-vboxdrv.init index 7cd6044..4d39d61 100644 --- a/VirtualBox-vboxdrv.init +++ b/VirtualBox-vboxdrv.init @@ -20,31 +20,33 @@ VBOX_MODULE="vboxdrv" setup() { modprobe -s $VBOX_MODULE + if [ -d /dev/.udev ]; then + return + fi + # set proper /dev/vboxdrv for systems with static dev - if [ ! -d /dev/.udev/ ]; then - show "Setting $VBOX_DEVICE entry"; busy - rm -f $VBOX_DEVICE - VBOX_MAJOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/devices) - if [ -n "$VBOX_MAJOR" ]; then - VBOX_MINOR=0 - else - VBOX_MINOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/misc) - if [ -n "$VBOX_MINOR" ]; then - VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices) - fi - fi - if [ -z "$VBOX_MAJOR" ]; then - /sbin/rmmod $VBOX_MODULE - fail - elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then - rmmod $VBOX_MODNAME - fail - elif ! chown root:vbox $VBOX_DEVICE; then - fail - else - ok + show "Setting $VBOX_DEVICE entry"; busy + rm -f $VBOX_DEVICE + VBOX_MAJOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/devices) + if [ -n "$VBOX_MAJOR" ]; then + VBOX_MINOR=0 + else + VBOX_MINOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/misc) + if [ -n "$VBOX_MINOR" ]; then + VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices) fi fi + if [ -z "$VBOX_MAJOR" ]; then + /sbin/rmmod $VBOX_MODULE + fail + elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then + rmmod $VBOX_MODNAME + fail + elif ! chown root:vbox $VBOX_DEVICE; then + fail + else + ok + fi } start() { diff --git a/VirtualBox-vboxguest.init b/VirtualBox-vboxguest.init index 7ba2f51..4d72283 100644 --- a/VirtualBox-vboxguest.init +++ b/VirtualBox-vboxguest.init @@ -18,37 +18,42 @@ VBOX_MODULE="vboxguest" # Get service config - may override defaults [ -f /etc/sysconfig/virtualbox ] && . /etc/sysconfig/virtualbox -start() { - if [ ! -f /var/lock/subsys/vboxguest ]; then - modprobe -s $VBOX_MODULE - # set proper /dev/vboxdrv for systems with static dev - if ! [ -d /dev/.udev/ ]; then - show "Setting $VBOX_DEVICE entry" - busy - rm -f $VBOX_DEVICE - VBOX_MAJOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/devices) - if [ -n "$VBOX_MAJOR" ]; then - VBOX_MINOR=0 - else - VBOX_MINOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/misc) - if [ -n "$VBOX_MINOR" ]; then - VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices) - fi - fi - if [ -z "$VBOX_MAJOR" ]; then - /sbin/rmmod $VBOX_MODULE - fail - elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then - rmmod $VBOX_MODNAME - fail - elif ! chown root:vbox $VBOX_DEVICE; then - fail - else - ok +setup() { + modprobe -s $VBOX_MODULE + # set proper /dev/vboxdrv for systems with static dev + if [ ! -d /dev/.udev ]; then + show "Setting $VBOX_DEVICE entry" + busy + rm -f $VBOX_DEVICE + VBOX_MAJOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/devices) + if [ -n "$VBOX_MAJOR" ]; then + VBOX_MINOR=0 + else + VBOX_MINOR=$(awk '$2 == "vboxdrv" {print $1}' /proc/misc) + if [ -n "$VBOX_MINOR" ]; then + VBOX_MAJOR=$(awk '$2 == "misc" {print $1}' /proc/devices) fi fi - touch /var/lock/subsys/vboxguest + if [ -z "$VBOX_MAJOR" ]; then + /sbin/rmmod $VBOX_MODULE + fail + elif ! mknod -m 0660 $VBOX_DEVICE c $VBOX_MAJOR $VBOX_MINOR; then + rmmod $VBOX_MODNAME + fail + elif ! chown root:vbox $VBOX_DEVICE; then + fail + else + ok + fi + fi +} + +start() { + if [ -f /var/lock/subsys/vboxguest ]; then + return fi + setup + touch /var/lock/subsys/vboxguest } stop() { @@ -70,6 +75,9 @@ case "$1" in stop start ;; + setup) + setup + ;; status) if ! is_module $VBOX_MODULE; then echo "$VBOX_MODULE module is loaded" @@ -85,7 +93,7 @@ case "$1" in fi ;; *) - msg_usage "$0 {start|stop|restart|status}" + msg_usage "$0 {start|stop|restart|setup|status}" exit 3 esac diff --git a/VirtualBox-vboxnetadp.init b/VirtualBox-vboxnetadp.init index 19486ff..b3c050a 100644 --- a/VirtualBox-vboxnetadp.init +++ b/VirtualBox-vboxnetadp.init @@ -19,11 +19,12 @@ VBOX_MODULE="vboxnetadp" [ -f /etc/sysconfig/virtualbox ] && . /etc/sysconfig/virtualbox start() { - if [ ! -f /var/lock/subsys/vboxnetadp ]; then - modprobe -s $VBOX_MODULE - # set proper /dev/vboxdrv for systems with static dev - touch /var/lock/subsys/vboxnetadp + if [ -f /var/lock/subsys/vboxnetadp ]; then + return fi + + modprobe -s $VBOX_MODULE + touch /var/lock/subsys/vboxnetadp } stop() { diff --git a/VirtualBox-vboxnetflt.init b/VirtualBox-vboxnetflt.init index f17f007..655ef40 100644 --- a/VirtualBox-vboxnetflt.init +++ b/VirtualBox-vboxnetflt.init @@ -19,11 +19,12 @@ VBOX_MODULE="vboxnetflt" [ -f /etc/sysconfig/virtualbox ] && . /etc/sysconfig/virtualbox start() { - if [ ! -f /var/lock/subsys/vboxnetflt ]; then - modprobe -s $VBOX_MODULE - # set proper /dev/vboxdrv for systems with static dev - touch /var/lock/subsys/vboxnetflt + if [ -f /var/lock/subsys/vboxnetflt ]; then + return fi + + modprobe -s $VBOX_MODULE + touch /var/lock/subsys/vboxnetflt } stop() { @@ -33,12 +34,13 @@ stop() { } condrestart() { - if [ -f /var/lock/subsys/vboxnetflt ]; then - stop - start - else + if [ ! -f /var/lock/subsys/vboxnetflt ]; then RETVAL=$1 + return fi + + stop + start } RETVAL=0 diff --git a/VirtualBox-vboxsf.init b/VirtualBox-vboxsf.init index 32c4dc1..097ae7a 100644 --- a/VirtualBox-vboxsf.init +++ b/VirtualBox-vboxsf.init @@ -19,11 +19,12 @@ VBOX_MODULE="vboxsf" [ -f /etc/sysconfig/virtualbox ] && . /etc/sysconfig/virtualbox start() { - if [ ! -f /var/lock/subsys/vboxsf ]; then - modprobe -s $VBOX_MODULE - # set proper /dev/vboxdrv for systems with static dev - touch /var/lock/subsys/vboxsf + if [ -f /var/lock/subsys/vboxsf ]; then + return fi + + modprobe -s $VBOX_MODULE + touch /var/lock/subsys/vboxsf } stop() { -- 2.43.0