SOURCES (AC-branch): rpm.macros, rpm.macros - %useradd: -k works o...

glen glen at pld-linux.org
Sat Oct 15 19:50:14 CEST 2005


Author: glen                         Date: Sat Oct 15 17:50:14 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- %useradd: -k works only if -m is set

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.66 -> 1.158.4.67) 
SOURCES:
   rpm.macros (1.244 -> 1.245) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.66 SOURCES/rpm.macros:1.158.4.67
--- SOURCES/rpm.macros:1.158.4.66	Tue Oct 11 19:58:08 2005
+++ SOURCES/rpm.macros	Sat Oct 15 19:50:08 2005
@@ -643,14 +643,13 @@
 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 \

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.244 SOURCES/rpm.macros:1.245
--- SOURCES/rpm.macros:1.244	Tue Oct 11 19:58:08 2005
+++ SOURCES/rpm.macros	Sat Oct 15 19:50:09 2005
@@ -644,14 +644,13 @@
 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 \
================================================================

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




More information about the pld-cvs-commit mailing list