Merge lp:~raharper/curtin/trunk.delete-eth0-cfg-in-target into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

Detect and remove legacy /etc/network/interfaces.d/eth0.cfg from target

Prior to Xenial release, Ubuntu Cloud images included a default network
configuration in /etc/network/interfaces.d/eth0.conf. The presence of
this legacy configuration file can cause a delay during boot when cloud-
init is expecting a non-existent interface to become available. curtin
installations handle configuring networking in the target installed
system subsequently the embedded configuration is not needed.

This patch reuses most of cloud-init's version of detecting and examining the legacy config, confirming if the contents are what is expected. Upon finding expected content, the file will be removed, otherwise it will remain.

Additional changes to vmtest and unittest were added to remove the reliance on fallback nic naming (eth0); we always use non-kernel names in our configuration now. An additional common test has been added to check that in all cases we ensure we remove the embedded config.

Detect and remove legacy /etc/network/interfaces.d/eth0.cfg from target

Prior to Xenial release, Ubuntu Cloud images included a default network
configuration in /etc/network/interfaces.d/eth0.conf. The presence of
this legacy configuration file can cause a delay during boot when cloud-
init is expecting a non-existent interface to become available. curtin
installations handle configuring networking in the target installed
system subsequently the embedded configuration is not needed.

This patch reuses most of cloud-init's version of detecting and examining the legacy config, confirming if the contents are what is expected. Upon finding expected content, the file will be removed, otherwise it will remain.

Additional changes to vmtest and unittest were added to remove the reliance on fallback nic naming (eth0); we always use non-kernel names in our configuration now. An additional common test has been added to check that in all cases we ensure we remove the embedded config.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:390
https://server-team-jenkins.canonical.com/job/curtin-ci/229/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/226/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/229/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

one nit pick inline other than that, looks great.
i'd keep the '_maybe_remove', but for curtin's case it is much more a 'probably_remove'.

[Scott Moser (smoser)]

oh yeah, and move your description to the commit m essage and fix the new lines that seemed inserted somehow.

[Ryan Harper (raharper)]

On Thu, May 19, 2016 at 11:41 AM, Scott Moser <email address hidden> wrote:

> one nit pick inline other than that, looks great.
> i'd keep the '_maybe_remove', but for curtin's case it is much more a
> 'probably_remove'.
>

Indeed; other than when users have touched it (which in curtin's case will
almost never happen).

>
>
> Diff comments:
>
> >
> > === modified file 'curtin/util.py'
> > --- curtin/util.py 2016-04-04 19:09:47 +0000
> > +++ curtin/util.py 2016-05-18 14:11:09 +0000
> > @@ -288,6 +288,15 @@
> > return fp.read()
> >
> >
> > +def del_file(path):
> > + LOG.debug("Attempting to remove %s", path)
> > + try:
>
> attempting to remove seems not that useful. rather 'removed' or 'did not
> remove' would be better.
> LOG.debug("del_file: removed %s", path)
> except..
> LOG.debug("del_file: %s did not exist.").
>

This is lift 100% from cloud-init. So, I'll fix here and then MP to
cloud-init =)

>
> just thinking as we look at a log, 'attempting to remove' doesn't tell you
> all that much.
>

Yeah, but I was lazy.

