From 15b92c69b4515794fc309cadcb6349b25433cf40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 11 Oct 2005 17:58:08 +0000 Subject: [PATCH] - %useradd: don't enforce useradd -m Changed files: rpm.macros -> 1.244 --- rpm.macros | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpm.macros b/rpm.macros index c9d19d0..d8de624 100644 --- a/rpm.macros +++ b/rpm.macros @@ -628,7 +628,6 @@ eval $CMD %2%{?3: %3} \ # -d defaults to /usr/share/empty # -c No default # -r is accepted but ignored (it's always set) -# -m IGNORED. always set. # -k skeleton dir. defaults to /usr/share/empty # rpm specific flags # -P package name. defaults to %{name} @@ -645,7 +644,6 @@ if [ -n "`/bin/id -u %{expand:%{%{#}}} 2>/dev/null`" ]; then \ else \ echo "Adding user %{expand:%{%{#}}} UID=%{-u*}." \ /usr/sbin/useradd \\\ - -m \\\ -k %{-k*}%{!-k:/usr/share/empty} \\\ -u %{-u*} \\\ -r \\\ @@ -653,6 +651,7 @@ else \ -s %{-s*}%{!-s:/bin/false} \\\ %{-c:-c "%(set -- %{-c*} %{*}; echo $1)"}\\\ -g %{-g*} \\\ + %{-m} \\\ %{-M} \\\ %{-G:-G %{-G*}} \\\ %{expand:%{%{#}}} 1>&2 \ -- 2.44.0