diff options
Diffstat (limited to 'sysconfig/network-scripts/ifup')
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index d16eca68..a5feff88 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -15,6 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +PATH=/sbin:/usr/sbin:/bin:/usr/bin +TEXTDOMAIN=initscripts + unset WINDOW # defined by screen, conflicts with our usage . /etc/init.d/functions @@ -22,7 +25,7 @@ unset WINDOW # defined by screen, conflicts with our usage cd /etc/sysconfig/network-scripts . ./network-functions -[ -f ../network ] && . ../network +[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network CONFIG=${1} @@ -65,12 +68,16 @@ then exit 0 fi -if [ "$_use_nm" = "true" -a -n "$UUID" ]; then - if [ "foo$2" = "fooboot" ] && [ "${TYPE}" = "Wireless" ]; then - exit 0 +if [ "$_use_nm" = "true" ]; then + if [ -n "$UUID" ]; then + if [ "foo$2" = "fooboot" ] && [ "${TYPE}" = "Wireless" ]; then + exit 0 + fi + nmcli con up uuid "$UUID" + exit $? fi - nmcli con up uuid "$UUID" - exit $? + echo $"$0: interface ${CONFIG} is controlled by NetworkManager; skipping." >&2 + exit 0 fi # Ethernet 802.1Q VLAN support @@ -133,9 +140,8 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then /usr/lib/systemd/systemd-sysctl --prefix "/proc/sys/net/ipv4/conf/${DEVICE}" --prefix "/proc/sys/net/ipv6/conf/${DEVICE}" fi -if [ "${BOOTPROTO}" = "bootp" -o "${BOOTPROTO}" = "dhcp" ]; then - DYNCONFIG=true -fi +# signalling the start of connection +mdv-network-event connection_start ${DEVICE} if [ -x /sbin/ifup-pre-local ]; then /sbin/ifup-pre-local ${CONFIG} $2 |