diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-03-03 16:28:14 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-03-03 16:28:14 -0500 |
| commit | 6a8455a700782b40e474963dc42dda3b1d14fc68 (patch) | |
| tree | 3cea343c175a973f95ce16c9855497944fbe925a /sysconfig/network-scripts/ifup | |
| parent | 3a86ed0b2e6c145ec9cbdf49b36e07b5bb13b36d (diff) | |
| parent | bab107339ca07cbbef05ac79bd34b19d8a081fe4 (diff) | |
| download | initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar.gz initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar.bz2 initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar.xz initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.zip | |
Merge branch 'nm-integration'
Diffstat (limited to 'sysconfig/network-scripts/ifup')
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index e3b01478..cc5efc97 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -31,7 +31,7 @@ CONFIG=${1} exit 1 } -need_config ${CONFIG} +need_config "${CONFIG}" [ -f "${CONFIG}" ] || { echo $"$0: configuration for ${1} not found." >&2 @@ -65,6 +65,11 @@ then exit 0 fi +if [ "$USE_NM" = "true" -a -n "$UUID" ]; then + nmcli con up uuid "$UUID" + exit $? +fi + # Ethernet 802.1Q VLAN support if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -x /sbin/vconfig ]; then VID="" |