>
> > + os.unlink(path)
> > + except OSError as e:
> > + if e.errno != errno.ENOENT:
> > + raise e
> > +
> > +
> > def disable_daemons_in_root(target):
> > contents = "\n".join(
> > ['#!/bin/sh',
>
>
> --
>
> https://code.launchpad.net/~raharper/curtin/trunk.delete-eth0-cfg-in-target/+merge/295084
> You are the owner of lp:~raharper/curtin/trunk.delete-eth0-cfg-in-target.
>

[lp:~raharper/curtin/trunk.delete-eth0-cfg-in-target]

391. By Ryan Harper on 2016-05-19

curtin/util.del_file: make log messages more useful.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:391
https://server-team-jenkins.canonical.com/job/curtin-ci/230/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/227/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/230/rebuild

review: Approve (continuous-integration)

[lp:~raharper/curtin/trunk.delete-eth0-cfg-in-target]

392. By Ryan Harper on 2016-05-19

util.del_file: don't log success until the file is removed.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:392
https://server-team-jenkins.canonical.com/job/curtin-ci/231/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/228/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/231/rebuild

review: Approve (continuous-integration)

=== modified file 'curtin/commands/curthooks.py'
--- curtin/commands/curthooks.py	2016-04-17 22:35:20 +0000
+++ curtin/commands/curthooks.py	2016-05-19 18:43:17 +0000
@@ -149,6 +149,42 @@
         os.unlink(dpkg_cfg)
 
 
+def _maybe_remove_legacy_eth0(target,
+                              path="/etc/network/interfaces.d/eth0.cfg"):
+    """Ubuntu cloud images previously included a 'eth0.cfg' that had
+       hard coded content.  That file would interfere with the rendered
+       configuration if it was present.
+
+       if the file does not exist do nothing.
+       If the file exists:
+         - with known content, remove it and warn
+         - with unknown content, leave it and warn
+    """
+
+    cfg = os.path.sep.join([target, path])
+    if not os.path.exists(cfg):
+        LOG.warn('Failed to find legacy conf file %s', cfg)
+        return
+
+    bmsg = "Dynamic networking config may not apply."
+    try:
+        contents = util.load_file(cfg)
+        known_contents = ["auto eth0", "iface eth0 inet dhcp"]
+        lines = [f.strip() for f in contents.splitlines()
+                 if not f.startswith("#")]
+        if lines == known_contents:
+            util.del_file(cfg)
+            msg = "removed %s with known contents" % cfg
+        else:
+            msg = (bmsg + " '%s' exists with user configured content." % cfg)
+    except:
+        msg = bmsg + " %s exists, but could not be read." % cfg
+        LOG.exception(msg)
+        return
+
+    LOG.warn(msg)
+
+
 def setup_zipl(cfg, target):
     if platform.machine() != 's390x':
         return
@@ -522,6 +558,8 @@
         LOG.debug("copying interfaces")
         copy_interfaces(interfaces, target)
 
+    _maybe_remove_legacy_eth0(target)
+
 
 def copy_interfaces(interfaces, target):
     if not interfaces:

=== modified file 'curtin/util.py'
--- curtin/util.py	2016-04-04 19:09:47 +0000
+++ curtin/util.py	2016-05-19 18:43:17 +0000
@@ -288,6 +288,16 @@
         return fp.read()
 
 
+def del_file(path):
+    try:
+        os.unlink(path)
+        LOG.debug("del_file: removed %s", path)
+    except OSError as e:
+        LOG.exception("del_file: %s did not exist.", path)
+        if e.errno != errno.ENOENT:
+            raise e
+
+
 def disable_daemons_in_root(target):
     contents = "\n".join(
         ['#!/bin/sh',

=== modified file 'examples/network-iscsiroot.yaml'
--- examples/network-iscsiroot.yaml	2016-04-15 20:33:51 +0000
+++ examples/network-iscsiroot.yaml	2016-05-19 18:43:17 +0000
@@ -5,14 +5,14 @@
         # to prevent networking restarts from up/down'ing the
         # interface
         - type: physical
-          name: eth0
+          name: interface0
           mac_address: "c0:d6:9f:2c:e8:80"
           subnets:
               - type: dhcp4
                 control: manual
         # control: auto this is the default if control isn't present
         - type: physical
-          name: eth1
+          name: interface1
           mtu: 1492
           mac_address: "aa:d6:9f:2c:e8:80"
           subnets:
@@ -25,7 +25,7 @@
         # and we want to auto configure this 
         # when present
         - type: physical
-          name: eth2
+          name: interface2
           mac_address: "cf:d6:af:48:e8:80"
           subnets:
               - type: static

=== modified file 'examples/tests/basic_network.yaml'
--- examples/tests/basic_network.yaml	2016-04-04 16:03:32 +0000
+++ examples/tests/basic_network.yaml	2016-05-19 18:43:17 +0000
@@ -4,12 +4,12 @@
     config:
         # Physical interfaces.
         - type: physical
-          name: eth0
+          name: interface0
           mac_address: "52:54:00:12:34:00"
           subnets:
               - type: dhcp4
         - type: physical
-          name: eth1
+          name: interface1
           mtu: 1492
           mac_address: "52:54:00:12:34:02"
           subnets:
@@ -22,5 +22,5 @@
                 dns_search:
                   - barley.maas
         - type: physical
-          name: eth2
+          name: interface2
           mac_address: "52:54:00:12:34:04"

=== modified file 'examples/tests/basic_network_static.yaml'
--- examples/tests/basic_network_static.yaml	2016-04-04 16:03:32 +0000
+++ examples/tests/basic_network_static.yaml	2016-05-19 18:43:17 +0000
@@ -4,7 +4,7 @@
     config:
         # Physical interfaces.
         - type: physical
-          name: eth0
+          name: interface0
           mac_address: "52:54:00:12:34:00"
           subnets:
               - type: static

=== modified file 'examples/tests/bonding_network.yaml'
--- examples/tests/bonding_network.yaml	2016-04-17 22:35:20 +0000
+++ examples/tests/bonding_network.yaml	2016-05-19 18:43:17 +0000
@@ -4,23 +4,23 @@
     config:
         # Physical interfaces.
         - type: physical
-          name: eth0
+          name: interface0
           mac_address: "52:54:00:12:34:00"
           subnets:
               - type: dhcp4
         - type: physical
-          name: eth1
+          name: interface1
           mac_address: "52:54:00:12:34:02"
         - type: physical
-          name: eth2
+          name: interface2
           mac_address: "52:54:00:12:34:04"
         # Bond.
         - type: bond
           name: bond0
           mac_address: "52:54:00:12:34:06"
           bond_interfaces:
-            - eth1
-            - eth2
+            - interface1
+            - interface2
           params:
             bond-mode: active-backup
           subnets:

=== modified file 'examples/tests/network_source.yaml'
--- examples/tests/network_source.yaml	2016-04-07 15:06:04 +0000
+++ examples/tests/network_source.yaml	2016-05-19 18:43:17 +0000
@@ -3,12 +3,12 @@
     config:
         # Physical interfaces.
         - type: physical
-          name: eth0
+          name: interface0
           mac_address: "52:54:00:12:34:00"
           subnets:
               - type: dhcp4
         - type: physical
-          name: eth1
+          name: interface1
           mtu: 1492
           mac_address: "52:54:00:12:34:02"
           subnets:
@@ -21,11 +21,11 @@
                 dns_search:
                   - barley.maas
         - type: physical
-          name: eth2
+          name: interface2
           mac_address: "52:54:00:12:34:04"
 
 curthooks_commands:
     # use curtin to inject a eni config file outside of the network yaml
     # this allows us to test user installed configurations outside of
     # curtin's control
-    aa_cleanup: ['curtin', 'in-target', '--', 'sh', '-c', "rm -f /etc/network/interfaces.d/eth0.cfg; /bin/echo -e 'auto eth2\niface eth2 inet static\n address 192.168.23.23/24\n' > /etc/network/interfaces.d/eth2.cfg"]
+    aa_cleanup: ['curtin', 'in-target', '--', 'sh', '-c', "rm -f /etc/network/interfaces.d/eth0.cfg; /bin/echo -e 'auto interface2\niface interface2 inet static\n address 192.168.23.23/24\n' > /etc/network/interfaces.d/interface2.cfg"]

=== modified file 'examples/tests/vlan_network.yaml'
--- examples/tests/vlan_network.yaml	2016-04-14 19:14:11 +0000
+++ examples/tests/vlan_network.yaml	2016-05-19 18:43:17 +0000
@@ -1,9 +1,9 @@
 network:
   config:
-  - id: eth0
+  - id: interface0
     mac_address: d4:be:d9:a8:49:13
     mtu: 1500
-    name: eth0
+    name: interface0
     subnets:
     - address: 10.245.168.16/21
       dns_nameservers:
@@ -11,69 +11,69 @@
       gateway: 10.245.168.1
       type: static
     type: physical
-  - id: eth1
+  - id: interface1
     mac_address: d4:be:d9:a8:49:15
     mtu: 1500
-    name: eth1
+    name: interface1
     subnets:
     - address: 10.245.188.2/24
       dns_nameservers: []
       type: static
     type: physical
-  - id: eth2
+  - id: interface2
     mac_address: d4:be:d9:a8:49:17
     mtu: 1500
-    name: eth2
+    name: interface2
     subnets:
     - type: manual
     type: physical
-  - id: eth3
+  - id: interface3
     mac_address: d4:be:d9:a8:49:19
     mtu: 1500
-    name: eth3
+    name: interface3
     subnets:
     - type: manual
     type: physical
-  - id: eth1.2667
+  - id: interface1.2667
     mtu: 1500
-    name: eth1.2667
+    name: interface1.2667
     subnets:
     - address: 10.245.184.2/24
       dns_nameservers: []
       type: static
     type: vlan
     vlan_id: 2667
-    vlan_link: eth1
-  - id: eth1.2668
+    vlan_link: interface1
+  - id: interface1.2668
     mtu: 1500
-    name: eth1.2668
+    name: interface1.2668
     subnets:
     - address: 10.245.185.1/24
       dns_nameservers: []
       type: static
     type: vlan
     vlan_id: 2668
-    vlan_link: eth1
-  - id: eth1.2669
+    vlan_link: interface1
+  - id: interface1.2669
     mtu: 1500
-    name: eth1.2669
+    name: interface1.2669
     subnets:
     - address: 10.245.186.1/24
       dns_nameservers: []
       type: static
     type: vlan
     vlan_id: 2669
-    vlan_link: eth1
-  - id: eth1.2670
+    vlan_link: interface1
+  - id: interface1.2670
     mtu: 1500
-    name: eth1.2670
+    name: interface1.2670
     subnets:
     - address: 10.245.187.2/24
       dns_nameservers: []
       type: static
     type: vlan
     vlan_id: 2670
-    vlan_link: eth1
+    vlan_link: interface1
   - address: 10.245.168.2
     search:
     - dellstack

=== modified file 'tests/unittests/test_net.py'
--- tests/unittests/test_net.py	2016-04-20 20:03:00 +0000
+++ tests/unittests/test_net.py	2016-05-19 18:43:17 +0000
@@ -497,16 +497,16 @@
             auto lo
             iface lo inet loopback
 
-            auto eth0
-            iface eth0 inet dhcp
+            auto interface0
+            iface interface0 inet dhcp
 
-            auto eth1
-            iface eth1 inet manual
+            auto interface1
+            iface interface1 inet manual
                 bond-mode active-backup
                 bond-master bond0
 
-            auto eth2
-            iface eth2 inet manual
+            auto interface2
+            iface interface2 inet manual
                 bond-mode active-backup
                 bond-master bond0
 
@@ -537,22 +537,22 @@
             auto lo
             iface lo inet loopback
 
-            # control-manual eth0
-            iface eth0 inet dhcp
+            # control-manual interface0
+            iface interface0 inet dhcp
 
-            auto eth1
-            iface eth1 inet static
+            auto interface1
+            iface interface1 inet static
                 address 192.168.14.2/24
                 gateway 192.168.14.1
                 mtu 1492
 
-            auto eth1:1
-            iface eth1:1 inet static
+            auto interface1:1
+            iface interface1:1 inet static
                 address 192.168.14.4/24
                 mtu 1492
 
-            allow-hotplug eth2
-            iface eth2 inet static
+            allow-hotplug interface2
+            iface interface2 inet static
                 gateway 10.11.12.1
                 address 10.11.12.13/22
 

=== modified file 'tests/vmtests/__init__.py'
--- tests/vmtests/__init__.py	2016-04-20 20:06:01 +0000
+++ tests/vmtests/__init__.py	2016-05-19 18:43:17 +0000
@@ -745,6 +745,15 @@
                     self.assertIn(link, contents)
                 self.assertIn(diskname, contents)
 
+    def test_interfacesd_eth0_removed(self):
+        """ Check that curtin has removed /etc/network/interfaces.d/eth0.cfg
+            by examining the output of a find /etc/network > find_interfaces.d
+        """
+        fpath = os.path.join(self.td.collect, "find_interfacesd")
+        interfacesd = util.load_file(fpath)
+        self.assertNotIn("/etc/network/interfaces.d/eth0.cfg",
+                         interfacesd.split("\n"))
+
     def run(self, result):
         super(VMBaseClass, self).run(result)
         self.record_result(result)
@@ -844,6 +853,9 @@
     def test_dname(self):
         pass
 
+    def test_interfacesd_eth0_removed(self):
+        pass
+
     def _maybe_raise(self, exc):
         if self.allow_test_fails:
             raise exc

=== modified file 'tests/vmtests/test_basic.py'
--- tests/vmtests/test_basic.py	2016-04-04 18:20:33 +0000
+++ tests/vmtests/test_basic.py	2016-05-19 18:43:17 +0000
@@ -25,6 +25,7 @@
         cat /etc/fstab > fstab
         mkdir -p /dev/disk/by-dname
         ls /dev/disk/by-dname/ > ls_dname
+        find /etc/network/interfaces.d > find_interfacesd
 
         v=""
         out=$(apt-config shell v Acquire::HTTP::Proxy)
@@ -145,6 +146,7 @@
         cat /etc/fstab > fstab
         mkdir -p /dev/disk/by-dname
         ls /dev/disk/by-dname/ > ls_dname
+        find /etc/network/interfaces.d > find_interfacesd
 
         v=""
         out=$(apt-config shell v Acquire::HTTP::Proxy)

=== modified file 'tests/vmtests/test_bcache_basic.py'
--- tests/vmtests/test_bcache_basic.py	2016-04-04 15:48:10 +0000
+++ tests/vmtests/test_bcache_basic.py	2016-05-19 18:43:17 +0000
@@ -18,6 +18,7 @@
         cat /sys/block/bcache0/bcache/cache_mode > bcache_cache_mode
         cat /proc/mounts > proc_mounts
         cat /proc/partitions > proc_partitions
+        find /etc/network/interfaces.d > find_interfacesd
         """)]
 
     def test_bcache_output_files_exist(self):

=== modified file 'tests/vmtests/test_bonding.py'
--- tests/vmtests/test_bonding.py	2016-04-04 18:53:03 +0000
+++ tests/vmtests/test_bonding.py	2016-05-19 18:43:17 +0000
@@ -59,6 +59,7 @@
         ip -o route show > ip_route_show
         route -n > route_n
         dpkg-query -W -f '${Status}' ifenslave > ifenslave_installed
+        find /etc/network/interfaces.d > find_interfacesd
         """)]
 
     def test_output_files_exist(self):

=== modified file 'tests/vmtests/test_lvm.py'
--- tests/vmtests/test_lvm.py	2016-03-03 11:46:13 +0000
+++ tests/vmtests/test_lvm.py	2016-05-19 18:43:17 +0000
@@ -12,6 +12,7 @@
         cd OUTPUT_COLLECT_D
         cat /etc/fstab > fstab
         ls /dev/disk/by-dname > ls_dname
+        find /etc/network/interfaces.d > find_interfacesd
         pvdisplay -C --separator = -o vg_name,pv_name --noheadings > pvs
         lvdisplay -C --separator = -o lv_name,vg_name --noheadings > lvs
         """)]

=== modified file 'tests/vmtests/test_mdadm_bcache.py'
--- tests/vmtests/test_mdadm_bcache.py	2016-04-17 22:35:20 +0000
+++ tests/vmtests/test_mdadm_bcache.py	2016-05-19 18:43:17 +0000
@@ -16,6 +16,7 @@
         mdadm --detail --scan | grep -c ubuntu > mdadm_active1
         grep -c active /proc/mdstat > mdadm_active2
         ls /dev/disk/by-dname > ls_dname
+        find /etc/network/interfaces.d > find_interfacesd
         """)]
 
     def test_mdadm_output_files_exist(self):
