diff options
Diffstat (limited to 'rc.d/rc.sysinit')
| -rwxr-xr-x | rc.d/rc.sysinit | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index b28c8f70..97438d23 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -74,6 +74,7 @@ if [ -f /forcefsck ]; then fsckoptions="-f $fsckoptions" fi +_RUN_QUOTACHECK=0 if [ ! -f /fastboot ]; then STRING="Checking root filesystem" echo $STRING @@ -105,15 +106,11 @@ if [ ! -f /fastboot ]; then mount -n -o remount,ro / echo "Automatic reboot in progress." reboot - elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then - action "Checking root filesystem quotas" /sbin/quotacheck -v / + elif [ "$rc" = "1" ]; then + _RUN_QUOTACHECK=1 fi fi -if [ -x /sbin/quotaon ]; then - action "Turning on user and group quotas for root filesystem" /sbin/quotaon / -fi - # check for arguments mount -t proc /proc /proc @@ -136,11 +133,19 @@ fi # Remount the root filesystem read-write. action "Remounting root filesystem in read-write mode" mount -n -o remount,rw / +# Update quotas if fsck was run on /. +if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then + action "Checking root filesystem quotas" /sbin/quotacheck -v / +fi +# XXX Disabled to avoid complaints on root later with quotaon -a +#if [ -x /sbin/quotaon ]; then +# action "Turning on user and group quotas for root filesystem" /sbin/quotaon / +#fi + if [ -n "$IN_INITLOG" ]; then IN_INITLOG= fi - if [ ! -f /etc/HOSTNAME ]; then echo ${HOSTNAME} > /etc/HOSTNAME fi @@ -369,6 +374,31 @@ if [ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi | grep -q 'Type: Sequential-A fi fi +# Set preferred X display manager link +preferred= +if [ -f /etc/sysconfig/desktop ]; then + if [ -n "`grep GNOME /etc/sysconfig/desktop`" ]; then + preferred=gdm + elif [ -n "`grep KDE /etc/sysconfig/desktop`" ]; then + preferred=kdm + elif [ -n "`grep AnotherLevel /etc/sysconfig/desktop`" ]; then + preferred=xdm + fi +fi +if [ -n "$preferred" ] && which $preferred >/dev/null 2>&1; then + ln -snf ../..`which $preferred` /etc/X11/prefdm +else + if [ ! -l /etc/X11/prefdm ]; then + if which gdm >/dev/null 2>&1; then + ln -snf ../..`which gdm` /etc/X11/prefdm + elif which kdm >/dev/null 2>&1; then + ln -snf ../..`which kdm` /etc/X11/prefdm + elif which xdm >/dev/null 2>&1; then + ln -snf ../..`which xdm` /etc/X11/prefdm + fi + fi +fi + # Now that we have all of our basic modules loaded and the kernel going, # let's dump the syslog ring somewhere so we can find it later dmesg > /var/log/dmesg |