1
diff --git a/bin/networkmanager b/bin/networkmanager
2
index f72fa93..eab3b7e 100755
3
--- a/bin/networkmanager
4
+++ b/bin/networkmanager
5
@@ -67,6 +67,13 @@ fi
6
67
# stopped.
67
# stopped.
7
68
$SNAP/bin/dhcp-lease-mover &
68
$SNAP/bin/dhcp-lease-mover &
8
69
69
9
70
# Run available startup hooks to have a point to store custom
10
71
# logic outside of this script. More of the things from above
11
72
# should be moved into these.
12
73
for hook in $SNAP/startup-hooks/* ; do
13
74
    [ -x "$hook" ] && /bin/sh -x "$hook"
14
75
done
15
76
16
70
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/NetworkManager"
77
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/NetworkManager"
17
71
78
18
72
$SNAP/usr/sbin/NetworkManager \
79
$SNAP/usr/sbin/NetworkManager \
19
diff --git a/snapcraft.yaml b/snapcraft.yaml
20
index e34b875..50dc540 100644
21
--- a/snapcraft.yaml
22
+++ b/snapcraft.yaml
23
@@ -35,6 +35,7 @@ parts:
24
35
      bin/dhcp-lease-mover: bin/dhcp-lease-mover
35
      bin/dhcp-lease-mover: bin/dhcp-lease-mover
25
36
      conf/NetworkManager.conf: etc/NetworkManager/NetworkManager.conf
36
      conf/NetworkManager.conf: etc/NetworkManager/NetworkManager.conf
26
37
      data/copyright: usr/share/doc/network-manager/copyright
37
      data/copyright: usr/share/doc/network-manager/copyright
27
38
      startup-hooks/99-wol-by-default.sh: startup-hooks/99-wol-by-default.sh
28
38
39
29
39
  inotify-tools:
40
  inotify-tools:
30
40
    plugin: nil
41
    plugin: nil
31
diff --git a/startup-hooks/99-wol-by-default.sh b/startup-hooks/99-wol-by-default.sh
32
41
new file mode 100755
42
new file mode 100755
33
index 0000000..c2d4480
34
--- /dev/null
35
+++ b/startup-hooks/99-wol-by-default.sh
36
@@ -0,0 +1,13 @@
37
1
#!/bin/sh
38
2
39
3
# Enable wake-on-lan by default until we have a configuration
40
4
# hook to do that.
41
5
if [ ! -e $SNAP_DATA/conf.d/enable-wol.conf ] ; then
42
6
	mkdir -p $SNAP_DATA/conf.d
43
7
	cat <<-EOF > $SNAP_DATA/conf.d/enable-wol.conf
44
8
		[connection]
45
9
		# Value 64 maps to the 'magic' setting; see man nm-settings
46
10
		# for more information.
47
11
		802-3-ethernet.wake-on-lan=64
48
12
	EOF
49
13
fi
50
diff --git a/tests/full/wol-enabled-by-default/task.yaml b/tests/full/wol-enabled-by-default/task.yaml
51
0
new file mode 100644
14
new file mode 100644
52
index 0000000..434ef01
53
--- /dev/null
54
+++ b/tests/full/wol-enabled-by-default/task.yaml
55
@@ -0,0 +1,59 @@
56
1
summary: Verify that wake-on-lan is enabled by default for all ethernet connections
57
2
58
3
execute: |
59
4
    . $TESTSLIB/utilities.sh
60
5
    nmcli=/snap/bin/network-manager.nmcli
61
6
    case "$SPREAD_REBOOT" in
62
7
        0)
63
8
            # For correct timing if the device has just booted
64
9
            wait_for_network_manager
65
10
66
11
            # The config file needs to be present and have the correct default set
67
12
            test -e /var/snap/network-manager/current/conf.d/enable-wol.conf
68
13
            cat /var/snap/network-manager/current/conf.d/enable-wol.conf | grep '802-3-ethernet.wake-on-lan=64'
69
14
70
15
            # Precondition is a existing network connection
71
16
            $nmcli d | grep 'eth0.*connected'
72
17
73
18
            # The netplan configuration file has WoL disabled by default as
74
19
            # the default one the core snap provides does not explicitly
75
20
            # enable WoL.
76
21
            connection=$($nmcli -m multiline -f UUID c show --active | awk '{print$2;exit}')
77
22
            $nmcli -m multiline -f connection.id c show $connection | grep 'netplan-eth0'
78
23
            $nmcli -m multiline -f connection.type c show $connection | grep '802-3-ethernet'
79
24
            $nmcli -m multiline -f 802-3-ethernet.wake-on-lan c show $connection | grep '0 (none)'
80
25
81
26
            # Now prepare for the next boot where we will run without a netplan
82
27
            # config to get eth0 correctly configured.
83
28
            rm /etc/netplan/00-snapd-config.yaml
84
29
            REBOOT
85
30
            ;;
86
31
        1)
87
32
            # For correct timing if the device has just booted
88
33
            wait_for_network_manager
89
34
90
35
            # Precondition is a existing network connection
91
36
            $nmcli d | grep 'eth0.*connected'
92
37
93
38
            # Connection should have the default wake-on-lan setting
94
39
            connection=$($nmcli -m multiline -f UUID c show | awk '{print$2;exit}')
95
40
            $nmcli -m multiline -f connection.type c show $connection | grep '802-3-ethernet'
96
41
            # wake-on-lan should be set to respect the global defaults here
97
42
            $nmcli -m multiline -f 802-3-ethernet.wake-on-lan c show $connection | grep '1 (default)'
98
43
99
44
            # We can sadly only verify that the value was correctly applied when
100
45
            # we're running the tests on a real device. QEMU doesn't support setting
101
46
            # the WoL value of the ethernet network device.
102
47
            if [ ! cat /proc/cpuinfo | grep QEMU ] ; then
103
48
                # Get the tools snap to have the ethtool tool available
104
49
                snap install --devmode --edge se-test-tools
105
50
                snap connect se-test-tools:network core
106
51
                snap connect se-test-tools:network-bind core
107
52
                snap connect se-test-tools:network-control core
108
53
109
54
                # See `man ethtool` for details; 'g' means 'wakeup when magic packet comes in'
110
55
                # and is the default behavior we want.
111
56
                /snap/bin/se-test-tools.ethtool eth0 | grep 'Wake-up: g'
112
57
            fi
113
58
            ;;
114
59
    esac
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2016-11-28
Approved revision:	b549a36d29695c00e10213e4b2a4926e7376110a
Merged at revision:	0d73fadaa39fe9f1de4a80f73ddca604a3cf08b3
Proposed branch:	~morphis/snappy-hwe-snaps/+git/network-manager:global-wol-config
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target:	114 lines (+80/-0) 4 files modified bin/networkmanager (+7/-0) snapcraft.yaml (+1/-0) startup-hooks/99-wol-by-default.sh (+13/-0) tests/full/wol-enabled-by-default/task.yaml (+59/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration		Approve on 2016-11-28
Alfonso Sanchez-Beato		2016-11-25	Approve on 2016-11-28
Konrad Zapałowicz (community)	code	2016-11-25	Approve on 2016-11-25
Tony Espy		2016-11-25	Pending
Review via email: mp+311843@code.launchpad.net