diff options
| author | Bill Nottingham <notting@redhat.com> | 2002-12-17 17:45:38 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2002-12-17 17:45:38 +0000 |
| commit | 5ea20a309fb11e31a8077e2bcf307291f7410f36 (patch) | |
| tree | 7666955e79b862be524543ca6d107132bdc390d6 | |
| parent | e6a4cb14e744f6f0170d1339974d7d581ee4351f (diff) | |
| download | initscripts-5ea20a309fb11e31a8077e2bcf307291f7410f36.tar initscripts-5ea20a309fb11e31a8077e2bcf307291f7410f36.tar.gz initscripts-5ea20a309fb11e31a8077e2bcf307291f7410f36.tar.bz2 initscripts-5ea20a309fb11e31a8077e2bcf307291f7410f36.tar.xz initscripts-5ea20a309fb11e31a8077e2bcf307291f7410f36.zip | |
more rhgb tweaks
have a loop for checking link state instead of a static 'sleep 5'
| -rwxr-xr-x | prefdm | 6 | ||||
| -rw-r--r-- | sysconfig.txt | 5 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 12 |
3 files changed, 18 insertions, 5 deletions
@@ -2,6 +2,12 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin + +# shut down any graphical boot that might exist +if [ -x /usr/bin/rhgb-client ]; then + /usr/bin/rhgb-client -quit +fi + # We need to source this so that the login screens get translated [ -f /etc/profile.d/lang.sh ] && . /etc/profile.d/lang.sh diff --git a/sysconfig.txt b/sysconfig.txt index b0388952..d162ae0d 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -86,9 +86,10 @@ Files in /etc/sysconfig /etc/sysconfig/init: BOOTUP=<some bootup mode> - BOOTUP=color means new (as of RH6.0) boot display. + BOOTUP=graphical means use X Windows graphical boot up + BOOTUP=color means colorized text mode boot display. BOOTUP=verbose means old style display - Anything else means new display, but without ANSI-formatting + Anything else means simplified display, but without color or ANSI-formatting LOGLEVEL=<a number> Sets the initial console logging level for the kernel. The default is 7. 8 means everything (including debugging); diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index ad9e40d3..49d9cca5 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -131,9 +131,15 @@ check_device_down () check_link_down () { if [ -x /sbin/mii-tool ]; then - LC_ALL=C ip link show $1 2>/dev/null| grep -q UP || ip link set $1 up >/dev/null 2>&1 - # wait for link to come up - sleep 5 + if ! LC_ALL=C ip link show $1 2>/dev/null| grep -q UP ; then + ip link set $1 up >/dev/null 2>&1 + timeout=0 + while [ $timeout -le 10 ]; do + LC_ALL=C ip link show $1 2>/dev/null | grep -q UP && break + usleep 500000 + timeout=$((timeout+1)) + done + fi /sbin/mii-tool $1 >/dev/null 2>&1 || return 1 output=`LC_ALL=C /sbin/mii-tool $1 2>&1` if echo $output | grep -q "Operation not supported"; then |