net-eth, oem: use/oem/vnc for disable NetworkManager control eth0
Network interface managed by NetworkManager is not activated when alterator-setup is launched.
This commit is contained in:
parent
cd88c10e95
commit
2d53a9af94
@ -6,11 +6,15 @@
|
||||
fatal() { echo "error: $*" >&2; exit 1; }
|
||||
|
||||
# simple etcnet configurations are also picked up by NM
|
||||
if type -t NetworkManager >&/dev/null ||
|
||||
if [ -n "$GLOBAL_NMCTL" ]; then
|
||||
NMCTL="$GLOBAL_NMCTL"
|
||||
else
|
||||
if type -t NetworkManager >&/dev/null ||
|
||||
type -t connmand >&/dev/null; then
|
||||
NMCTL=yes
|
||||
else
|
||||
else
|
||||
NMCTL=no
|
||||
fi
|
||||
fi
|
||||
|
||||
ETCNET_IFDIR="/etc/net/ifaces"
|
||||
|
@ -7,6 +7,8 @@ use/oem: use/services use/branding
|
||||
@$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET))
|
||||
@$(call xport,OEM_TARGET)
|
||||
|
||||
use/oem/vnc: use/oem use/x11-vnc
|
||||
use/oem/vnc: use/oem use/x11-vnc use/net-eth/dhcp
|
||||
@$(call add,THE_PACKAGES,alterator-setup-x11vnc)
|
||||
@$(call set,OEM_TARGET,setup-vnc)
|
||||
@$(call set,NMCTL,no)
|
||||
@$(call xport,NMCTL)
|
||||
|
Loading…
Reference in New Issue
Block a user