diff options
| author | Bill Nottingham <notting@redhat.com> | 2003-05-22 16:14:16 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2003-05-22 16:14:16 +0000 |
| commit | f620a0f4cad10fdd89d9658b2928b29515530a32 (patch) | |
| tree | 819dbc91d5e9261b7c24a197b44a23129e993007 | |
| parent | 4a689b58aa9d5b7c3d20ccd02af6841226626aba (diff) | |
| download | initscripts-f620a0f4cad10fdd89d9658b2928b29515530a32.tar initscripts-f620a0f4cad10fdd89d9658b2928b29515530a32.tar.gz initscripts-f620a0f4cad10fdd89d9658b2928b29515530a32.tar.bz2 initscripts-f620a0f4cad10fdd89d9658b2928b29515530a32.tar.xz initscripts-f620a0f4cad10fdd89d9658b2928b29515530a32.zip | |
checking /proc/cmdline doesn't work very well if /proc isn't mounted
| -rwxr-xr-x | rc.d/rc.sysinit | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 080d6246..56b9810a 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -23,10 +23,6 @@ fi . /etc/init.d/functions -# Start the graphical boot, if necessary -if ! fgrep -q nogui /proc/cmdline && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then - /usr/bin/rhgb -fi if [ "$HOSTTYPE" != "s390" -a "$HOSTTYPE" != "s390x" ]; then last=0 @@ -75,9 +71,14 @@ if [ -n "$LOGLEVEL" ]; then fi # Mount /proc (done here so volume labels can work with fsck) -update_boot_stage RCproc +#update_boot_stage RCproc action $"Mounting proc filesystem: " mount -n -t proc /proc /proc +# Start the graphical boot, if necessary +if ! fgrep -q nogui /proc/cmdline && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then + /usr/bin/rhgb +fi + # Unmount the initrd, if necessary if LC_ALL=C grep -q /initrd /proc/mounts && ! LC_ALL=C grep -q /initrd/loopfs /proc/mounts ; then if [ -e /initrd/dev/.devfsd ]; then |