From 1e610b947935fa07f427c06bb0490d92ab67a0ae Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 9 Apr 2008 16:28:50 -0400
Subject: Handle encrpyted LVs. (#441728)

This so needs to die.
---
 rc.d/rc.sysinit | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'rc.d')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 0f0a238b..1c149227 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -362,6 +362,13 @@ if [ -c /dev/mapper/control ]; then
 	fi
 fi
 
+if [ -f /etc/crypttab ]; then
+    s=$"Starting disk encryption:"
+    echo "$s"
+    init_crypto 0 && success "$s" || failure "$s"
+    echo
+fi
+
 if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then
 	fastboot=yes
 fi
-- 
cgit v1.2.1


From 9ffff0219cc67d20a1a006465b82fb73e2873dbb Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 15 Apr 2008 12:55:37 -0400
Subject: find is now in /bin. Use it. (#192991, #244941, #432818, #442178,
 #239914)

---
 rc.d/rc.sysinit | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 1c149227..db761415 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -427,7 +427,6 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
 	mount_dirs() {
 		if [ -e "$1" ]; then
 			mkdir -p "$RW_MOUNT$1"
-			# fixme: find is bad
 			find "$1" -type d -print0 | cpio -p -0vd "$RW_MOUNT" &>/dev/null
 			mount -n --bind "$RW_MOUNT$1" "$1"
 		fi
@@ -751,24 +750,9 @@ rm -f /fastboot /fsckoptions /forcefsck /.autofsck /forcequotacheck /halt \
 _NEED_XFILES=
 [ -f /var/run/utmpx -o -f /var/log/wtmpx ] && _NEED_XFILES=1
 
-# Clean up /var.  I'd use find, but /usr may not be mounted.
-for afile in /var/lock/* /var/run/* ; do
-	if [ -d "$afile" ]; then
-	   case "$afile" in
-		*/news|*/mon)	;;
-		*/sudo)		rm -f $afile/*/* ;;
-		*/vmware)	rm -rf $afile/*/* ;;
-		*/samba)	rm -rf $afile/*/* ;;
-		*/screen)	rm -rf $afile/* ;;
-		*/cvs)		rm -rf $afile/* ;;
-		*/dovecot)	rm -f $afile/*/* ;;
-		*/cups)		rm -f $afile/*/* ;;
-		*)		rm -f $afile/* ;;
-	   esac
-	else
-	   rm -f $afile
-	fi
-done
+# Clean up /var.
+rm -rf /var/lock/cvs/* /var/run/screen/*
+find /var/lock /var/run -type f -exec rm -f {} \;
 rm -f /var/lib/rpm/__db* &> /dev/null
 rm -f /var/gdm/.gdmfifo &> /dev/null
 
-- 
cgit v1.2.1


From b8fbfde343e39337bcbddc33cab0bc30ee4fb0e3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 15 Apr 2008 13:16:38 -0400
Subject: properly handle symlinks, sockets

---
 rc.d/rc.sysinit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rc.d')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index db761415..5c0328ea 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -752,7 +752,7 @@ _NEED_XFILES=
 
 # Clean up /var.
 rm -rf /var/lock/cvs/* /var/run/screen/*
-find /var/lock /var/run -type f -exec rm -f {} \;
+find -L /var/lock /var/run ! -type d -exec rm -f {} \;
 rm -f /var/lib/rpm/__db* &> /dev/null
 rm -f /var/gdm/.gdmfifo &> /dev/null
 
-- 
cgit v1.2.1


From 462db3ecfb1aad47105e6efccff9e55cef83f42f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 23 Apr 2008 15:29:52 -0400
Subject: do a much better check for network availability

Avoids nasty 'FAILED' messages when using NetworkManager.
---
 rc.d/init.d/netfs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 6769c132..1ad100bb 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -17,9 +17,6 @@
 . /etc/init.d/functions
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
 NFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
 SMBFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
 CIFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "cifs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
@@ -35,6 +32,7 @@ NETDEVMTAB=`LC_ALL=C awk '$4 ~ /_netdev/ && $2 != "/" { print $2 }' /etc/mtab`
 # See how we were called.
 case "$1" in
   start)
+        [ ! -f /var/lock/subsys/network -a ! -f /var/lock/subsys/NetworkManager ] && exit 0
         [ -n "$NFSFSTAB" ] && 
 	  {
 	    [ ! -f /var/lock/subsys/rpcbind ] && service rpcbind start
-- 
cgit v1.2.1