[oneSIS-devel] SF.net SVN: onesis:[427] trunk/distro-patches/redhat-el-as5-u2.patch

[<mr...@us...>]

Revision: 427
          http://onesis.svn.sourceforge.net/onesis/?rev=427&view=rev
Author:   mr_ep
Date:     2008-10-07 17:21:11 +0000 (Tue, 07 Oct 2008)

Log Message:
-----------
distro patch that applies cleanly to current RHEL 5.2 (and Centos 5.2 with offset)

Added Paths:
-----------
    trunk/distro-patches/redhat-el-as5-u2.patch

Added: trunk/distro-patches/redhat-el-as5-u2.patch
===================================================================
--- trunk/distro-patches/redhat-el-as5-u2.patch	                        (rev 0)
+++ trunk/distro-patches/redhat-el-as5-u2.patch	2008-10-07 17:21:11 UTC (rev 427)
@@ -0,0 +1,131 @@
+--- etc/rc.d/rc.sysinit.orig	2008-09-24 09:01:53.000000000 -0600
++++ etc/rc.d/rc.sysinit	2008-10-06 09:52:59.000000000 -0600
+@@ -633,7 +633,8 @@
+ 	if [ "${RHGB_STARTED}" != "0" -a -w /etc/rhgb/temp/rhgb-console ]; then
+ 		fsck -T -t noopts=_netdev -A $fsckoptions > /etc/rhgb/temp/rhgb-console
+ 	else
+-		fsck -T -t noopts=_netdev -A $fsckoptions
++		ROOTFS=`grep " / " /proc/mounts |grep "^/dev" | awk '{ print $1 }'`
++		fsck -T -A $fsckoptions $ROOTFS
+ 	fi
+ 	rc=$?
+ 	
+@@ -721,9 +722,9 @@
+  
+ # Remount the root filesystem read-write.
+ update_boot_stage RCmountfs
+-if remount_needed ; then
+-  action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
+-fi
++#if remount_needed ; then
++#  action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
++#fi
+ 
+ # Clean up SELinux labels
+ if [ -n "$SELINUX_STATE" ]; then
+@@ -731,17 +732,17 @@
+ fi
+ 
+ # Clear mtab
+-(> /etc/mtab) &> /dev/null
++#(> /etc/mtab) &> /dev/null
+ 
+ # Remove stale backups
+-rm -f /etc/mtab~ /etc/mtab~~
++#rm -f /etc/mtab~ /etc/mtab~~
+ 
+ # Enter mounted filesystems into /etc/mtab
+-mount -f /
+-mount -f /proc >/dev/null 2>&1
+-mount -f /sys >/dev/null 2>&1
+-mount -f /dev/pts >/dev/null 2>&1
+-mount -f /proc/bus/usb >/dev/null 2>&1
++#mount -f /
++#mount -f /proc >/dev/null 2>&1
++#mount -f /sys >/dev/null 2>&1
++#mount -f /dev/pts >/dev/null 2>&1
++#mount -f /proc/bus/usb >/dev/null 2>&1
+ 
+ # Mount all other filesystems (except for NFS and /proc, which is already
+ # mounted). Contrary to standard usage,
+@@ -832,33 +833,33 @@
+ fi
+ 
+ # Clean out /.
+-rm -f /fastboot /fsckoptions /forcefsck /.autofsck /forcequotacheck /halt \
+-	/poweroff &> /dev/null
++#rm -f /fastboot /fsckoptions /forcefsck /.autofsck /forcequotacheck /halt \
++#	/poweroff &> /dev/null
+ 
+ # Do we need (w|u)tmpx files? We don't set them up, but the sysadmin might...
+ _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
+-rm -f /var/lib/rpm/__db* &> /dev/null
+-rm -f /var/gdm/.gdmfifo &> /dev/null
++#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
++#rm -f /var/lib/rpm/__db* &> /dev/null
++#rm -f /var/gdm/.gdmfifo &> /dev/null
+ 
+ # Reset pam_console permissions
+ [ -x /sbin/pam_console_apply ] && /sbin/pam_console_apply -r
+@@ -878,11 +879,11 @@
+ 
+ # Clean up various /tmp bits
+ [ -n "$SELINUX_STATE" ] && restorecon /tmp
+-rm -f /tmp/.X*-lock /tmp/.lock.* /tmp/.gdm_socket /tmp/.s.PGSQL.*
+-rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \
+-       /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-*  \
+-       /tmp/scrollkeeper-*  /tmp/ssh-* \
+-       /dev/.in_sysinit
++#rm -f /tmp/.X*-lock /tmp/.lock.* /tmp/.gdm_socket /tmp/.s.PGSQL.*
++#rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \
++#       /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-*  \
++#       /tmp/scrollkeeper-*  /tmp/ssh-* \
++#       /dev/.in_sysinit
+ 
+ # Make ICE directory
+ mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
+@@ -938,7 +939,7 @@
+ dmesg -s 131072 > /var/log/dmesg
+ 
+ # create the crash indicator flag to warn on crashes, offer fsck with timeout
+-touch /.autofsck &> /dev/null
++#touch /.autofsck &> /dev/null
+ 
+ if [ "$PROMPT" != no ]; then
+     while :; do


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.