Merging changes from baselayout revision 1572

svn path=/baselayout-vserver/trunk/; revision=62

5 files changed, 13 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 085fac1..d1ff109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2
 
+  13 Oct 2005; Roy Marples <uberlord@gentoo.org>:
+
+    Fix test_service_state() so it always returns 1 when it's not in that
+    state.
+
   12 Oct 2005; Roy Marples <uberlord@gentoo.org>:
 
     Changed number of preferred modules from 3 to 4 in net.lo, #108960.
@@ -478,8 +483,8 @@
 
   19 Jul 2005; Mike Frysinger <vapier@gentoo.org>:
 
-    Punt the at/bind/cron/cyrus/ftp/games/man/mysql/qmail/slocate/squid/
-    sshd/vpopmail users/groups to the respective ebuilds.
+    Punt the at/bind/cron/cyrus/ftp/games/gdm/man/mysql/qmail/slocate/squid/
+    sshd/vpopmail/xfs users/groups to the respective ebuilds.
 
   19 Jul 2005; Roy Marples <uberlord@gentoo.org>:
 
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 6b32243..8cbe36d 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2
 
+  16 Oct 2005; Christian Heim <phreak@gentoo.org> ChangeLog, ChangeLog.vserver,
+  etc/group, etc/passwd, sbin/rc-services.sh:
+  Merging changes from baselayout revision 1572
+
   12 Oct 2005; Christian Heim <phreak@gentoo.org> ChangeLog, ChangeLog.vserver,
   man/start-stop-daemon.8, net-scripts/init.d/net.lo,
   net-scripts/net.modules.d/arping,
diff --git a/etc/group b/etc/group
index b58bd79..f954ac7 100644
--- a/etc/group
+++ b/etc/group
@@ -19,8 +19,6 @@ cdrom::19:
 dialout::20:root
 tape::26:root
 video::27:root
-gdm::32:gdm
-xfs::33:xfs
 postgres::70:
 cdrw::80:
 nut::84:
diff --git a/etc/passwd b/etc/passwd
index d108763..10496a0 100644
--- a/etc/passwd
+++ b/etc/passwd
@@ -11,8 +11,6 @@ news:x:9:13:news:/usr/lib/news:/bin/false
 uucp:x:10:14:uucp:/var/spool/uucppublic:/bin/false
 operator:x:11:0:operator:/root:/bin/bash
 postmaster:x:14:12:postmaster:/var/spool/mail:/bin/false
-gdm:x:32:32:GDM:/var/lib/gdm:/bin/false
-xfs:x:33:33:X Font Server:/etc/X11/fs:/bin/false
 postgres:x:70:70::/var/lib/postgresql:/bin/bash
 nut:x:84:84:nut:/var/state/nut:/bin/false
 postfix:x:207:207:postfix:/var/spool/postfix:/bin/false
diff --git a/sbin/rc-services.sh b/sbin/rc-services.sh
index 0badfd5..e828863 100755
--- a/sbin/rc-services.sh
+++ b/sbin/rc-services.sh
@@ -527,12 +527,8 @@ test_service_state() {
 	# Service is in the state requested
 	[[ -L ${f} ]] && return 0
 	
-	if [[ ! -e ${f} ]] ; then
-		rm -f "${f}"
-		return 1
-	fi
-	
-	return 0
+	[[ ! -e ${f} ]] && rm -f "${f}"
+	return 1
 }
 
 # bool service_starting(service)