@@ -55,6 +56,7 @@
         cat /sys/block/bcache1/bcache/cache_mode >> bcache_cache_mode
         cat /sys/block/bcache2/bcache/cache_mode >> bcache_cache_mode
         cat /proc/mounts > proc_mounts
+        find /etc/network/interfaces.d > find_interfacesd
         """)]
     fstab_expected = {
         '/dev/vda1': '/media/sda1',

=== modified file 'tests/vmtests/test_network.py'
--- tests/vmtests/test_network.py	2016-04-14 19:14:11 +0000
+++ tests/vmtests/test_network.py	2016-05-19 18:43:17 +0000
@@ -57,6 +57,7 @@
         ifconfig -a > ifconfig_a
         cp -av /etc/network/interfaces .
         cp -av /etc/network/interfaces.d .
+        find /etc/network/interfaces.d > find_interfacesd
         cp /etc/resolv.conf .
         cp -av /etc/udev/rules.d/70-persistent-net.rules .
         ip -o route show > ip_route_show
@@ -245,10 +246,10 @@
     collect_scripts = TestNetworkAbs.collect_scripts + [textwrap.dedent("""
              cd OUTPUT_COLLECT_D
              dpkg-query -W -f '${Status}' vlan > vlan_installed
-             ip -d link show eth1.2667 > ip_link_show_eth1.2667
-             ip -d link show eth1.2668 > ip_link_show_eth1.2668
-             ip -d link show eth1.2669 > ip_link_show_eth1.2669
-             ip -d link show eth1.2670 > ip_link_show_eth1.2670
+             ip -d link show interface1.2667 > ip_link_show_interface1.2667
+             ip -d link show interface1.2668 > ip_link_show_interface1.2668
+             ip -d link show interface1.2669 > ip_link_show_interface1.2669
+             ip -d link show interface1.2670 > ip_link_show_interface1.2670
              """)]
 
     def get_vlans(self):
@@ -309,6 +310,7 @@
         ifconfig -a > ifconfig_a
         cp -av /etc/network/interfaces .
         cp -a /etc/network/interfaces.d .
+        find /etc/network/interfaces.d > find_interfacesd
         cp /etc/resolv.conf .
         cp -av /etc/udev/rules.d/70-persistent-net.rules .
         ip -o route show > ip_route_show
@@ -317,7 +319,7 @@
 
     def test_source_cfg_exists(self):
         """Test that our curthooks wrote our injected config."""
-        self.output_files_exist(["interfaces.d/eth2.cfg"])
+        self.output_files_exist(["interfaces.d/interface2.cfg"])
 
     def test_etc_network_interfaces_source_cfg(self):
         """ Compare injected configuration as parsed by curtin matches
