daemon: move $prog build to RC_LOGGING=yes part, ssd does not use it

diff --git a/lib/functions b/lib/functions
index bbdbd64cfea3a8716080d2b8fe44e16692f206d7..8a6d9c985fce2204cad7e9bac1a32dfdd44a2502 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -698,19 +698,6 @@ daemon() {
                esac
                shift
        done
-       if [ -n "$user" -a "$user" != "root" ]; then
-               prog="/bin/su $user -s /bin/sh -c \""
-       fi
-       if [ "$fork" = "1" ]; then
-               prog="/usr/bin/setsid ${prog:-sh -c \"}"
-       fi
-       # If command to execute ends with quotation mark, add remaining
-       # arguments and close quotation.
-       if [ "$prog" != "${prog%\"}" ]; then
-               prog="$prog $*$end\""
-       else
-               prog="$prog $*$end"
-       fi
 
        _daemon_set_ulimits
 
@@ -778,6 +765,20 @@ daemon() {
                                --exec "$prog" \
                                -- "$@"
                else
+                       if [ -n "$user" -a "$user" != "root" ]; then
+                               prog="/bin/su $user -s /bin/sh -c \""
+                       fi
+                       if [ "$fork" = "1" ]; then
+                               prog="/usr/bin/setsid ${prog:-sh -c \"}"
+                       fi
+                       # If command to execute ends with quotation mark, add remaining
+                       # arguments and close quotation.
+                       if [ "$prog" != "${prog%\"}" ]; then
+                               prog="$prog $*$end\""
+                       else
+                               prog="$prog $*$end"
+                       fi
+
                        nice -n $nice initlog -c "$prog" 2>&1 </dev/null
                fi
                ); then