Changeset 58326 in vbox for trunk/src/VBox/Additions

Timestamp:

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

Author:

vboxsync

Message:

Installers/linux: service output clean-up.

Location:

trunk/src/VBox/Additions/linux/installer

Files:

• vboxadd-service.sh (modified) (4 diffs)
• vboxadd-x11.sh (modified) (5 diffs)
• vboxadd.sh (modified) (4 diffs)

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

@@ -27 +27 @@
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
-SCRIPTNAME=vboxadd-service
+SCRIPTNAME=vboxadd-service.sh
 
 PIDFILE="/var/run/${SCRIPTNAME}"
@@ -39 +39 @@
 {
     test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 succ_msg()
 {
-    logger "${SCRIPTNAME}: done."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 fail_msg()
 {
-    echo "${SCRIPTNAME}: failed." >&2
-    logger "${SCRIPTNAME}: failed."
+    echo "${SCRIPTNAME}: ${1}." >&2
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -95 +95 @@
         daemon $binary --pidfile $PIDFILE > /dev/null
         RETVAL=$?
-        succ_msg
+        succ_msg "VirtualBox Guest Addition service started"
     fi
     return $RETVAL
@@ -107 +107 @@
         if ! pidof VBoxService > /dev/null 2>&1; then
             rm -f $PIDFILE
-            succ_msg
+            succ_msg "VirtualBox Guest Addition service stopped"
         else
-            fail_msg
+            fail_msg "VirtualBox Guest Addition service failed to stop"
         fi
     fi

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

@@ -33 +33 @@
 CONFIG_DIR="/var/lib/VBoxGuestAdditions"
 CONFIG="config"
-SCRIPTNAME=vboxadd-x11
+SCRIPTNAME=vboxadd-x11.sh
 
 # Check architecture
@@ -78 +78 @@
 {
     test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 succ_msg()
 {
-    logger "${SCRIPTNAME}: done."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 fail_msg()
 {
-    echo "${SCRIPTNAME}: failed." >&2
-    logger "${SCRIPTNAME}: failed."
+    echo "${SCRIPTNAME}: ${1}." >&2
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -377 +377 @@
         ln -s "$lib_dir/$vboxmouse_src" "$modules_dir/input/vboxmouse_drv$driver_ext";;
     esac
-    succ_msg
+    succ_msg "$xserver_version modules installed"
 
     if test -n "$dox11config"; then
@@ -418 +418 @@
             fi
         fi
-        succ_msg
+        succ_msg "Window System set up to use the Guest Additions"
         test -n "$generated" &&
             cat << EOF
@@ -476 +476 @@
         fail "See the log file $LOG for more information."
     ln -s "$lib_dir/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
-    succ_msg
+    succ_msg "Window system drivers installed"
 }
 

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

@@ -34 +34 @@
 MODPROBE=/sbin/modprobe
 OLDMODULES="vboxguest vboxadd vboxsf vboxvfs vboxvideo"
-SCRIPTNAME=vboxadd
+SCRIPTNAME=vboxadd.sh
 
 if $MODPROBE -c 2>/dev/null | grep -q '^allow_unsupported_modules  *0'; then
@@ -67 +67 @@
 {
     test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
 succ_msg()
 {
-    logger "${SCRIPTNAME}: done."
-}
-
-fail_msg()
-{
-    echo "${SCRIPTNAME}: failed." >&2
-    logger "${SCRIPTNAME}: failed."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -84 +78 @@
 {
     echo "${SCRIPTNAME}: failed: ${1}." >&2
-    logger "${SCRIPTNAME}: ${1}."
+    logger -t "${SCRIPTNAME}" "${1}."
 }
 
@@ -230 +224 @@
         $MODPROBE vboxsf > /dev/null 2>&1 || {
             if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
-                fail_msg
-                echo "Unable to start shared folders support.  Make sure that your VirtualBox build"
-                echo "supports this feature."
+                show_error "Unable to start shared folders support.  Make sure that your VirtualBox build"
+                show_error "supports this feature."
                 exit 1
             fi