SOURCES (AC-branch): rpm.macros, rpm.macros - %useradd: force home...

[glen]

Author: glen                         Date: Tue Oct 11 09:21:38 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- %useradd: force homedir creation with empty skel dir

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.64 -> 1.158.4.65) 
SOURCES:
   rpm.macros (1.242 -> 1.243) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.64 SOURCES/rpm.macros:1.158.4.65
--- SOURCES/rpm.macros:1.158.4.64	Sat Oct  8 13:21:34 2005
+++ SOURCES/rpm.macros	Tue Oct 11 11:21:33 2005
@@ -627,6 +627,8 @@
 #  -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}
 #
@@ -642,6 +644,8 @@
 else \
 	echo "Adding user %{expand:%{%{#}}} UID=%{-u*}." \
 	/usr/sbin/useradd \\\
+		-m \\\
+		-k %{-k*}%{!-k:/usr/share/empty} \\\
 		-u %{-u*} \\\
 		-r \\\
 		-d %{-d*}%{!-d:/usr/share/empty} \\\

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.242 SOURCES/rpm.macros:1.243
--- SOURCES/rpm.macros:1.242	Sat Oct  8 13:22:33 2005
+++ SOURCES/rpm.macros	Tue Oct 11 11:21:33 2005
@@ -628,6 +628,8 @@
 #  -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}
 #
@@ -643,6 +645,8 @@
 else \
 	echo "Adding user %{expand:%{%{#}}} UID=%{-u*}." \
 	/usr/sbin/useradd \\\
+		-m \\\
+		-k %{-k*}%{!-k:/usr/share/empty} \\\
 		-u %{-u*} \\\
 		-r \\\
 		-d %{-d*}%{!-d:/usr/share/empty} \\\
================================================================

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