Changeset 9104 in vbox for trunk

Timestamp:

May 26, 2008 8:57:54 AM (17 years ago)

Author:

vboxsync

Message:

Linux additions kernel module loader scripts: minor cosmetical fixes

Location:

trunk/src/VBox/Additions/linux/installer

Files:

trunk/src/VBox/Additions/linux/installer/vboxadd-timesync.sh

-              r9096
+              r9104
 vboxaddrunning() {
     lsmod | grep -q vboxadd[^_-]
+    lsmod | grep -q "vboxadd[^_-]"
+}
 …
 stop() {
     if test -f $PIDFILE; then
         begin_msg "Stopping VirtualBox host to guest time synchronisation ";
+        begin_msg "Stopping VirtualBox host to guest time synchronisation";
         vboxaddrunning || {
             failure "VirtualBox Additions module not loaded!"

-              r9096
+              r9104
 running() {
     lsmod | grep -q $modname[^_-]
+    lsmod | grep -q "$modname[^_-]"
+}
 start() {
     begin_msg "Starting VirtualBox Additions ";
+    begin_msg "Starting VirtualBox Additions";
     running || {
         rm -f $dev || {
 …
+        }
         modprobe $modname || {
+        modprobe $modname >/dev/null 2>&1 || {
             failure "modprobe $modname failed"
+        }
 …
         fi
         test -z "$maj" && {
             rmmod $modname
+            rmmod $modname 2>/dev/null
             failure "Cannot locate the VirtualBox device"
+        }
         mknod -m 0664 $dev c $maj $min || {
             rmmod $modname
+        mknod -m 0664 $dev c $maj $min 2>/dev/null || {
+            rmmod $modname 2>/dev/null
             failure "Cannot create device $dev with major $maj and minor $min"
+        }
 …
 stop() {
     begin_msg "Stopping VirtualBox Additions ";
+    begin_msg "Stopping VirtualBox Additions";
     if running; then
         rmmod $modname || failure "Cannot unload module $modname"
+        rmmod $modname 2>/dev/null || failure "Cannot unload module $modname"
         rm -f $dev || failure "Cannot unlink $dev"
     fi

r9096	r9104
155	155	if umount -a -t vboxsf 2>/dev/null; then
156	156	if running; then
157		rmmod $modname \|\| failure "Cannot unload module $modname"
	157	rmmod $modname 2>/dev/null \|\| failure "Cannot unload module $modname"
158	158	fi
159	159	succ_msg

Note: See TracChangeset for help on using the changeset viewer.