Merge ~smoser/ubuntu/+source/open-iscsi:bug/1785108-bionic-net-interface-handler-runs-always into ubuntu/+source/open-iscsi:ubuntu/bionic-devel

[Scott Moser]

see commit message

[Scott Moser (smoser)]

I've just uploaded this to the queue, mostly just pushed a MP for easier review andlinking to the bug.

diff --git a/debian/changelog b/debian/changelog
index 83773dc..b660fef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+open-iscsi (2.0.874-5ubuntu2.1) bionic; urgency=medium
+
+  * d/tests: pull back cloud image test updates from cosmic.
+  * d/net-interface-handler: Apply changes only for the iscsi-root
+    (LP: #1785108)
+
+ -- Scott Moser <[e-mail]>  Wed, 08 Aug 2018 09:09:02 -0400
+
 open-iscsi (2.0.874-5ubuntu2) bionic; urgency=medium
 
   * debian/tests:
diff --git a/debian/net-interface-handler b/debian/net-interface-handler
index 7717f61..15d35c6 100755
--- a/debian/net-interface-handler
+++ b/debian/net-interface-handler
@@ -10,12 +10,23 @@
 # ifupdown appears to have no way to do this without also running
 # /etc/network/*.d/ scripts.
 
+assert_interface() {
+    # udev sets INTERFACE to the name of the currently-processed nic.
+    [ -n "$INTERFACE" ] && return 0
+    echo "environment variable INTERFACE not set." 1>&2;
+    return 1
+}
+
 start() {
     CR="
 "
+    assert_interface || return
     ifile=/run/initramfs/open-iscsi.interface
-    if [ -f "$ifile" ] && read iface < "$ifile" &&
-       ! grep -qs "^$iface=" /run/network/ifstate; then
+
+    [ -f "$ifile" ] && read iface < "$ifile" || return 0
+    [ "$INTERFACE" = "$iface" ] || return
+
+    if ! grep -qs "^$iface=" /run/network/ifstate; then
         mkdir -p /run/network
         echo "$iface=$iface" >>/run/network/ifstate
 
@@ -51,9 +62,12 @@ EOF
 }
 
 stop() {
+    assert_interface || return
     ifile=/run/initramfs/open-iscsi.interface
-    if [ -f "$ifile" ] && read iface < "$ifile" &&
-       grep -qs "^$iface=" /run/network/ifstate; then
+    [ -f "$ifile" ] && read iface < "$ifile" || return 0
+    [ "$INTERFACE" = "$iface" ] || return
+
+    if grep -qs "^$iface=" /run/network/ifstate; then
         grep -v "^$iface=" /run/network/ifstate >/run/network/.ifstate.tmp || true
         mv /run/network/.ifstate.tmp /run/network/ifstate
 
diff --git a/debian/tests/README-boot-test.md b/debian/tests/README-boot-test.md
index 526090c..e45bbf0 100644
--- a/debian/tests/README-boot-test.md
+++ b/debian/tests/README-boot-test.md
@@ -44,7 +44,7 @@ The test case in `debian/tests/test-open-iscsi.py` uses some helper tools.
      using the updated initramfs we wouldn't really be testing the new
      open-iscsi.
 
-     It will upgrade any packages inside that are mentioned in 
+     It will upgrade any packages inside that are mentioned in
      ADT_TEST_TRIGGERS environment.  It will also install open-iscsi if
      it is not in that list.
 
@@ -53,6 +53,9 @@ The test case in `debian/tests/test-open-iscsi.py` uses some helper tools.
      repos into the target.  This is necessary for the autopackage test
      environment that adds local package repositories to sources.list.d.
 
+     It may also make other changes to the image to workaround bugs.
+     See --help output for list of bugs.
+
   * **get-image**: This downloads an image from cloud-images.ubuntu.com.  See
      its Usage for more information.  it downloads via stream data and verifies
      download.  One thing to note is that it does not overwrite existing files.
@@ -82,14 +85,16 @@ Testing manually looks like this:
     ## Get the image you want.  This creates out.d/disk.img and disk.img.dist
     $ get-image xenial.d xenial
 
-    ## patch the image with an open-iscsi, which creates xenial/kernel
-    ## and xenial/initrd from the kernel and initramfs inside the image.
+    ## patch the image with an open-iscsi, which creates xenial.d/kernel
+    ## and xenial.d/initrd from the kernel and initramfs inside the image.
     $ apt-get download open-iscsi
     $ deb=$(ls open-iscsi_*.deb | tail -n 1)
-    $ patch-image xenial/disk.img "$deb" --kernel=xenial/kernel --initrd=xenial/initrd
+    $ sudo ./debian/tests/patch-image \
+         --kernel=xenial.d/kernel --initrd=xenial.d/initrd
+         xenial.d/disk.img "$deb"
 
     ## Boot the system, log in, look around.
-    $ tgt-boot-test -v xenial/disk.img xenial/kernel xenial/initrd
+    $ tgt-boot-test -v xenial.d/disk.img xenial.d/kernel xenial.d/initrd
 
 
 ### Features of tgt-boot-test ###
diff --git a/debian/tests/patch-image b/debian/tests/patch-image
index caba3da..b9b34e3 100755
--- a/debian/tests/patch-image
+++ b/debian/tests/patch-image
@@ -11,9 +11,18 @@ Usage() {
     cat <<EOF
 Usage: ${0##*/} [options] image [packages]
   Patch image, upgrading [packages].
-    --kernel FILE   copy kernel out to FILE
-    --initrd FILE   copy initrd out to FILE
-    --no-copy-apt   do not copy apt repos in.
+    --kernel FILE             copy kernel out to FILE
+    --initrd FILE             copy initrd out to FILE
+
+    --krd-only                only copy out kernel/initrd do not change image.
+                              this is incompatible with 'packages'
+                              it is a short-cut to specifying all the '--no-*'
+                              options below.
+
+    --no-copy-apt             do not copy host's apt repos in.
+
+  image modifications:
+    --no-update-fstab         do not modify fstab (LP: #1732028)
 
   if no packages are provided, and ADT_TEST_TRIGGERS is set
   in environment, then it will be read for the list of packages.
@@ -70,6 +79,17 @@ bin_packages_from_source_pkg() {
     _RET=$(set -f; for i in ${ret}; do echo "$i"; done | sort -u)
 }
 
+update_fstab() {
+    # update_fstab(path) modify the fstab at path
+    # to remove problematic entries (LP: #1732028)
+    local fstab="$1"
+    if [ ! -e "$fstab.patch-image-dist" ]; then
+        cp "$fstab" "$fstab.patch-image-dist" ||
+            { error "failed backing up $fstab to $fstab.dist"; return 1; }
+    fi
+    sed -i '/^LABEL=UEFI/s/^/#/' "$fstab"
+}
+
 main() {
     local short_opts="hv"
     local long_opts="help,no-copy-apt,initrd:,kernel:,verbose"
@@ -81,13 +101,16 @@ main() {
         { bad_Usage; return; }
 
     local cur="" next=""
-    local kernel="" initrd="" copy_apt=true
+    local kernel="" initrd="" copy_apt=true krd_only=false
+    local update_fstab=true
 
     while [ $# -ne 0 ]; do
         cur="$1"; next="$2";
         case "$cur" in
             -h|--help) Usage ; exit 0;;
+               --krd-only) krd_only=true; shift;;
                --no-copy-apt) copy_apt=false; shift;;
+               --no-update-fstab) update_fstab=false; shift;;
                --kernel) kernel=$next; shift;;
                --initrd) initrd=$next; shift;;
             -v|--verbose) VERBOSITY=$((${VERBOSITY}+1));;
@@ -121,6 +144,17 @@ main() {
     local packages=( )
     packages=( "$@" )
 
+    if $krd_only; then
+        if [ "${#packages[@]}" != 0 -a "${packages[*]}" != "none" ]; then
+            error "--krd-only is incompatible with packages."
+            return 1
+        fi
+        debug 1 "--krd-only provided no changes will be done."
+        copy_apt=false
+        update_fstab=false
+        packages=( "none" )
+    fi
+
     if [ "${#packages[@]}" = "1" -a "${packages[0]}" = "none" ]; then
         packages=( )
     elif [ "${#packages[@]}" -eq 0 -a -n "${ADT_TEST_TRIGGERS}" ]; then
@@ -185,8 +219,13 @@ main() {
         done
     fi
 
+    if $update_fstab; then
+        update_fstab "$target/etc/fstab" ||
+            { error "failed updating /etc/fstab in target"; return 1; }
+    fi
+
     mount -o bind /sys "$target"/sys || :
-    mount -o bind /proc "$target"/proc || :    
+    mount -o bind /proc "$target"/proc || :
     mount -o bind /dev "$target"/dev || :
     mount -o bind /dev/pts "$target"/dev/pts || :
 
diff --git a/debian/tests/test-open-iscsi.py b/debian/tests/test-open-iscsi.py
index e7e37a8..27a5e0b 100644
--- a/debian/tests/test-open-iscsi.py
+++ b/debian/tests/test-open-iscsi.py
@@ -75,8 +75,19 @@ bukket:
        exit
    fi
    systemd-resolve --status --no-pager
+ - &add_and_remove_tuntap |
+   #!/bin/sh
+   # LP: #1785108 would break dns when any device was removed.
+   tapdev="mytap0"
+   echo ==== Adding $tapdev ====
+   ip tuntap add mode tap user root $tapdev
+   udevadm settle
+   echo ==== Removing $tapdev ====
+   ip tuntap del mode tap $tapdev
+   udevadm settle
 
 runcmd:
+ - [ sh, -c, *add_and_remove_tuntap ]
  - [ mkdir, -p, /output ]
  - [ cp, /etc/resolv.conf, /output]
  - [ sh, -c, *get_resolved_status, --, /output/systemd-resolve-status.txt]
@@ -271,7 +282,10 @@ class CloudImageTest(testlib.TestlibCase, PrivateOpenIscsiTest):
             self.info['initrd']]
         sys.stderr.write(' '.join(cmd) + "\n")
 
-        subprocess.check_call(cmd)
+        env = os.environ.copy()
+        env['BOOT_TIMEOUT'] = env.get('BOOT_TIMEOUT', '60m')
+        subprocess.check_call(cmd, env=env)
+
         files = self.extract_files(output_disk)
         print("files: %s" % files)
         resolvconf = files.get('resolv.conf', "NO_RESOLVCONF_FOUND")
diff --git a/debian/tests/tgt-boot-test b/debian/tests/tgt-boot-test
index 2f8bff3..6ed7a9b 100755
--- a/debian/tests/tgt-boot-test
+++ b/debian/tests/tgt-boot-test
@@ -514,8 +514,8 @@ main() {
     local mem="512" start="$SECONDS" ret=""
     local cmd=""
     cmd=(
-        timeout --kill-after=1m --signal=TERM ${BOOT_TIMEOUT:-60m}
-        xkvm  "${netdev_args[@]}" ${overlay_drive_xkvm} "${pt[@]}" --
+        ${BOOT_TIMEOUT:+timeout --kill-after=1m --signal=TERM $BOOT_TIMEOUT}
+        xkvm -v -v "${netdev_args[@]}" ${overlay_drive_xkvm} "${pt[@]}" --
         -echr 0x5
         -m $mem ${serial_log:+-serial "file:$serial_log"} -nographic
         -kernel "${t_kernel}" -initrd "${t_initrd}"
diff --git a/debian/tests/xkvm b/debian/tests/xkvm
index 9015140..9513723 100755
--- a/debian/tests/xkvm
+++ b/debian/tests/xkvm
@@ -292,7 +292,7 @@ get_bios_opts() {
 
     if [ -n "$nvram" ]; then
         if [ ! -f "$nvram" ]; then
-            cp "$nvram_src" "$nvram" || 
+            cp "$nvram_src" "$nvram" ||
                 { error "failed copy $nvram_src to $nvram"; return 1; }
             debug 1 "copied $nvram_src to $nvram"
         fi
@@ -664,7 +664,7 @@ main() {
 
     local bus_devices
     bus_devices=( -device "$virtio_scsi_bus,id=virtio-scsi-xkvm" )
-    cmd=( "${kvmcmd[@]}" "${archopts[@]}" 
+    cmd=( "${kvmcmd[@]}" "${archopts[@]}"
           "${bios_opts[@]}"
           "${bus_devices[@]}"
           "${netargs[@]}"