cvs commit: ALFS/profiles/BLFS/chapter31 gdm.xml gnome-games.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 3 09:12:15 PDT 2004


kpfleming    04/07/03 10:12:15

  Modified:    profiles/BLFS/chapter11 fcron.xml
               profiles/BLFS/chapter21 courier.xml exim.xml postfix.xml
                        sendmail.xml
               profiles/BLFS/chapter22 bind.xml leafnode.xml openssh.xml
                        rsync.xml
               profiles/BLFS/chapter23 mysql.xml postgresql.xml
               profiles/BLFS/chapter24 apache.xml proftpd.xml
               profiles/BLFS/chapter31 gdm.xml gnome-games.xml
  Log:
  move user and group creation into separate stages
  
  Revision  Changes    Path
  1.4       +15 -3     ALFS/profiles/BLFS/chapter11/fcron.xml
  
  Index: fcron.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/fcron.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- fcron.xml	3 Jul 2004 15:33:52 -0000	1.3
  +++ fcron.xml	3 Jul 2004 16:12:14 -0000	1.4
  @@ -19,6 +19,21 @@
   		</unpack>
   	</stage>
   
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>fcron</param>
  +		</execute>
  +
  +		<execute command="grep -q ^fcron /etc/passwd || useradd">
  +		        <param>-c fcron</param>
  +			<param>-d /dev/null</param>
  +			<param>-g fcron</param>
  +			<param>-s /bin/false</param>
  +			<param>fcron</param>
  +		</execute>
  +	</stage>
  +
   	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&fcron-directory;</base>
  @@ -37,9 +52,6 @@
   
   		<execute command="/etc/rc.d/init.d/sysklogd reload" />
   
  -		<execute command="id -u fcron &> /dev/null || groupadd fcron" />
  -		<execute command="id -u fcron &> /dev/null || useradd -d /dev/null -g fcron -s /bin/false fcron" />
  -
   		<configure>
   			<param>--without-sendmail</param>
   			<param>--with-answer-all=no</param>
  
  
  
  1.2       +14 -18    ALFS/profiles/BLFS/chapter21/courier.xml
  
  Index: courier.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter21/courier.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- courier.xml	19 May 2004 02:38:53 -0000	1.1
  +++ courier.xml	3 Jul 2004 16:12:14 -0000	1.2
  @@ -11,37 +11,33 @@
   		</unpack>
   	</stage>
   
  -
  -	<stage name="Installing.">
  -		<stageinfo>
  -			<base>&build_dir;/&courier-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^courier /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>courier</param>
   		</execute>
   
  -		<execute command="grep ^courier /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -			<param>-c 'Courier Mail Server'</param>
  +		<execute command="grep -q ^courier /etc/passwd || useradd">
  +		        <param>-c courier</param>
   			<param>-d /dev/null</param>
  -		        <param>-g courier</param>
  +			<param>-g courier</param>
   			<param>-s /bin/false</param>
   			<param>courier</param>
   		</execute>
   
  -		<execute command="grep ^bin /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -			<param>-c 'bin'</param>
  +		<execute command="grep -q ^bin /etc/passwd || useradd">
  +		        <param>-c bin</param>
   			<param>-d /dev/null</param>
   			<param>-g bin</param>
   			<param>-u 1</param>
   			<param>bin</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing.">
  +		<stageinfo>
  +			<base>&build_dir;/&courier-directory;</base>
  +		</stageinfo>
   
   		<mkdir>
   			<option>parents</option>
  
  
  
  1.3       +12 -13    ALFS/profiles/BLFS/chapter21/exim.xml
  
  Index: exim.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter21/exim.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- exim.xml	3 Jul 2004 15:33:54 -0000	1.2
  +++ exim.xml	3 Jul 2004 16:12:14 -0000	1.3
  @@ -16,26 +16,25 @@
   		</unpack>
   	</stage>
   
  -
  -	<stage name="Installing.">
  -		<stageinfo>
  -			<base>&build_dir;/&exim-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^exim /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>exim</param>
   		</execute>
   
  -		<execute command="grep ^exim /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  +		<execute command="grep -q ^exim /etc/passwd || useradd">
  +		        <param>-c exim</param>
   			<param>-d /dev/null</param>
  -		        <param>-g exim</param>
  +			<param>-g exim</param>
   			<param>-s /bin/false</param>
   			<param>exim</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing.">
  +		<stageinfo>
  +			<base>&build_dir;/&exim-directory;</base>
  +		</stageinfo>
   
   		<execute command="sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
     			sed -e 's/^CONF.*$/CONFIGURE_FILE=\/etc\/exim.conf/' | \
  
  
  
  1.4       +19 -24    ALFS/profiles/BLFS/chapter21/postfix.xml
  
  Index: postfix.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter21/postfix.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- postfix.xml	3 Jul 2004 15:33:54 -0000	1.3
  +++ postfix.xml	3 Jul 2004 16:12:14 -0000	1.4
  @@ -16,33 +16,24 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  -		<stageinfo>
  -			<base>&build_dir;/&postfix-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^postfix /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>postfix</param>
   		</execute>
  -		
  -		<execute command="grep ^postdrop /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>postdrop</param>
   		</execute>
  -		
  -		<execute command="grep ^nogroup /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  -		        <param>-g 65534</param>
  +
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>-g 65534</param>
   			<param>nogroup</param>
   		</execute>
  -		
  -		<execute command="grep ^postfix /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  +
  +		<execute command="grep -q ^postfix /etc/passwd || useradd">
   		        <param>-c postfix</param>
   			<param>-d /dev/null</param>
   			<param>-g postfix</param>
  @@ -50,9 +41,7 @@
   			<param>postfix</param>
   		</execute>
   
  -		<execute command="grep ^nobody /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  +		<execute command="grep -q ^nobody /etc/passwd || useradd">
   		        <param>-c nobody</param>
   			<param>-d /home</param>
   			<param>-g nogroup</param>
  @@ -60,6 +49,12 @@
   			<param>-u 65534</param>
   			<param>nobody</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&postfix-directory;</base>
  +		</stageinfo>
   
   		<ownership user="postfix" group="postfix">
   		        <name>/var/mail</name>
  
  
  
  1.3       +14 -16    ALFS/profiles/BLFS/chapter21/sendmail.xml
  
  Index: sendmail.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter21/sendmail.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sendmail.xml	3 Jul 2004 15:33:54 -0000	1.2
  +++ sendmail.xml	3 Jul 2004 16:12:14 -0000	1.3
  @@ -17,31 +17,29 @@
   		</unpack>
   	</stage>
   
  -
  -	<stage name="Installing.">
  -		<stageinfo>
  -			<base>&build_dir;/&sendmail-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^smmsp /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>smmsp</param>
   		</execute>
   
  -		<execute command="grep ^mail /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>mail</param>
   		</execute>
   
  -		<execute command="grep ^smmsp /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -		        <param>-g smmsp</param>
  +		<execute command="grep -q ^smmsp /etc/passwd || useradd">
  +			<param>-g smmsp</param>
   			<param>-G mail</param>
  +			<param>-s /bin/false</param>
   			<param>smmsp</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing.">
  +		<stageinfo>
  +			<base>&build_dir;/&sendmail-directory;</base>
  +		</stageinfo>
   
   		<textdump>
   			<file>devtools/Site/site.config.m4</file>
  
  
  
  1.4       +15 -15    ALFS/profiles/BLFS/chapter22/bind.xml
  
  Index: bind.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/bind.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- bind.xml	3 Jul 2004 15:33:54 -0000	1.3
  +++ bind.xml	3 Jul 2004 16:12:14 -0000	1.4
  @@ -12,6 +12,21 @@
   		</unpack>
   	</stage>
   
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>named</param>
  +		</execute>
  +
  +		<execute command="grep -q ^named /etc/passwd || useradd">
  +			<param>-c named</param>
  +			<param>-m</param>
  +			<param>-g named</param>
  +			<param>-s /bin/false</param>
  +			<param>named</param>
  +		</execute>
  +	</stage>
  +
   	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&bind-directory;</base>
  @@ -28,21 +43,6 @@
   		        <param>install</param>
   		</make>
   
  -		<execute command="grep ^named /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  -			<param>named</param>
  -		</execute>
  -
  -		<execute command="grep ^named /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -			<param>-m</param>
  -			<param>-g named</param>
  -			<param>-s /bin/false</param>
  -			<param>named</param>
  -		</execute>
  -
   		<mkdir base="/home/named">
   			<option>parents</option>
   			<name>dev</name>
  
  
  
  1.3       +12 -13    ALFS/profiles/BLFS/chapter22/leafnode.xml
  
  Index: leafnode.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/leafnode.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- leafnode.xml	3 Jul 2004 15:33:55 -0000	1.2
  +++ leafnode.xml	3 Jul 2004 16:12:14 -0000	1.3
  @@ -12,23 +12,22 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  -		<stageinfo>
  -			<base>&build_dir;/&leafnode-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^news /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  -		        <param>news</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>news</param>
   		</execute>
  -		
  -		<execute command="grep ^news /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  +
  +		<execute command="grep -q ^news /etc/passwd || useradd">
   			<param>-g news</param>
   			<param>news</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&leafnode-directory;</base>
  +		</stageinfo>
   
   		<configure>
   			<param>--prefix=/usr</param>
  
  
  
  1.4       +15 -16    ALFS/profiles/BLFS/chapter22/openssh.xml
  
  Index: openssh.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/openssh.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- openssh.xml	3 Jul 2004 15:33:55 -0000	1.3
  +++ openssh.xml	3 Jul 2004 16:12:14 -0000	1.4
  @@ -17,6 +17,21 @@
   		</unpack>
   	</stage>
   
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>sshd</param>
  +		</execute>
  +
  +		<execute command="grep -q ^sshd /etc/passwd || useradd">
  +			<param>-c sshd</param>
  +			<param>-d /var/empty</param>
  +			<param>-g sshd</param>
  +			<param>-s /bin/false</param>
  +			<param>sshd</param>
  +		</execute>
  +	</stage>
  +
   	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&openssh-directory;</base>
  @@ -31,22 +46,6 @@
   		        <name>/var/empty</name>
                   </ownership>
   
  -		<execute command="grep ^sshd /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  -		        <param>sshd</param>
  -		</execute>
  -		
  -		<execute command="grep ^sshd /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -			<param>-c 'sshd privsep'</param>
  -			<param>-d /var/empty</param>
  -			<param>-g sshd</param>
  -			<param>-s /bin/false</param>
  -			<param>sshd</param>
  -		</execute>
  -
   		<search_replace>
   			<file>configure</file>
   			<find>-lcrypto</find>
  
  
  
  1.4       +12 -13    ALFS/profiles/BLFS/chapter22/rsync.xml
  
  Index: rsync.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/rsync.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rsync.xml	3 Jul 2004 15:33:55 -0000	1.3
  +++ rsync.xml	3 Jul 2004 16:12:14 -0000	1.4
  @@ -7,26 +7,25 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  -		<stageinfo>
  -			<base>&build_dir;/&rsync-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^rsyncd /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  -		        <param>rsyncd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>rsyncd</param>
   		</execute>
  -		
  -		<execute command="grep ^rsyncd /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  +
  +		<execute command="grep -q ^rsyncd /etc/passwd || useradd">
   			<param>-c rsyncd</param>
   			<param>-d /home/rsync</param>
   			<param>-g rsyncd</param>
   			<param>-s /bin/false</param>
   			<param>rsyncd</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&rsync-directory;</base>
  +		</stageinfo>
   
   		<configure>
   		        <param>--prefix=/usr</param>
  
  
  
  1.4       +11 -12    ALFS/profiles/BLFS/chapter23/mysql.xml
  
  Index: mysql.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter23/mysql.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mysql.xml	3 Jul 2004 15:33:55 -0000	1.3
  +++ mysql.xml	3 Jul 2004 16:12:14 -0000	1.4
  @@ -18,26 +18,25 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  -		<stageinfo>
  -			<base>&build_dir;/&mysql-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^mysql /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>mysql</param>
   		</execute>
   
  -		<execute command="grep ^mysql /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -		        <param>-c mysql</param>
  +		<execute command="grep -q ^mysql /etc/passwd || useradd">
  +			<param>-c mysql</param>
   			<param>-d /dev/null</param>
   			<param>-g mysql</param>
   			<param>-s /bin/false</param>
   			<param>mysql</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&mysql-directory;</base>
  +		</stageinfo>
   
   		<configure>
                           <param>--prefix=/usr</param>
  
  
  
  1.3       +7 -8      ALFS/profiles/BLFS/chapter23/postgresql.xml
  
  Index: postgresql.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter23/postgresql.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- postgresql.xml	3 Jul 2004 15:33:55 -0000	1.2
  +++ postgresql.xml	3 Jul 2004 16:12:14 -0000	1.3
  @@ -12,6 +12,13 @@
   		</unpack>
   	</stage>
   
  +	<stage name="Creating user">
  +		<execute command="grep -q ^postgres /etc/passwd || useradd">
  +			<param>-d /var/pgsql/data</param>
  +			<param>postgres</param>
  +		</execute>
  +	</stage>
  +
   	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&postgresql-directory;</base>
  @@ -32,14 +39,6 @@
   			<name>/var/pgsql/data</name>
   		</mkdir>
   
  -
  -		<execute command="grep ^postgres /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -			<param>-d /var/pgsql/data</param>
  -			<param>postgres</param>
  -		</execute>
  -
   		<ownership user="postgres">
   		        <name>/var/pgsql/data</name>
   		</ownership>
  
  
  
  1.4       +10 -11    ALFS/profiles/BLFS/chapter24/apache.xml
  
  Index: apache.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter24/apache.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apache.xml	3 Jul 2004 15:33:55 -0000	1.3
  +++ apache.xml	3 Jul 2004 16:12:15 -0000	1.4
  @@ -25,26 +25,25 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  -		<stageinfo>
  -			<base>&build_dir;/&apache-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^apache /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
   			<param>apache</param>
   		</execute>
   
  -		<execute command="grep ^apache /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  +		<execute command="grep -q ^apache /etc/passwd || useradd">
   			<param>-c apache</param>
   			<param>-d /dev/null</param>
   			<param>-g apache</param>
   			<param>-s /bin/false</param>
   			<param>apache</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&apache-directory;</base>
  +		</stageinfo>
   
   		<patch>
   			<param>-N</param>
  
  
  
  1.3       +12 -13    ALFS/profiles/BLFS/chapter24/proftpd.xml
  
  Index: proftpd.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter24/proftpd.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- proftpd.xml	3 Jul 2004 15:33:55 -0000	1.2
  +++ proftpd.xml	3 Jul 2004 16:12:15 -0000	1.3
  @@ -12,26 +12,25 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  -		<stageinfo>
  -			<base>&build_dir;/&proftpd-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="grep ^proftpd /etc/group">
  -			<param>&> /dev/null</param>
  -			<param>|| groupadd</param>
  -		        <param>proftpd</param>
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>proftpd</param>
   		</execute>
   
  -		<execute command="grep ^proftpd /etc/passwd">
  -			<param>&> /dev/null</param>
  -			<param>|| useradd</param>
  -		        <param>-c proftpd</param>
  +		<execute command="grep -q ^proftpd /etc/passwd || useradd">
  +			<param>-c proftpd</param>
   			<param>-d /home/ftp</param>
   			<param>-g proftpd</param>
   			<param>-s /bin/false</param>
   			<param>proftpd</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&proftpd-directory;</base>
  +		</stageinfo>
   
   		<configure>
   			<prefix>install_user=proftpd</prefix>
  
  
  
  1.4       +13 -9     ALFS/profiles/BLFS/chapter31/gdm.xml
  
  Index: gdm.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter31/gdm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gdm.xml	3 Jul 2004 15:33:57 -0000	1.3
  +++ gdm.xml	3 Jul 2004 16:12:15 -0000	1.4
  @@ -14,21 +14,25 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  -		<stageinfo>
  -			<base>&build_dir;/&gdm-directory;</base>
  -		</stageinfo>
  -
  -		<execute command="groupadd -f gdm" />
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>gdm</param>
  +		</execute>
   
  -		<execute command="grep -q ^gdm">
  -			<param>|| useradd</param>
  -		        <param>-c gdm</param>
  +		<execute command="grep -q ^gdm /etc/passwd || useradd">
  +			<param>-c games</param>
   			<param>-d /dev/null</param>
   			<param>-g gdm</param>
   			<param>-s /bin/bash</param>
   			<param>gdm</param>
   		</execute>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&gdm-directory;</base>
  +		</stageinfo>
   
   		<configure>
   			<param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
  
  
  
  1.4       +15 -11    ALFS/profiles/BLFS/chapter31/gnome-games.xml
  
  Index: gnome-games.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter31/gnome-games.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gnome-games.xml	3 Jul 2004 15:33:57 -0000	1.3
  +++ gnome-games.xml	3 Jul 2004 16:12:15 -0000	1.4
  @@ -15,6 +15,21 @@
   		</unpack>
   	</stage>
   
  +	<stage name="Creating user and group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>games</param>
  +		</execute>
  +
  +		<execute command="grep -q ^games /etc/passwd || useradd">
  +			<param>-c games</param>
  +			<param>-d /var/lib/games</param>
  +			<param>-g games</param>
  +			<param>-s /bin/false</param>
  +			<param>games</param>
  +		</execute>
  +	</stage>
  +
   	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&gnome-games-directory;</base>
  @@ -24,17 +39,6 @@
   			<name>/var/lib/games</name>
   		</mkdir>
   
  -		<execute command="groupadd -f games" />
  -
  -		<execute command="grep -q ^games /etc/passwd">
  -			<param>|| useradd</param>
  -			<param>-c 'games'</param>
  -			<param>-d /var/lib/games</param>
  -			<param>-g games</param>
  -			<param>-s /bin/false</param>
  -			<param>games</param>
  -		</execute>
  -
   		<configure>
   			<param>--prefix=`pkg-config --variable=prefix ORBit-2.0`</param>
   			<param>--localstatedir=/var/lib</param>
  
  
  



More information about the alfs-log mailing list