SOURCES (AC-branch): rpm.macros, rpm.macros - %useradd: don't enfo...

[glen]

Author: glen                         Date: Tue Oct 11 17:58:13 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- %useradd: don't enforce useradd -m

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.65 -> 1.158.4.66) 
SOURCES:
   rpm.macros (1.243 -> 1.244) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.65 SOURCES/rpm.macros:1.158.4.66
--- SOURCES/rpm.macros:1.158.4.65	Tue Oct 11 11:21:33 2005
+++ SOURCES/rpm.macros	Tue Oct 11 19:58:08 2005
@@ -627,7 +627,6 @@
 #  -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}
@@ -644,7 +643,6 @@
 else \
 	echo "Adding user %{expand:%{%{#}}} UID=%{-u*}." \
 	/usr/sbin/useradd \\\
-		-m \\\
 		-k %{-k*}%{!-k:/usr/share/empty} \\\
 		-u %{-u*} \\\
 		-r \\\
@@ -652,6 +650,7 @@
 		-s %{-s*}%{!-s:/bin/false} \\\
 		%{-c:-c "%(set -- %{-c*} %{*}; echo $1)"}\\\
 		-g %{-g*} \\\
+		%{-m} \\\
 		%{-M} \\\
 		%{-G:-G %{-G*}} \\\
 		%{expand:%{%{#}}} 1>&2 \

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.243 SOURCES/rpm.macros:1.244
--- SOURCES/rpm.macros:1.243	Tue Oct 11 11:21:33 2005
+++ SOURCES/rpm.macros	Tue Oct 11 19:58:08 2005
@@ -628,7 +628,6 @@
 #  -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 @@
 else \
 	echo "Adding user %{expand:%{%{#}}} UID=%{-u*}." \
 	/usr/sbin/useradd \\\
-		-m \\\
 		-k %{-k*}%{!-k:/usr/share/empty} \\\
 		-u %{-u*} \\\
 		-r \\\
@@ -653,6 +651,7 @@
 		-s %{-s*}%{!-s:/bin/false} \\\
 		%{-c:-c "%(set -- %{-c*} %{*}; echo $1)"}\\\
 		-g %{-g*} \\\
+		%{-m} \\\
 		%{-M} \\\
 		%{-G:-G %{-G*}} \\\
 		%{expand:%{%{#}}} 1>&2 \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.65&r2=1.158.4.66&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.243&r2=1.244&f=u