- %useradd: -k works only if -m is set

Changed files:
    rpm.macros -> 1.245

diff --git a/rpm.macros b/rpm.macros
index d8de6240e779f45a5de46af5f8c27463f7bc9351..01af2ca041a966ed00f0ec2b06e68405b620bf0d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -644,14 +644,13 @@ if [ -n "`/bin/id -u %{expand:%{%{#}}} 2>/dev/null`" ]; then \
 else \
        echo "Adding user %{expand:%{%{#}}} UID=%{-u*}." \
        /usr/sbin/useradd \\\
-               -k %{-k*}%{!-k:/usr/share/empty} \\\
+               %{-m:-m -k %{-k*}%{!-k:/usr/share/empty}} \\\
                -u %{-u*} \\\
                -r \\\
                -d %{-d*}%{!-d:/usr/share/empty} \\\
                -s %{-s*}%{!-s:/bin/false} \\\
                %{-c:-c "%(set -- %{-c*} %{*}; echo $1)"}\\\
                -g %{-g*} \\\
-               %{-m} \\\
                %{-M} \\\
                %{-G:-G %{-G*}} \\\
                %{expand:%{%{#}}} 1>&2 \