diff options
| author | Bill Nottingham <notting@redhat.com> | 2003-05-20 15:37:37 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2003-05-20 15:37:37 +0000 |
| commit | 0e4fb96126d0c7c80b17d548d308c2bdcf1c56a3 (patch) | |
| tree | 4a746e41a42493351ea81c5c08d8ec07f5376202 | |
| parent | 06f071a8056a43d6270700c154b8e26fac672849 (diff) | |
| download | initscripts-0e4fb96126d0c7c80b17d548d308c2bdcf1c56a3.tar initscripts-0e4fb96126d0c7c80b17d548d308c2bdcf1c56a3.tar.gz initscripts-0e4fb96126d0c7c80b17d548d308c2bdcf1c56a3.tar.bz2 initscripts-0e4fb96126d0c7c80b17d548d308c2bdcf1c56a3.tar.xz initscripts-0e4fb96126d0c7c80b17d548d308c2bdcf1c56a3.zip | |
updated rhgb support (<jrb@redhat.com>)
| -rwxr-xr-x | rc.d/rc.sysinit | 12 | ||||
| -rw-r--r-- | sysconfig/init | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index d0c424fb..54694896 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -24,12 +24,8 @@ fi . /etc/init.d/functions # Start the graphical boot, if necessary -if [ "$BOOTUP" = "graphical" ]; then - if [ -x /usr/bin/rhgb ]; then +if [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" ]; then /usr/bin/rhgb - else - BOOTUP=color - fi fi if [ "$HOSTTYPE" != "s390" -a "$HOSTTYPE" != "s390x" ]; then @@ -265,7 +261,7 @@ if [ -z "$fastboot" -a "X$ROOTFSTYPE" != "Xnfs" ]; then # A return of 2 or higher means there were serious problems. if [ $rc -gt 1 ]; then - if [ "$BOOTUP" = "graphical" ]; then + if [ -x /usr/bin/rhgb-client -a /usr/bin/rhgb-client --ping ]; then chvt 1 fi @@ -523,7 +519,7 @@ if [ -z "$fastboot" ]; then # A return of 2 or higher means there were serious problems. if [ $rc -gt 1 ]; then - if [ "$BOOTUP" = "graphical" ]; then + if [ -x /usr/bin/rhgb-client -a /usr/bin/rhgb-client --ping ]; then chvt 1 fi @@ -579,7 +575,7 @@ fi # Configure machine if necessary. if [ -f /.unconfigured ]; then - if [ "$BOOTUP" = "graphical" ]; then + if [ -x /usr/bin/rhgb-client -a /usr/bin/rhgb-client --ping ]; then chvt 1 fi diff --git a/sysconfig/init b/sysconfig/init index 93c2be9d..1ffeaea6 100644 --- a/sysconfig/init +++ b/sysconfig/init @@ -2,6 +2,8 @@ # verbose => old-style bootup # anything else => new style bootup without ANSI colors or positioning BOOTUP=color +# Turn on graphical boot +GRAPHICAL=yes # column to start "[ OK ]" label in RES_COL=60 # terminal sequence to move to that column. You could change this |