@@ -344,7 +346,7 @@
         print('parsed ifconfig dict:\n{}'.format(
             yaml.dump(ifconfig_dict, default_flow_style=False, indent=4)))
 
-        iface = 'eth2'
+        iface = 'interface2'
         self.assertTrue(iface in curtin_ifaces)
 
         expected_address = curtin_ifaces[iface].get('address', None)

=== modified file 'tests/vmtests/test_nvme.py'
--- tests/vmtests/test_nvme.py	2016-04-04 18:20:33 +0000
+++ tests/vmtests/test_nvme.py	2016-05-19 18:43:17 +0000
@@ -33,6 +33,7 @@
         cat /etc/fstab > fstab
         mkdir -p /dev/disk/by-dname
         ls /dev/disk/by-dname/ > ls_dname
+        find /etc/network/interfaces.d > find_interfacesd
 
         v=""
         out=$(apt-config shell v Acquire::HTTP::Proxy)

=== modified file 'tests/vmtests/test_raid5_bcache.py'
--- tests/vmtests/test_raid5_bcache.py	2016-04-17 22:35:20 +0000
+++ tests/vmtests/test_raid5_bcache.py	2016-05-19 18:43:17 +0000
@@ -16,6 +16,7 @@
         mdadm --detail --scan | grep -c ubuntu > mdadm_active1
         grep -c active /proc/mdstat > mdadm_active2
         ls /dev/disk/by-dname > ls_dname
+        find /etc/network/interfaces.d > find_interfacesd
         """)]
 
     def test_mdadm_output_files_exist(self):
@@ -41,6 +42,7 @@
         cat /sys/block/bcache0/bcache/cache_mode > bcache_cache_mode
         cat /proc/mounts > proc_mounts
         cat /proc/partitions > proc_partitions
+        find /etc/network/interfaces.d > find_interfacesd
         """)]
     fstab_expected = {
         '/dev/bcache0': '/',

=== modified file 'tests/vmtests/test_uefi_basic.py'
--- tests/vmtests/test_uefi_basic.py	2016-04-08 03:43:26 +0000
+++ tests/vmtests/test_uefi_basic.py	2016-05-19 18:43:17 +0000
@@ -23,6 +23,7 @@
         cat /etc/fstab > fstab
         mkdir -p /dev/disk/by-dname
         ls /dev/disk/by-dname/ > ls_dname
+        find /etc/network/interfaces.d > find_interfacesd
         ls /sys/firmware/efi/ > ls_sys_firmware_efi
         cat /sys/class/block/vda/queue/logical_block_size > vda_lbs
         cat /sys/class/block/vda/queue/physical_block_size > vda_pbs