Changeset 58326 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Oct 20, 2015 9:34:06 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103525

Message:

Installers/linux: service output clean-up.

Location:

trunk/src/VBox/Installer/linux

Files:

• vboxautostart-service.sh (modified) (3 diffs)
• vboxballoonctrl-service.sh (modified) (5 diffs)
• vboxdrv.sh (modified) (10 diffs)
• vboxweb-service.sh (modified) (5 diffs)

trunk/src/VBox/Installer/linux/vboxautostart-service.sh

@@ -27 +27 @@
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
-SCRIPTNAME=vboxautostart-service
+SCRIPTNAME=vboxautostart-service.sh
 
 [ -f /etc/debian_release -a -f /lib/lsb/init-functions ] || NOLSB=yes
@@ -52 +52 @@
 {
     test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 succ_msg()
 {
-    logger "${SCRIPTNAME}: done."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -63 +63 @@
 {
     echo "${SCRIPTNAME}: failed: ${1}." >&2
-    logger "${SCRIPTNAME}: failed: ${1}."
+    logger -t "${SCRIPTNAME}" "failed: ${1}."
 }
 

trunk/src/VBox/Installer/linux/vboxballoonctrl-service.sh

@@ -27 +27 @@
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
-SCRIPTNAME=vboxballoonctrl-service
+SCRIPTNAME=vboxballoonctrl-service.sh
 
 [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
@@ -53 +53 @@
 {
     test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 succ_msg()
 {
-    logger "${SCRIPTNAME}: done."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -64 +64 @@
 {
     echo "${SCRIPTNAME}: failed: ${1}." >&2
-    logger "${SCRIPTNAME}: failed: ${1}."
+    logger -t "${SCRIPTNAME}" "failed: ${1}."
 }
 
@@ -141 +141 @@
             echo "$PID" > $PIDFILE
             RETVAL=0
-            succ_msg
+            succ_msg "VirtualBox watchdog service started"
         else
             RETVAL=1
-            fail_msg
+            fail_msg "VirtualBox watchdog service failed to start"
         fi
     fi
@@ -157 +157 @@
         if ! pidof $binary > /dev/null 2>&1; then
             rm -f $PIDFILE
-            succ_msg
+            succ_msg "VirtualBox watchdog service stopped"
         else
-            fail_msg
+            fail_msg "VirtualBox watchdog service failed to stop"
         fi
     fi

trunk/src/VBox/Installer/linux/vboxdrv.sh

@@ -31 +31 @@
 LOG="/var/log/vbox-install.log"
 MODPROBE=/sbin/modprobe
-SCRIPTNAME=vboxdrv
+SCRIPTNAME=vboxdrv.sh
 
 # The below is GNU-specific.  See VBox.sh for the longer Solaris/OS X version.
@@ -91 +91 @@
 {
     test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 succ_msg()
 {
-    logger "${SCRIPTNAME}: done."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -102 +102 @@
 {
     echo "${SCRIPTNAME}: failed: ${1}." >&2
-    logger "${SCRIPTNAME}: failed: ${1}."
+    logger -t "${SCRIPTNAME}" "failed: ${1}."
 }
 
@@ -310 +310 @@
         chown root:vboxusers /dev/vboxusb 2>/dev/null
     fi
-    succ_msg
+    succ_msg "VirtualBox services started"
 }
 
@@ -346 +346 @@
         fi
     fi
-    succ_msg
+    succ_msg "VirtualBox services stopped"
 }
 
@@ -370 +370 @@
                         $VBOXMANAGE --nologo controlvm $v poweroff
                     done
-                    succ_msg
+                    succ_msg "Remaining VMs powered off"
                 elif [ "$SHUTDOWN" = "acpibutton" ]; then
                     begin_msg "Sending ACPI power button event to remaining VMs"
@@ -377 +377 @@
                         wait=30
                     done
-                    succ_msg
+                    succ_msg "ACPI power button event sent to remaining VMs"
                 elif [ "$SHUTDOWN" = "savestate" ]; then
                     begin_msg "Saving state of remaining VMs"
@@ -383 +383 @@
                         $VBOXMANAGE --nologo controlvm $v savestate
                     done
-                    succ_msg
+                    succ_msg "State of remaining VMs saved"
                 fi
             fi
@@ -392 +392 @@
         begin_msg "Waiting for $wait seconds for VM shutdown"
         sleep $wait
-        succ_msg
+        succ_msg "Waited for $wait seconds for VM shutdown"
     fi
 }
@@ -448 +448 @@
     rm -f /etc/vbox/module_not_compiled
     depmod -a
-    succ_msg
+    succ_msg "VirtualBox kernel modules built"
 }
 

trunk/src/VBox/Installer/linux/vboxweb-service.sh

@@ -27 +27 @@
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
-SCRIPTNAME=vboxweb-service
+SCRIPTNAME=vboxweb-service.sh
 
 [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
@@ -55 +55 @@
 {
     test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 succ_msg()
 {
-    logger "${SCRIPTNAME}: done."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -66 +66 @@
 {
     echo "${SCRIPTNAME}: failed: ${1}." >&2
-    logger "${SCRIPTNAME}: failed: ${1}."
+    logger -t "${SCRIPTNAME}" "failed: ${1}."
 }
 
@@ -154 +154 @@
             echo "$PID" > $PIDFILE
             RETVAL=0
-            succ_msg
+            succ_msg "VirtualBox web service started"
         else
             RETVAL=1
-            fail_msg
+            fail_msg "VirtualBox web service failed to start"
         fi
     fi
@@ -170 +170 @@
         if ! pidof $binary > /dev/null 2>&1; then
             rm -f $PIDFILE
-            succ_msg
+            succ_msg "VirtualBox web service stopped"
         else
-            fail_msg
+            fail_msg "VirtualBox web service failed to stop"
         fi
     fi