 +ON_SHUTDOWN=shutdown
 +SHUTDOWN_TIMEOUT=30
  
--test -f "$sysconfdir"/sysconfig/libvirt-guests && . "$sysconfdir"/sysconfig/libvirt-guests
-+test -f "$sysconfdir"/default/libvirt-guests && . "$sysconfdir"/default/libvirt-guests
+-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
+-    . "$sysconfdir"/sysconfig/libvirt-guests
++test -f "$sysconfdir"/default/libvirt-guests &&
++    . "$sysconfdir"/default/libvirt-guests
  
  LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
 -VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests

 
 RETVAL=0
 
@@ -129,7 +115,7 @@ start() {
     [ -f "$LISTFILE" ] || { started; return 0; }
 
     if [ "x$ON_BOOT" != xstart ]; then
-        echo $"libvirt-guests is configured not to start any guests on boot"
+        echo "libvirt-guests is configured not to start any guests on boot"
         rm -f "$LISTFILE"
         started
         return 0
@@ -144,20 +130,20 @@ start() {
             fi
         done
         if ! $configured; then
-            echo $"Ignoring guests on $uri URI"
+            echo "Ignoring guests on $uri URI"
             continue
         fi
 
-        echo $"Resuming guests on $uri URI..."
+        echo "Resuming guests on $uri URI..."
         for guest in $list; do
             name=$(guest_name $uri $guest)
-            echo -n $"Resuming guest $name: "
+            echo -n "Resuming guest $name: "
             if guest_is_on $uri $guest; then
                 if $guest_running; then
-                    echo $"already active"
+                    echo "already active"
                 else
                     retval run_virsh $uri start "$name" >/dev/null && \
-                    echo $"done"
+                    echo "done"
                 fi
             fi
         done
@@ -173,7 +159,7 @@ suspend_guest()
     guest=$2
 
     name=$(guest_name $uri $guest)
-    label=$"Suspending $name: "
+    label="Suspending $name: "
     echo -n "$label"
     run_virsh $uri managedsave $guest >/dev/null &
     virsh_pid=$!
@@ -188,7 +174,7 @@ suspend_guest()
             printf '\r%s%-12s ' "$label" "..."
         fi
     done
-    retval wait $virsh_pid && printf '\r%s%-12s\n' "$label" $"done"
+    retval wait $virsh_pid && printf '\r%s%-12s\n' "$label" "done"
 }
 
 shutdown_guest()
@@ -197,7 +183,7 @@ shutdown_guest()
     guest=$2
 
     name=$(guest_name $uri $guest)
-    label=$"Shutting down $name: "
+    label="Shutting down $name: "
     echo -n "$label"
     retval run_virsh $uri shutdown $guest >/dev/null || return
     timeout=$SHUTDOWN_TIMEOUT
@@ -211,9 +197,9 @@ shutdown_guest()
 
     if guest_is_on $uri $guest; then
         if $guest_running; then
-            printf '\r%s%-12s\n' "$label" $"failed to shutdown in time"
+            printf '\r%s%-12s\n' "$label" "failed to shutdown in time"
         else
-            printf '\r%s%-12s\n' "$label" $"done"
+            printf '\r%s%-12s\n' "$label" "done"
         fi
     fi
 }
@@ -226,7 +212,7 @@ stop() {
     if [ "x$ON_SHUTDOWN" = xshutdown ]; then
         suspending=false
         if [ $SHUTDOWN_TIMEOUT -le 0 ]; then
-            echo $"Shutdown action requested but SHUTDOWN_TIMEOUT was not set"
+            echo "Shutdown action requested but SHUTDOWN_TIMEOUT was not set"
             RETVAL=6
             return
         fi
@@ -234,10 +220,10 @@ stop() {
 
     : >"$LISTFILE"
     for uri in $URIS; do
-        echo -n $"Running guests on $uri URI: "
+        echo -n "Running guests on $uri URI: "
 
         if [ "x$uri" = xdefault ] && [ ! -x "$libvirtd" ]; then
-            echo $"libvirtd not installed; skipping this URI."
+            echo "libvirtd not installed; skipping this URI."
             continue
         fi
 
@@ -250,7 +236,7 @@ stop() {
                 empty=false
             done
             if $empty; then
-                echo $"no running guests."
+                echo "no running guests."
             else
                 echo
                 echo $uri $list >>"$LISTFILE"
@@ -260,9 +246,9 @@ stop() {
 
     while read uri list; do
         if $suspending; then
-            echo $"Suspending guests on $uri URI..."
+            echo "Suspending guests on $uri URI..."
         else
-            echo $"Shutting down guests on $uri URI..."
+            echo "Shutting down guests on $uri URI..."
         fi
 
         for guest in $list; do
@@ -286,17 +272,16 @@ gueststatus() {
 
 # rh_status
 # Display current status: whether saved state exists, and whether start

+# has been executed.
 rh_status() {
     if [ -f "$LISTFILE" ]; then
         gettext "stopped, with saved guests"; echo
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
index cd58728..53d89bd 100644
--- a/tools/libvirt-guests.sysconf
