[xc/skel] Make NetworkManager connect eth by default

diff --git a/target/generic/target_xenclient_skeleton/etc/NetworkManager/system-connections/Wired Ethernet connection b/target/generic/target_xenclient_skeleton/etc/NetworkManager/system-connections/Wired Ethernet connection
new file mode 100644 (file)
index 0000000..09f8185
--- /dev/null
+++ b/target/generic/target_xenclient_skeleton/etc/NetworkManager/system-connections/Wired Ethernet connection
@@ -0,0 +1,18 @@
+
+[connection]
+id=Wired Ethernet connection
+uuid=1259e8e4-5b90-48bb-bfbb-9496c38d37ca
+type=802-3-ethernet
+autoconnect=true
+timestamp=0
+
+[802-3-ethernet]
+speed=0
+auto-negotiate=true
+mtu=0
+
+[ipv4]
+method=auto
+ignore-auto-routes=false
+ignore-auto-dns=false
+never-default=false

diff --git a/target/generic/target_xenclient_skeleton/etc/init.d/S48bridge b/target/generic/target_xenclient_skeleton/etc/init.d/S48bridge
index 35dc92b365ab55414a0cd9c1c3ac4ba40b497cec..12c67e3d4b5ede2f57627771aed5d553384379c9 100755 (executable)
--- a/target/generic/target_xenclient_skeleton/etc/init.d/S48bridge
+++ b/target/generic/target_xenclient_skeleton/etc/init.d/S48bridge
@@ -24,7 +24,18 @@ case "$1" in
        brctl addbr iovm
        ifconfig iovm 10.169.142.1 netmask 255.255.255.0 up
        
-       nm-system-settings --config /etc/NetworkManager/nm-system-settings.conf &
+       # NOTE !!!
+       # We start HAL later than this. That's an error but we now rely on
+       # the behaviour caused by this to make NetworkManager do the right
+       # thing (when it can't see Hal it creates a default "Ethernet" device
+       # where 803-3 connections are assigned to. If we do have hal
+       # it will create several ones which is not what we want since
+       # the NM_IFACE_FORCE hack will point them all to brbridged anyway
+       # and expose the internal IFs.
+       # What we do need is a plugin that handles our weirdness or at
+       # least a patch to make it not use HAL and just have only the
+       # one forced interface.
+       nm-system-settings --plugins=keyfile &
         export NM_IFACE_FORCE="brbridged"
        NetworkManager