diff options
| author | Olav Vitters <olav@vitters.nl> | 2020-07-28 10:50:53 +0200 |
|---|---|---|
| committer | Olav Vitters <olav@vitters.nl> | 2020-07-28 10:50:53 +0200 |
| commit | fa8a602cfeeb757a2117e4e1ad3d2717e69d34ff (patch) | |
| tree | c431518e4d1f1460be4c39d09834763cf75eedda | |
| parent | 057113fa55e5731ada1e414c607ba3bc85d676e6 (diff) | |
| download | initscripts-fa8a602cfeeb757a2117e4e1ad3d2717e69d34ff.tar initscripts-fa8a602cfeeb757a2117e4e1ad3d2717e69d34ff.tar.gz initscripts-fa8a602cfeeb757a2117e4e1ad3d2717e69d34ff.tar.bz2 initscripts-fa8a602cfeeb757a2117e4e1ad3d2717e69d34ff.tar.xz initscripts-fa8a602cfeeb757a2117e4e1ad3d2717e69d34ff.zip | |
network-up: make use of is_true and is_false in our customizations
| -rwxr-xr-x | mandriva/network-up | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mandriva/network-up b/mandriva/network-up index 18551414..d77b2137 100755 --- a/mandriva/network-up +++ b/mandriva/network-up @@ -24,7 +24,7 @@ RESOLVCONF_DIR=/var/run/resolvconf/interface . /etc/sysconfig/network # Check that networking is up. -[ "${NETWORKING}" = "no" ] && exit 0 +is_false "${NETWORKING}" && exit 0 cd /etc/sysconfig/network-scripts . network-functions @@ -88,7 +88,7 @@ function should_wait_network() { # only check interfaces using ifplug, other interfaces are # started synchronously from the network service - if [ "$MII_NOT_SUPPORTED" = "yes" ]; then + if is_true "$MII_NOT_SUPPORTED"; then continue fi @@ -143,7 +143,7 @@ function should_wait_network() { # wait for changes to be propagated by resolvconf if needed if [ -e $RESOLVCONF_FLAGFILE ]; then - if [ "$BOOTPROTO" = "dhcp" -a "$PEERDNS" != "no" ] \ + if [ "$BOOTPROTO" = "dhcp" ] && ! is_false "$PEERDNS" \ || [ -n "$DNS1" -o -n "$DNS2" ]; then if [ ! -e $RESOLVCONF_DIR/$DEVICE ]; then return 0 |