Merge ~paelzer/ubuntu/+source/open-iscsi:merge-2.1.4-impish into ubuntu/+source/open-iscsi:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4599

Debian submission (refresh of Rafels submission): https://salsa.debian.org/linux-blocks-team/open-iscsi/-/merge_requests/8

[Christian Ehrhardt  (paelzer)]

Build is complete, tests have started and will hopefully run over night.
Ready for review.

I also pushed the usual tags
To ssh://git.launchpad.net/~paelzer/ubuntu/+source/open-iscsi
 * [new tag] lp1934290/logical/2.1.3-1ubuntu6 -> lp1934290/logical/2.1.3-1ubuntu6
 * [new tag] lp1934290/new/debian -> lp1934290/new/debian
 * [new tag] lp1934290/old/debian -> lp1934290/old/debian
 * [new tag] lp1934290/old/ubuntu -> lp1934290/old/ubuntu
 * [new tag] lp1934290/reconstruct/2.1.3-1ubuntu6 -> lp1934290/reconstruct/2.1.3-1ubuntu6
 * [new tag] lp1934290/split/2.1.3-1ubuntu6 -> lp1934290/split/2.1.3-1ubuntu6

[Bryce Harrington (bryce)]

* Changelog:
  - [√] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [x] changelog entries correct
    + The bullets style should be * for 1st level, - for 2nd, and + for 3rd
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [-] sanity checks test fine

I did not exhaustively review the ubuntu delta but by spot checking things look as they should. The autopkgtests did not run in my container since they're marked breaks testbed, however the bileto run looks like it passed. The PPA package installed/uninstalled fine, and it built without issue in my local environment.

LGTM, +1

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the review!

The bullet style was taken as it was in the past, but thanks for the hint - I've updated the Changelog for it.

The autopkgtests on Bileto didn't all kick in, so I had them running myself against the PPA on LP. That was good, I've realized one more thing that would be a pain.

Upgrading a cloud image revealed
(Reading database ... 65987 files and directories currently installed.)
Preparing to unpack .../libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb ...
Unpacking libopeniscsiusr (2.1.4-0ubuntu1~impishppa1) ...
dpkg: error processing archive /var/cache/apt/archives/libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb (--unpack):
 trying to overwrite '/usr/lib/x86_64-linux-gnu/libopeniscsiusr.so.0.2.0', which is also in package libopeniscsiusr0.2.0 2.1.3-1ubuntu6
Preparing to unpack .../open-iscsi_2.1.4-0ubuntu1~impishppa1_amd64.deb ...
Unpacking open-iscsi (2.1.4-0ubuntu1~impishppa1) over (2.1.3-1ubuntu6) ...
Errors were encountered while processing:
 /var/cache/apt/archives/libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb

That makes sense as from a Ubuntu users POV the merge implies a file rename. I'll add what is needed as that is a trivial common case.

[Bryce Harrington (bryce)]

On Fri, Jul 02, 2021 at 05:55:11AM -0000, Christian Ehrhardt  wrote:
> Thanks for the review!
>
> The bullet style was taken as it was in the past, but thanks for the hint - I've updated the Changelog for it.
>
> The autopkgtests on Bileto didn't all kick in, so I had them running myself against the PPA on LP. That was good, I've realized one more thing that would be a pain.
>
> Upgrading a cloud image revealed
> (Reading database ... 65987 files and directories currently installed.)
> Preparing to unpack .../libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb ...
> Unpacking libopeniscsiusr (2.1.4-0ubuntu1~impishppa1) ...
> dpkg: error processing archive /var/cache/apt/archives/libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb (--unpack):
> trying to overwrite '/usr/lib/x86_64-linux-gnu/libopeniscsiusr.so.0.2.0', which is also in package libopeniscsiusr0.2.0 2.1.3-1ubuntu6
> Preparing to unpack .../open-iscsi_2.1.4-0ubuntu1~impishppa1_amd64.deb ...
> Unpacking open-iscsi (2.1.4-0ubuntu1~impishppa1) over (2.1.3-1ubuntu6) ...
> Errors were encountered while processing:
> /var/cache/apt/archives/libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb
>
> That makes sense as from a Ubuntu users POV the merge implies a file rename. I'll add what is needed as that is a trivial common case.

Ahhh, in fact I ran into this problem too when I initially installed.
But then I removed/purged and reinstalled and then I couldn't figure out
how to reproduce it, so figured I just had something misconfigured to
begin with. That makes more sense though.

> --
> https://code.launchpad.net/~paelzer/ubuntu/+source/open-iscsi/+git/open-iscsi/+merge/405043
> You are reviewing the proposed merge of ~paelzer/ubuntu/+source/open-iscsi:merge-2.1.4-impish into ubuntu/+source/open-iscsi:debian/sid.

417664b... by Christian Ehrhardt  on 2021-07-02

d/control: Transition from libopeniscsiusr0.2.0 to libopeniscsiusr

We had
  libopeniscsiusr0.2.0 2.1.3-1ubuntu6
Containing file
  /usr/lib/x86_64-linux-gnu/libopeniscsiusr.so.0.2.0
Debian now finally resolved that, but in differnt package name
  libopeniscsiusr 2.1.4-0ubuntu1~impishppa1
Also all dependencies flipped to the new package name,
but we need to ensure a proper install ordering.

Otherwise this happens:
  Preparing to unpack .../libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb ...
  Unpacking libopeniscsiusr (2.1.4-0ubuntu1~impishppa1) ...
  dpkg: error processing archive /var/cache/apt/archives/libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb (--unpack):
   trying to overwrite '/usr/lib/x86_64-linux-gnu/libopeniscsiusr.so.0.2.0', which is also in package libopeniscsiusr0.2.0 2.1.3-1ubuntu6
  Preparing to unpack .../open-iscsi_2.1.4-0ubuntu1~impishppa1_amd64.deb ...
  Unpacking open-iscsi (2.1.4-0ubuntu1~impishppa1) over (2.1.3-1ubuntu6) ...
  Errors were encountered while processing:
   /var/cache/apt/archives/libopeniscsiusr_2.1.4-0ubuntu1~impishppa1_amd64.deb

For Debian that was a new package in 2.1.3-5, but for an Ubuntu user
that is case #5 of https://wiki.debian.org/PackageTransition
So we need to add breaks and a transitional.

This change can be dropped ater 22.04 as then all valid upgrade paths have gone
through this.

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

The transitional was added and I pushed the branch.
Once rebuilds and tests show all-good I'll upload.

[Christian Ehrhardt  (paelzer)]

Now it passes fine
https://autopkgtest.ubuntu.com/results/autopkgtest-impish-ci-train-ppa-service-4599/impish/amd64/o/open-iscsi/20210702_072713_ac3bf@/log.gz

Uploading

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/open-iscsi
 * [new tag] upload/2.1.4-0ubuntu1 -> upload/2.1.4-0ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-iscsi_2.1.4-0ubuntu1.dsc: done.
  Uploading open-iscsi_2.1.4.orig.tar.gz: done.
  Uploading open-iscsi_2.1.4-0ubuntu1.debian.tar.xz: done.
  Uploading open-iscsi_2.1.4-0ubuntu1_source.buildinfo: done.
  Uploading open-iscsi_2.1.4-0ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

this is in proposed now.

diff --git a/Changelog b/Changelog
index 78ed73e..bf18ec7 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,42 @@
+open-iscsi-2.1.3 - open-iscsi-2.1.4
+
+Abhinav Rajagopalan (1):
+      Fix typo in util.py
+
+Chris Leech (3):
+      libopeniscsiusr: fix error messages
+      libopeniscsiusr: skip over removed sessions
+      libopeniscsiusr: dont error loudly if a session isn't found when working through iscsi_sessions_get()
+
+Fabian Möller (1):
+      iscsid: Add NO_SYSTEMD to CFLAGS
+
+Helmut Grohne (1):
+      Avoid hardcoding pkg-config to fix cross build
+
+John Schaeffer (1):
+      Add etc/systemd/iscsi-init.service to SYSTEMDFILES Makefile variable
+
+Lee Duncan (4):
+      iscsid: Do not allow conflicting pid-file options
+      Fix iscsiadm segfault when exiting
+      Fix iscsistart login issue when target is delayed.
+      Enable iscsi.service asynchronous logins, cleanup services
+
+Matwey V. Kornilov (1):
+      Wants=network-online.target in iscsi.service
+
+Patrick Lawrence (1):
+      Change mkdir permissions to 0770, adjust usmask
+
+Wenchao Hao (4):
+      idbm: Fix memory leak and NULL pointer dereference in idbm_rec_update_param()
+      libopeniscsiusr: Fix memory leak in iscsi_nodes_get()
+      libopeniscsiusr: Fix memory leak in iscsi_sessions_get()
+      iscsiadm: Fix memory leak in iscsiadm
+
+---------------------------------------------------------------------------
+
 open-iscsi-2.1.2 - open-iscsi-2.1.3
 
 Chris Leech (4):
diff --git a/Makefile b/Makefile
index 7b445a5..7f52cc8 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ ETCFILES = etc/iscsid.conf
 IFACEFILES = etc/iface.example
 RULESFILES = utils/50-iscsi-firmware-login.rules
 SYSTEMDFILES = etc/systemd/iscsi.service \
+			   etc/systemd/iscsi-init.service \
 			   etc/systemd/iscsid.service etc/systemd/iscsid.socket \
 			   etc/systemd/iscsiuio.service etc/systemd/iscsiuio.socket
 
diff --git a/debian/README.Debian b/debian/README.Debian
index f0c2568..43c7c81 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -57,7 +57,7 @@ iSCSI Qualified Names (IQN) and initiatorname.iscsi
 The initiatorname.iscsi file defines the iSCSI Qualified Name (IQN) of the iSCSI 
 initiator. This IQN is used by the initiator to identify itself to the target.
 
-Example: InitiatorName=iqn.1993-08.org.debian:01:lnx-debian
+Example: InitiatorName=iqn.2004-10.com.ubuntu:01:lnx-debian
 
 While this name can be adjusted to suit your needs, once set, it should not be 
 changed. If you later change the InitiatorName, existing access control lists 
@@ -100,7 +100,7 @@ options in your initramfs:
 
    Example Syntax:
 
-   ISCSI_INITIATOR="iqn.1993-08.org.debian:01:9b3e5634fdb9"
+   ISCSI_INITIATOR="iqn.2004-10.com.ubuntu:01:9b3e5634fdb9"
    ISCSI_TARGET_NAME=iqn.2008-01.com.example:storage.foo
    ISCSI_TARGET_IP=192.168.1.1
    ISCSI_TARGET_PORT=3260
diff --git a/debian/changelog b/debian/changelog
index dd0ef0d..021748a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,76 @@
+open-iscsi (2.1.4-0ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable (LP: #1934290). Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest suite:
+      + d/t/README-boot-test.md: document test design
+      + d/t/control: register testsuite
+      + d/t/get-image: helper to fetch an ubuntu cloud image
+      + d/t/patch-image: helper to modify an ubuntu cloud image
+      + d/test-open-iscsi.py, d/t/testlib.py: various qa regression tests
+      + d/t/testsuite: helper to invoke qa regression tests
+      + d/t/tgt-boot-test: test using tgt to boot from iscsi
+      + d/t/xkvm: helper to spawn a VM
+      Note: this suite should be replaced by LIO that replaced TGT in main.
+    - d/iscsid.service: Let iscsid systemd job run in privileged containers
+      but not in unprivileged ones
+    - debian/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
+      run ipconfig to gather all DHCP config info, including DNS search
+      domain, which iBFT can't provide.
+    - Remove initramfs interfaces stamp in case no iscsi devs mounted
+      If iscsi root was requested, but no iscsi devices were mounted, remove
+      the initramfs interfaces stamp file. Meaning, that on shutdown there is
+      no 30s delay, whilst trying to re-establish iscsi login to perform a
+      logout.
+    - add IPv6 support
+      + Source /run/net6-*.conf when needed.
+      + debian/extra/initramfs.local-top: handle IPv6 configs being shipped
+        in DEVICE6 or /run/net6-*.conf in the initramfs, so we can fill in
+        /run/initramfs/open-iscsi.interface
+    - d/rules, d/open-iscsi.finalrd, d/control: ship the finalrd iscsi
+      logout hook and recommend finalrd and busybox for the logout hook
+      to work.
+    - Make iscsid socket-activated to only activate it as needed:
+      + debian/open-iscsi.service: do not start or check iscsid.service
+      + debian/rules: install and enable iscsid.socket
+      + debian/open-iscsi.postinst:
+        + run restart logic only if service is running on upgrade
+        + drop no longer reachable upgrade path that affects iscsid
+        + disable iscsid.service on upgrade
+        + handle iscsid.socket to be started if the service is not running yet
+      + d/iscsi-disk.rules: Add a udev rule so that iscsid.service will be
+        run when udev disks are attached.
+      + d/iscsid.service: Remove ExecStop= directive.
+      + debian/tests/install: fix tests to work with socket activation
+      + debian/patches/lp1755858-default-iscsid_conf-to-iscsid_socket.patch
+    - debian/open-iscsi.service: Start open-iscsi systemd job when either
+      /etc/iscsi/nodes or /sys/class/iscsi_session have content.
+    - Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown if the system is using
+      resolvconf or ifupdown:
+      + d/iscsi-network-interface.rules
+      + d/extra/net-interface-handler
+    - debian/extra/initramfs.hook: add ib_iser to the list of modules
+      included in the initramfs, so that we can in principle support
+      iscsi root on infiniband.
+    - debian/open-iscsi.kmod drop: (LP 1833586)
+      no static module list is needed if we let iscsid load modules itself.
+    - Stop producing udebs on i386 where we no longer have d-i or a kernel.
+    - d/extra/initramfs.local-{top,bottom}: move removal of
+      open-iscsi.interface file from local-top to local-bottom,
+      and fix shell quoting issue that would result in /run/initramfs/
+      open-iscsi.interface always being removed (LP 1872813)
+    - d/rules: Don't FTBFS due to warnings new in gcc10 regarding bounds and
+      initialization, because upstream's gcc10 support is incomplete. This
+      change can be dropped when upstream has completed their gcc support.
+    - d/README.Debian, d/extra/startup-checks.sh, d/open-iscsi-udeb.start,
+      d/open-iscsi.postinst: Apply Ubuntu branding to iqn initiator name
+  * Added changes
+    - merge bug fix release 2.1.4 from upstream
+    - Revert "Add patches from upstream" [upstream in 2.1.4]
+    - d/control: Transition from libopeniscsiusr0.2.0 to libopeniscsiusr
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 01 Jul 2021 14:13:08 +0200
+
 open-iscsi (2.1.3-5) unstable; urgency=medium
 
   [ Cyril Brulebois ]
@@ -33,6 +106,119 @@ open-iscsi (2.1.3-2) unstable; urgency=medium
 
  -- Chris Hofstaedtler <[e-mail]>  Sun, 07 Feb 2021 19:23:13 +0000
 
+open-iscsi (2.1.3-1ubuntu6) hirsute; urgency=medium
+
+  * d/open-iscsi.finalrd: fix UID resolution issues in logout (LP: #1922976)
+    Thanks to Michael Brown
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 18 Mar 2021 09:44:07 +0100
+
+open-iscsi (2.1.3-1ubuntu5) hirsute; urgency=medium
+
+  * make d/t/testuite python3 compatible (LP: #1919461)
+    - backport changes from qa-regression-testing since we diverged
+      - various tests: make py3 compliant, fix formatting a bit
+      - tests: convert deprecated assertEquals() to assertEqual()
+      - Remove all references to python-utils
+    - d/t/testlib.py: update to last state from
+      git+ssh://git.launchpad.net/qa-regression-testing
+    - d/t/{control,testsuite}: bump to use python3
+    - d/t/test-open-iscsi.py: switch shebang to python3
+    - d/t/test-open-iscsi.py: adapt to updated testlib
+  * Add patches from upstream [this is from Debian upload 2.1.3-2]:
+    - Fix memory leak in iscsiadm, Fix iscsiadm segfault when exiting, and
+    - Fix iscsistart login issue when target is delayed. The last one should
+    - fix iscsi-root with delayed network (Closes: #980085)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 18 Mar 2021 09:44:07 +0100
+
+open-iscsi (2.1.3-1ubuntu4) hirsute; urgency=medium
+
+  * Rebuild again so s390x pick up the right debhelper
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 24 Feb 2021 16:29:41 +0100
+
+open-iscsi (2.1.3-1ubuntu3) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Feb 2021 10:35:42 +0100
+
+open-iscsi (2.1.3-1ubuntu2) hirsute; urgency=medium
+
+  * Apply Ubuntu branding to iqn initiator name.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 17 Feb 2021 00:05:22 +0000
+
+open-iscsi (2.1.3-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest suite:
+      - README-boot-test.md
+      - tgt-boot-test: tests
+      - test-open-iscsi.py
+      - testlib.py
+      - get-image
+      - patch-image
+      - testsuite
+      - xkvm
+    - d/iscsid.service: Let iscsid systemd job run in privileged containers
+      but not in unprivileged ones
+    - d/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
+      run ipconfig to gather all DHCP config info, including DNS search
+      domain, which iBFT can't provide.
+    - Remove initramfs interfaces stamp in case no iscsi devs mounted.
+      If iscsi root was requested, but no iscsi devices were mounted, remove
+      the initramfs interfaces stamp file. Meaning, that on shutdown there is
+      no 30s delay, whilst trying to re-establish iscsi login to perform a
+      logout.
+    - add IPv6 support
+      - Source /run/net6-*.conf when needed.
+      - d/extra/initramfs.local-top: handle IPv6 configs being shipped in
+        DEVICE6 or /run/net6-*.conf in the initramfs, so we can fill in
+        .interface
+    - d/rules, d/open-iscsi.finalrd, d/control: ship the finalrd iscsi logout
+      hook and recommend finalrd and busybox for the logout hook to work.
+    - Make iscsid socket-activated to only activate it as needed:
+      - debian/open-iscsi.service: do not start or check iscsid.service
+      - debian/rules: install and enable iscsid.socket
+      - debian/open-iscsi.postinst:
+        - run restart logic only if service is running on upgrade
+        - drop no longer reachable upgrade path that affects iscsid
+        - disable iscsid.service on upgrade
+        - handle iscsid.socket to be started if the service is not running yet
+      - d/iscsi-disk.rules: Add a udev rule so that iscsid.service will be
+        run when udev disks are attached.
+      - d/iscsid.service: Remove ExecStop= directive.
+      - debian/tests/install: fix tests to work with socket activation
+      - debian/patches/lp1755858-default-iscsid_conf-to-iscsid_socket.patch
+        [updated to match 2.1.2]
+    - debian/open-iscsi.service: Start open-iscsi systemd job when either
+      /etc/iscsi/nodes or /sys/class/iscsi_session have content.
+    - Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown if the system is using
+      resolvconf or ifupdown:
+      - d/iscsi-network-interface.rules
+      - d/extra/net-interface-handler
+    - d/extra/initramfs.hook: add ib_iser to the list of modules included in
+      the initramfs, so that we can in principle support iscsi root on
+      infiniband.
+    - d/open-iscsi.kmod drop: (LP #1833586)
+      no static module list is needed if we let iscsid load modules itself.
+    - Stop producing udebs on i386 where we no longer have d-i or a kernel.
+    - d/extra/initramfs.local-{top,bottom}: move removal of
+      open-iscsi.interface file from local-top to local-bottom, and fix shell
+      quoting issue that would result in /run/initramfs/ open-iscsi.interface
+      always being removed (LP #1872813)
+    - debian/control, debian/rules: Fix libopeniscsiusr binary package
+      name (LP 1892228).
+    - d/rules: Don't FTBFS due to warnings new in gcc10 regarding bounds
+      and initialization, because upstream's gcc10 support is incomplete.
+      This change can be dropped when upstream has completed their gcc
+      support.
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 19 Jan 2021 13:29:46 +0100
+
 open-iscsi (2.1.3-1) unstable; urgency=medium
 
   * [afee47d] New upstream version 2.1.3
@@ -51,6 +237,75 @@ open-iscsi (2.1.2-2) unstable; urgency=medium
 
  -- Chris Hofstaedtler <[e-mail]>  Sun, 06 Dec 2020 23:25:11 +0000
 
+open-iscsi (2.1.2-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest suite:
+      - README-boot-test.md
+      - tgt-boot-test: tests
+      - test-open-iscsi.py
+      - testlib.py
+      - get-image
+      - patch-image
+      - testsuite
+      - xkvm
+    - d/iscsid.service: Let iscsid systemd job run in privileged containers
+      but not in unprivileged ones
+    - d/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
+      run ipconfig to gather all DHCP config info, including DNS search
+      domain, which iBFT can't provide.
+    - Remove initramfs interfaces stamp in case no iscsi devs mounted.
+      If iscsi root was requested, but no iscsi devices were mounted, remove
+      the initramfs interfaces stamp file. Meaning, that on shutdown there is
+      no 30s delay, whilst trying to re-establish iscsi login to perform a
+      logout.
+    - add IPv6 support
+      - Source /run/net6-*.conf when needed.
+      - d/extra/initramfs.local-top: handle IPv6 configs being shipped in
+        DEVICE6 or /run/net6-*.conf in the initramfs, so we can fill in
+        .interface
+    - d/rules, d/open-iscsi.finalrd, d/control: ship the finalrd iscsi logout
+      hook and recommend finalrd and busybox for the logout hook to work.
+    - Make iscsid socket-activated to only activate it as needed:
+      - debian/open-iscsi.service: do not start or check iscsid.service
+      - debian/rules: install and enable iscsid.socket
+      - debian/open-iscsi.postinst:
+        - run restart logic only if service is running on upgrade
+        - drop no longer reachable upgrade path that affects iscsid
+        - disable iscsid.service on upgrade
+        - handle iscsid.socket to be started if the service is not running yet
+      - d/iscsi-disk.rules: Add a udev rule so that iscsid.service will be
+        run when udev disks are attached.
+      - d/iscsid.service: Remove ExecStop= directive.
+      - debian/tests/install: fix tests to work with socket activation
+      - debian/patches/lp1755858-default-iscsid_conf-to-iscsid_socket.patch
+        [updated to match 2.1.2]
+    - debian/open-iscsi.service: Start open-iscsi systemd job when either
+      /etc/iscsi/nodes or /sys/class/iscsi_session have content.
+    - Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown if the system is using
+      resolvconf or ifupdown:
+      - d/iscsi-network-interface.rules
+      - d/extra/net-interface-handler
+    - d/extra/initramfs.hook: add ib_iser to the list of modules included in
+      the initramfs, so that we can in principle support iscsi root on
+      infiniband.
+    - d/open-iscsi.kmod drop: (LP #1833586)
+      no static module list is needed if we let iscsid load modules itself.
+    - Stop producing udebs on i386 where we no longer have d-i or a kernel.
+    - d/extra/initramfs.local-{top,bottom}: move removal of
+      open-iscsi.interface file from local-top to local-bottom, and fix shell
+      quoting issue that would result in /run/initramfs/ open-iscsi.interface
+      always being removed (LP #1872813)
+    - debian/control, debian/rules: Fix libopeniscsiusr binary package
+      name (LP 1892228).
+    - d/rules: Don't FTBFS due to warnings new in gcc10 regarding bounds
+      and initialization, because upstream's gcc10 support is incomplete.
+      This change can be dropped when upstream has completed their gcc
+      support.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 03 Dec 2020 14:44:39 +0100
+
 open-iscsi (2.1.2-1) unstable; urgency=medium
 
   * [7f10701] New upstream version 2.1.2
@@ -72,6 +327,86 @@ open-iscsi (2.1.1-2) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Fri, 14 Aug 2020 12:32:16 +0530
 
+open-iscsi (2.1.1-1ubuntu2) groovy; urgency=medium
+
+  * debian/control, debian/rules: Fix libopeniscsiusr binary package
+    name (LP: #1892228).
+  * debian/rules: Fix deprecated warning for dh_installinit that
+    --no-restart-on-upgrade has been replaced by --no-stop-on-upgrade,
+    which is equivalent in functionality (ref deb #837528).
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 19 Aug 2020 19:08:47 +0000
+
+open-iscsi (2.1.1-1ubuntu1) groovy; urgency=medium
+
+  * New upstream version 2.1.1
+  * d/rules: Don't FTBFS due to warnings new in gcc10 regarding bounds
+    and initialization, because upstream's gcc10 support is incomplete.
+    This change can be dropped when upstream has completed their gcc
+    support.
+  * Merge with Debian unstable (LP: #1891374). Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest suite:
+      - README-boot-test.md
+      - tgt-boot-test: tests
+      - test-open-iscsi.py
+      - testlib.py
+      - get-image
+      - patch-image
+      - testsuite
+      - xkvm
+    - d/iscsid.service: Let iscsid systemd job run in privileged containers
+      but not in unprivileged ones
+    - d/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
+      run ipconfig to gather all DHCP config info, including DNS search
+      domain, which iBFT can't provide.
+    - Remove initramfs interfaces stamp in case no iscsi devs mounted.
+      If iscsi root was requested, but no iscsi devices were mounted, remove
+      the initramfs interfaces stamp file. Meaning, that on shutdown there is
+      no 30s delay, whilst trying to re-establish iscsi login to perform a
+      logout.
+    - add IPv6 support
+      - Source /run/net6-*.conf when needed.
+      - d/extra/initramfs.local-top: handle IPv6 configs being shipped in
+        DEVICE6 or /run/net6-*.conf in the initramfs, so we can fill in
+        .interface
+    - d/rules, d/open-iscsi.finalrd, d/control: ship the finalrd iscsi logout
+      hook and recommend finalrd and busybox for the logout hook to work.
+    - Make iscsid socket-activated to only activate it as needed:
+      - debian/open-iscsi.service: do not start or check iscsid.service
+      - debian/rules: install and enable iscsid.socket
+      - debian/open-iscsi.postinst:
+        - run restart logic only if service is running on upgrade
+        - drop no longer reachable upgrade path that affects iscsid
+        - disable iscsid.service on upgrade
+        - handle iscsid.socket to be started if the service is not running yet
+      - d/iscsi-disk.rules: Add a udev rule so that iscsid.service will be
+        run when udev disks are attached.
+      - d/iscsid.service: Remove ExecStop= directive.
+      - debian/tests/install: fix tests to work with socket activation
+      - debian/patches/lp1755858-default-iscsid_conf-to-iscsid_socket.patch
+    - debian/open-iscsi.service: Start open-iscsi systemd job when either
+      /etc/iscsi/nodes or /sys/class/iscsi_session have content.
+    - Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown if the system is using
+      resolvconf or ifupdown:
+      - d/iscsi-network-interface.rules
+      - d/extra/net-interface-handler
+    - d/extra/initramfs.hook: add ib_iser to the list of modules included in
+      the initramfs, so that we can in principle support iscsi root on
+      infiniband.
+    - d/open-iscsi.kmod drop: (LP #1833586)
+      no static module list is needed if we let iscsid load modules itself.
+    - Stop producing udebs on i386 where we no longer have d-i or a kernel.
+    - Use python2 instead of python in the autopkg tests: Next step for
+      open-iscsi is to revist all iscsi-root feature and autopkgtests, so
+      keep python2 to avoid re-work later.
+    - d/extra/initramfs.local-{top,bottom}: move removal of
+      open-iscsi.interface file from local-top to local-bottom, and fix shell
+      quoting issue that would result in /run/initramfs/ open-iscsi.interface
+      always being removed (LP #1872813)
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 13 Aug 2020 04:29:43 +0000
+
 open-iscsi (2.1.1-1) experimental; urgency=medium
 
   [ Rafael David Tinoco ]
@@ -116,6 +451,98 @@ open-iscsi (2.1.1-1) experimental; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Tue, 23 Jun 2020 20:38:47 +0530
 
+open-iscsi (2.0.874-7.1ubuntu6.1) focal; urgency=medium
+
+   [ Ben Swartzlander ]
+   * allow open-iscsi to disable auto-scan feature (LP: #1877617)
+     - d/p/lp1877617-Allow-disabling-auto-LUN-scans.patch
+     - d/p/lp1877617-Fix-manual-LUN-scans-feature.patch
+
+ -- Rafael David Tinoco <[e-mail]>  Mon, 11 May 2020 02:03:33 +0000
+
+open-iscsi (2.0.874-7.1ubuntu6) focal; urgency=medium
+
+  * d/extra/initramfs.local-{top,bottom}: move removal of open-iscsi.interface
+    file from local-top to local-bottom, and fix shell quoting issue that
+    would result in /run/initramfs/open-iscsi.interface always being removed
+    (LP: #1872813)
+
+ -- Daniel Watkins <[e-mail]>  Tue, 14 Apr 2020 16:54:37 -0400
+
+open-iscsi (2.0.874-7.1ubuntu5) focal; urgency=medium
+
+  * Use python2 instead of python in the autopkg tests.
+
+ -- Matthias Klose <[e-mail]>  Thu, 30 Jan 2020 10:14:16 +0100
+
+open-iscsi (2.0.874-7.1ubuntu3) eoan; urgency=medium
+
+  * Stop producing udebs on i386 where we no longer have d-i or a kernel.
+
+ -- Adam Conrad <[e-mail]>  Wed, 09 Oct 2019 14:10:37 -0600
+
+open-iscsi (2.0.874-7.1ubuntu2) eoan; urgency=medium
+
+  * debian/open-iscsi.kmod: drop; no static module list is needed if we let
+    iscsid load modules itself.  LP: #1833586.
+  * debian/extra/initramfs.hook: add ib_iser to the list of modules
+    included in the initramfs, so that we can in principle support iscsi
+    root on infiniband.
+
+ -- Steve Langasek <[e-mail]>  Thu, 20 Jun 2019 13:48:46 -0700
+
+open-iscsi (2.0.874-7.1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest.
+    - debian/iscsi-network-interface.rules, debian/net-interface-handler,
+      debian/open-iscsi.install:
+      Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown if the system is using
+      resolvconf or ifupdown.
+    - Let iscsid systemd job run in privileged containers but not in
+      unprivileged ones
+    - Start open-iscsi systemd job when either /etc/iscsi/nodes or
+      /sys/class/iscsi_session have content
+    - add IPv6 support
+      + Source /run/net6-*.conf when needed.
+      + debian/extra/initramfs.local-top: handle IPv6 configs being
+        shipped in DEVICE6 or /run/net6-*.conf in the initramfs, so we
+        can fill in /run/initramfs/open-iscsi.interface
+    - make iscsid socket-activated to only activate it as needed
+      + debian/iscsid.socket: systemd socket file for iscsid
+      + debian/open-iscsi.service: do not start or check iscsid.service
+      + debian/rules: install and enable iscsid.socket
+      + debian/patches/iscid-conf-use-systemd.socket-patch: default to the
+        socket
+      + debian/open-iscsi.postinst:
+        * run restart logic only if service is running on upgrade
+        * drop no longer reachable upgrade path that affects iscsid
+        * disable iscsid.service on upgrade
+        * handle iscsid.socket to be started if the service is not running
+          yet
+      + d/iscsi-disk.rules: Add a udev rule so that iscsid.service will be
+        run when udev disks are attached.
+      + d/iscsid.service: Remove ExecStop= directive.
+      + debian/tests/install: fix tests to work with socket activation
+    - Ship finalrd logout hook.
+    - debian/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
+      run ipconfig to gather all DHCP config info, including DNS search
+      domain, which iBFT can't provide.
+    - If iscsi root was requested, but no iscsi devices were mounted, remove
+      the initramfs interfaces stamp file. Meaning, that on shutdown there
+      is no 30s delay, whilst trying to re-establish iscsi login to perform
+      a logout.
+  * Dropped changes, included in Debian:
+    - Fix fail to build from source due to undefined reference to
+      minor
+  * Drop breaks on never-released version of finalrd.
+  * debian/net-interface-handler: drop upstart support, unused since bionic.
+  * Drop cleanup of upstart jobs, no longer needed post bionic.
+  * debian/tests/daemon: drop, unused.
+
+ -- Steve Langasek <[e-mail]>  Mon, 29 Apr 2019 16:13:37 -0700
+
 open-iscsi (2.0.874-7) unstable; urgency=medium
 
   * [eeda27c] Enable back pristine-tar as we have now committed it
@@ -131,6 +558,158 @@ open-iscsi (2.0.874-6) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Fri, 05 Oct 2018 11:31:19 +0530
 
+open-iscsi (2.0.874-5ubuntu15) disco; urgency=medium
+
+  * d/iscsid.service: Remove ExecStop= directive. Letting systemd
+    handle termination prevents restart failures. (LP: #1821255)
+
+ -- Heitor R. Alves de Siqueira <[e-mail]>  Thu, 28 Mar 2019 10:21:24 -0300
+
+open-iscsi (2.0.874-5ubuntu14) disco; urgency=medium
+
+  * debian/iscsi-disk.rules: Fix bug with LVM on top of iscsi devices.
+    (LP: #1807978)
+
+ -- Scott Moser <[e-mail]>  Tue, 11 Dec 2018 19:01:14 -0500
+
+open-iscsi (2.0.874-5ubuntu13) disco; urgency=medium
+
+  [ Robert C Jennings & Dimitri John Ledkov ]
+  * If iscsi root was requested, but no iscsi devices were mounted, remove
+    the initramfs interfaces stamp file. Meaning, that on shutdown there
+    is no 30s delay, whilst trying to re-establish iscsi login to perform
+    a logout. LP: #1800681
+
+ -- Dimitri John Ledkov <[e-mail]>  Sun, 09 Dec 2018 22:29:20 +0000
+
+open-iscsi (2.0.874-5ubuntu12) disco; urgency=medium
+
+  [Scott Moser]
+  * debian/extra/initramfs.local-top: handle iSCSI iBFT DHCP to correctly
+    run ipconfig to gather all DHCP config info, including DNS search
+    domain, which iBFT can't provide.  (LP: #1806777)
+
+ -- Dan Streetman <[e-mail]>  Wed, 05 Dec 2018 11:28:12 -0500
+
+open-iscsi (2.0.874-5ubuntu11) disco; urgency=medium
+
+  * debian/tests/test-open-iscsi.py: Fix called process error.
+    If no image was available for a release, a NameError exception would be
+    raised.
+
+ -- Scott Moser <[e-mail]>  Wed, 14 Nov 2018 16:50:29 -0500
+
+open-iscsi (2.0.874-5ubuntu10) disco; urgency=medium
+
+  * d/iscsi-disk.rules, d/tests: Add a udev rule so that iscsid.service
+    will be run when udev disks are attached.  (LP: #1802354)
+  * debian/tests: improve tgt boot test
+     - disable snapd and snap.seeded services to avoid unnecessary
+       resource consumption during tests.
+     - save artifacts from the test run.
+
+ -- Scott Moser <[e-mail]>  Wed, 14 Nov 2018 16:05:46 -0500
+
+open-iscsi (2.0.874-5ubuntu9) cosmic; urgency=medium
+
+  * d/net-interface-handler: replace 'domainsearch' with the correct
+    configuration option 'search' in net-interface-handler (LP: #1791108)
+
+ -- Victor Tapia <[e-mail]>  Mon, 17 Sep 2018 15:58:34 +0200
+
+open-iscsi (2.0.874-5ubuntu8) cosmic; urgency=medium
+
+  * d/tests: insert some debug units in an attempt to diagnose any
+    occurences of bug 1788188.
+  * Fix fail to build from source due to undefined reference to
+    minor (LP: #1791154)
+
+ -- Scott Moser <[e-mail]>  Tue, 21 Aug 2018 13:33:06 -0400
+
+open-iscsi (2.0.874-5ubuntu7) cosmic; urgency=medium
+
+  * d/tests: make interactive use of tgt-boot-test more usable by
+    only using 'timeout' from the test harness.
+  * debian/tests/README-boot-test.md: minor doc fixes and whitespace.
+  * d/net-interface-handler: Apply changes only for the iscsi-root interface.
+    (LP: #1785108)
+
+ -- Scott Moser <[e-mail]>  Tue, 07 Aug 2018 16:37:13 -0400
+
+open-iscsi (2.0.874-5ubuntu6) cosmic; urgency=medium
+
+  * Ship finalrd logout hook.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 03 Aug 2018 15:03:51 +0100
+
+open-iscsi (2.0.874-5ubuntu5) cosmic; urgency=medium
+
+  * Harden dep8 tests against effects due to slow execution on Launchpad
+    infrastructure (LP: #1732028).
+    - debian/tests/patch-image: remove problematic fstab entries
+    - debian/tests/tgt-boot-test: ran xkvm in verbose mode
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 Jul 2018 18:22:39 +0200
+
+open-iscsi (2.0.874-5ubuntu4) cosmic; urgency=medium
+
+  * debian/tests/install: ignore the potential stderr of the probing command
+    that is meant to activate iscsid indirectly via the socket.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 May 2018 15:42:12 +0200
+
+open-iscsi (2.0.874-5ubuntu3) cosmic; urgency=medium
+
+  * make iscsid socket activated to only activate it as-needed (LP: #1755858)
+    - debian/iscsid.socket: systemd socket file for iscsid
+    - debian/open-iscsi.service: do not start or check iscsid.service
+    - debian/rules: install and enable iscsid.socket
+    - debian/patches/iscid-conf-use-systemd.socket-patch: default to the socket
+    - debian/open-iscsi.postinst:
+      + run restart logic only if service is running on upgrade
+      + drop no more reachable upgrade path that affects iscsid
+      + disable iscsid.service on upgrade
+      + handle iscsid.socket to be started if the service is not running yet
+    - debian/tests/install: fix tests to work with socket activation
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 23 May 2018 15:50:01 +0200
+
+open-iscsi (2.0.874-5ubuntu2) bionic; urgency=medium
+
+  * debian/tests:
+     - tgt-boot-test: Use 'timeout' to force a 60m timeout of the boot test.
+     - README-boot-test.md: document environment variables BOOT_TIMEOUT
+       and _USE_KVM.
+
+ -- Scott Moser <[e-mail]>  Wed, 21 Feb 2018 13:19:17 -0500
+
+open-iscsi (2.0.874-5ubuntu1) bionic; urgency=low
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtests.
+    - debian/iscsi-network-interface.rules, debian/net-interface-handler,
+      debian/open-iscsi.install:
+      Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown.
+      Integrates with resolvconf and initramfs code that writes
+      /run/initramfs/open-iscsi.interface
+    - debian/open-iscsi.maintscript: clean up the obsolete
+      iscsi-network-interface upstart job, file on upgrade.
+    - Let iscsid systemd job run in privileged containers but not in
+      unprivileged ones
+    - Start open-iscsi systemd job when either /etc/iscsi/nodes or
+      /sys/class/iscsi_session have content
+      Based on patch by Nish Aravamudan, thanks! (LP #1576341)
+    - add IPv6 support
+      + add support for IPV6{DOMAINSEARCH,DNS0,DNS1} to net-interface-handler
+        LP #1621507
+      + Source /run/net6-*.conf when needed.
+      + debian/extra/initramfs.local-top: handle IPv6 configs being
+        shipped in DEVICE6 or /run/net6-*.conf in the initramfs, so we
+        can fill in /run/initramfs/open-iscsi.interface (LP #1621507)
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 12 Jan 2018 14:00:59 +0000
+
 open-iscsi (2.0.874-5) unstable; urgency=high
 
   * [aeb86f7] Fix multiple security issues in iscsiuio. (CVE-2017-17840)
@@ -138,6 +717,74 @@ open-iscsi (2.0.874-5) unstable; urgency=high
 
  -- Christian Seiler <[e-mail]>  Sat, 23 Dec 2017 11:30:44 +0100
 
+open-iscsi (2.0.874-4ubuntu5) bionic; urgency=medium
+
+  * debian/tests/patch-image: mount auxilary filesystems before upgrading
+    packages. Fixes ADT tests, when triggered by packages, that need
+    /proc, /dev, etc mounted to complete the upgrade.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 03 Jan 2018 12:21:05 +0000
+
+open-iscsi (2.0.874-4ubuntu4) bionic; urgency=medium
+
+  * debian/tests/test-open-iscsi.py: skip test if cloud image is unavailable.
+    This solves flaky tests in restricted network environments as well as in
+    the short period after opening a new release (LP: #1731907).
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 16 Nov 2017 12:06:34 +0100
+
+open-iscsi (2.0.874-4ubuntu3) artful; urgency=medium
+
+  * debian/tests/xkvm: do not use kvm (-enable-kvm) by default if
+    operating inside a vm.  nested kvm is finicky.
+
+ -- Scott Moser <[e-mail]>  Wed, 11 Oct 2017 18:14:08 -0400
+
+open-iscsi (2.0.874-4ubuntu2) artful; urgency=medium
+
+  * debian/tests/test-open-iscsi.py: query systemd-resolved if present.
+    Ubuntu images now have systemd-resolved managing /etc/resolv.conf
+    so support test if that is the case (LP: #1715468).
+
+ -- Scott Moser <[e-mail]>  Wed, 06 Sep 2017 16:20:16 -0400
+
+open-iscsi (2.0.874-4ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtests.
+    - debian/iscsi-network-interface.rules, debian/net-interface-handler,
+      debian/open-iscsi.install:
+      Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown.
+      Integrates with resolvconf and initramfs code that writes
+      /run/initramfs/open-iscsi.interface
+    - debian/open-iscsi.maintscript: clean up the obsolete
+      iscsi-network-interface upstart job, file on upgrade.
+    - Let iscsid systemd job run in privileged containers but not in
+      unprivileged ones
+    - Start open-iscsi systemd job when either /etc/iscsi/nodes or
+      /sys/class/iscsi_session have content
+      Based on patch by Nish Aravamudan, thanks! (LP #1576341)
+    - add IPv6 support
+      + add support for IPV6{DOMAINSEARCH,DNS0,DNS1} to net-interface-handler
+        LP #1621507
+      + Source /run/net6-*.conf when needed.
+      + debian/extra/initramfs.local-top: handle IPv6 configs being
+        shipped in DEVICE6 or /run/net6-*.conf in the initramfs, so we
+        can fill in /run/initramfs/open-iscsi.interface (LP #1621507)
+  * Drop:
+    - d/extra/initramfs.local-top: When booting from iBFT,
+      set the PROTO= entry in /run/net-*.conf accordingly,
+      so that other tools, such as cloud-init, can use that
+      information. (cloud-init fails if the current PROTO=none
+      is used.) (LP: #1684039) (Closes: #866213)
+      [ Fixed in Debian 2.0.874-4 ]
+  * d/t/test-open-iscsi.py: drop test_daemon test
+    - With the updates to the systemd units, the services do not run
+      unless iSCSI is configured.
+
+ -- Nishanth Aravamudan <[e-mail]>  Tue, 08 Aug 2017 16:16:27 -0700
+
 open-iscsi (2.0.874-4) unstable; urgency=medium
 
   * [0347300] initramfs: populate PROTO= entry in /run/net-*.conf from iBFT
@@ -152,6 +799,64 @@ open-iscsi (2.0.874-3) unstable; urgency=medium
 
  -- Christian Seiler <[e-mail]>  Sun, 18 Jun 2017 22:01:22 +0200
 
+open-iscsi (2.0.874-2ubuntu3) artful; urgency=medium
+
+  * d/t/test-open-iscsi.py: drop test_daemon test
+    - With the updates to the systemd units, the services do not run
+      unless iSCSI is configured.
+
+ -- Nishanth Aravamudan <[e-mail]>  Tue, 08 Aug 2017 16:05:29 -0700
+
+open-iscsi (2.0.874-2ubuntu2) artful; urgency=medium
+
+  * d/extra/initramfs.local-top: When booting from iBFT,
+    set the PROTO= entry in /run/net-*.conf accordingly,
+    so that other tools, such as cloud-init, can use that
+    information. (cloud-init fails if the current PROTO=none
+    is used.) (LP: #1684039) (Closes: #866213)
+
+ -- Eric Desrochers <[e-mail]>  Wed, 05 Jul 2017 09:02:12 -0400
+
+open-iscsi (2.0.874-2ubuntu1) artful; urgency=medium
+
+  [ Nishanth Aravamudan ]
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtests.
+    - debian/iscsi-network-interface.rules, debian/net-interface-handler,
+      debian/open-iscsi.install:
+      Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown.
+      Integrates with resolvconf and initramfs code that writes
+      /run/initramfs/open-iscsi.interface
+    - debian/open-iscsi.maintscript: clean up the obsolete
+      iscsi-network-interface upstart job, file on upgrade.
+    - add IPv6 support
+      + add support for IPV6{DOMAINSEARCH,DNS0,DNS1} to net-interface-handler
+        LP #1621507
+      + Source /run/net6-*.conf when needed.
+      + debian/extra/initramfs.local-top: handle IPv6 configs being
+        shipped in DEVICE6 or /run/net6-*.conf in the initramfs, so we
+        can fill in /run/initramfs/open-iscsi.interface (LP #1621507)
+  * Drop:
+    - Make systemd job not run in containers (LP #1576341)
+      [ This prevents running iscsi in privileged containers.
+        Fixed differently in this upload. ]
+    - Cherry-pick from Debian git repository (Christian Seiler):
+      + open-iscsi-udeb: drop Depends: libnss-files-udeb
+        (Closes #819685)
+      [ Fixed in Debian ]
+     - d/extra/initramfs.local-top whitespace change
+     [ previously undocumented ]
+
+  [ Balint Reczey ]
+  * Let iscsid systemd job run in privileged containers but not in
+    unprivileged ones
+  * Start open-iscsi systemd job when either /etc/iscsi/nodes or
+    /sys/class/iscsi_session have content
+    Based on patch by Nish Aravamudan, thanks! (LP #1576341)
+
+ -- Nishanth Aravamudan <[e-mail]>  Tue, 09 May 2017 09:24:23 -0700
+
 open-iscsi (2.0.874-2) unstable; urgency=medium
 
   [ Christian Seiler ]
@@ -291,6 +996,155 @@ open-iscsi (2.0.873+git0.3b4b4500-15) unstable; urgency=medium
 
  -- Christian Seiler <[e-mail]>  Fri, 20 May 2016 09:52:46 +0200
 
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu17) zesty; urgency=medium
+
+  * debian/tests:
+    - README-boot-test.md: mention limited space caveat.
+    - patch-image: fix handling of ADT_TEST_TRIGGERS if source package
+      built more than one binary package.
+    - test-open-iscsi.py: change to rely on patch-image
+      adding package 'open-iscsi' rather than passing it in itself.
+
+ -- Scott Moser <[e-mail]>  Thu, 16 Feb 2017 15:47:58 -0500
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu16) zesty; urgency=medium
+
+  * debian/tests: many improvements to the open-iscsi and tgt boot test.
+    - only run test on amd64. just avoid timeout errors or other unrelated
+      issues causing failure.
+    - debian/tests/README-boot-test.md: add doc describing the tgt-boot-test
+    - rename get-maas-eph to get-image
+    - use a cloud image instead of a maas image for booting.  The value in
+      this is that we can then install open-iscsi inside the image and get an
+      updated initramfs.
+    - use subprocess.check_call rather than subprocess.call so that we
+      actually catch errors.
+    - update xkvm to what is in curtin/tools/xkvm
+    - improve updating of images to consider ADT_TEST_TRIGGERS if set.
+
+ -- Scott Moser <[e-mail]>  Tue, 14 Feb 2017 17:07:00 -0500
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu15) zesty; urgency=medium
+
+  * debian/tests/tgt-boot-test: set HOST_IP harder for the testsuite test.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Sun, 29 Jan 2017 13:05:47 -0500
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu14) zesty; urgency=medium
+
+  * Make systemd job not run in containers (LP: #1576341)
+
+ -- Serge Hallyn <[e-mail]>  Sun, 15 Jan 2017 23:08:29 -0600
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu13) zesty; urgency=medium
+
+  * Fix syntax error in previous changes. LP: #1621507
+
+ -- LaMont Jones <[e-mail]>  Fri, 09 Dec 2016 12:35:45 +0100
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu12) zesty; urgency=medium
+
+  * debian/tests/tgt-boot-test: set HOST_IP to 10.0.2.2; it's suboptimal but
+    given the test setup this will allow the right IPs to be used to bring up
+    the iscsi target in the xkvm.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 08 Dec 2016 11:00:12 +0100
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu11) zesty; urgency=medium
+
+  * debian/tests/tgt-boot-test: drop -serial stdio altogether since running
+    the VM in -nographics mode will already output to stdout.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 22 Nov 2016 11:27:55 -0500
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu10) zesty; urgency=medium
+
+  * debian/tests/tgt-boot-test: always log qemu serial to stdio so we can
+    actually see what is going on during the tests.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 17 Nov 2016 11:01:27 -0500
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu9) zesty; urgency=medium
+
+  [ LaMont Jones ]
+  * Clean up net-interface-handler
+  * Source /run/net6-*.conf when needed.
+
+  [ Mathieu Trudel-Lapierre ]
+  * debian/extra/initramfs.local-top: handle IPv6 configs being shipped in
+    DEVICE6 or /run/net6-*.conf in the initramfs, so we can fill in
+    /run/initramfs/open-iscsi.interface (LP: #1621507)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 03 Nov 2016 16:30:37 -0600
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu8) yakkety; urgency=medium
+
+  * debian/tests/xkvm: don't --enable-kvm.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 05 Oct 2016 12:58:21 -0400
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu7) yakkety; urgency=medium
+
+  * debian/tests/test-open-iscsi.py: glob to pick up open-iscsi.deb, which may
+    be named differently depending on how autopkgtests are run.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 05 Oct 2016 09:56:25 -0400
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu6) yakkety; urgency=medium
+
+  * debian/tests/test-open-iscsi.py: install the open-iscsi binary into a test
+    MAAS image, so we can check bootability. Download the open-iscsi explicitly
+    to /tmp before trying to copy it; so that we don't need to depend on ugly
+    internal autopkgtest paths.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 04 Oct 2016 09:05:56 -0400
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu5) yakkety; urgency=medium
+
+  * debian/tests/control: add build-needed since some of the new tests
+    appear to require that (so they can reach open-iscsi.deb which is a build
+    artifact from building in autopkgtest).
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 03 Oct 2016 16:10:54 -0400
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu4) yakkety; urgency=medium
+
+  * add support for IPV6{DOMAINSEARCH,DNS0,DNS1} to net-interface-handler
+    LP: #1621507
+
+ -- LaMont Jones <[e-mail]>  Tue, 20 Sep 2016 08:05:41 -0600
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu3) xenial; urgency=medium
+
+  * Cherry-pick from Debian git repository (Christian Seiler):
+    - open-iscsi-udeb: drop Depends: libnss-files-udeb (Closes: #819685)
+
+ -- Colin Watson <[e-mail]>  Fri, 15 Apr 2016 16:54:26 +0100
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu2) xenial; urgency=medium
+
+  * debian/tests: add two new tests.  One to verify net-interface-handler is
+    installed executable, and one to actually test that /etc/resolv.conf is
+    updated with dhcp dns responses.
+
+ -- Diogo Matsubara <[e-mail]>  Wed, 09 Mar 2016 12:56:42 -0300
+
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu1) xenial; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest.
+    - debian/iscsi-network-interface.rules, debian/net-interface-handler,
+      debian/open-iscsi.install:
+      Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown.
+      Integrates with resolvconf and initramfs code that writes
+      /run/initramfs/open-iscsi.interface
+    - debian/open-iscsi.maintscript: clean up the obsolete
+      iscsi-network-interface upstart job, file on upgrade.
+  * make debian/net-interface-handler executable (LP: #1553017)
+
+ -- Scott Moser <[e-mail]>  Fri, 04 Mar 2016 13:17:45 -0500
+
 open-iscsi (2.0.873+git0.3b4b4500-14) unstable; urgency=medium
 
   [ Christian Seiler ]
@@ -303,6 +1157,21 @@ open-iscsi (2.0.873+git0.3b4b4500-14) unstable; urgency=medium
 
  -- Christian Seiler <[e-mail]>  Thu, 03 Mar 2016 18:47:46 +0100
 
+open-iscsi (2.0.873+git0.3b4b4500-13ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian (LP: #1546877). Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest.
+    - debian/iscsi-network-interface.rules, debian/net-interface-handler,
+      debian/open-iscsi.install:
+      Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown.
+      Integrates with resolvconf and initramfs code that writes
+      /run/initramfs/open-iscsi.interface
+    - debian/open-iscsi.maintscript: clean up the obsolete
+      iscsi-network-interface upstart job, file on upgrade.
+
+ -- Scott Moser <[e-mail]>  Thu, 18 Feb 2016 00:53:37 -0500
+
 open-iscsi (2.0.873+git0.3b4b4500-13) unstable; urgency=medium
 
   [ Christian Seiler ]
@@ -524,6 +1393,115 @@ open-iscsi (2.0.873+git0.3b4b4500-1) unstable; urgency=low
 
  -- Ritesh Raj Sarraf <[e-mail]>  Tue, 05 Nov 2013 21:45:47 +0530
 
+open-iscsi (2.0.873-3ubuntu13) wily; urgency=medium
+
+  * debian/net-interface-handler: Create the resolvconf dir, to avoid failure
+    when resolvconf did not start yet; the udev rules run in parallel with
+    it. (LP: #1501033)
+
+ -- Martin Pitt <[e-mail]>  Tue, 06 Oct 2015 07:05:48 +0200
+
+open-iscsi (2.0.873-3ubuntu12) wily; urgency=medium
+
+  * Drop debian/ifup@.service.conf again, it ceased to work with net.agent in
+    wily and the whole idea of net-interface-handler is to *stop* ifupdown
+    from fiddling with the iscsi interface. Replace with udev rules
+    (debian/iscsi-network-interface.rules) which achieves this without relying
+    on ifupdown or a particular init system. (LP: #1463461)
+  * Drop debian/open-iscsi.iscsi-network-interface.upstart as well, obsolete
+    now. Also clean it up on upgrades.
+
+ -- Martin Pitt <[e-mail]>  Thu, 11 Jun 2015 11:58:29 +0200
+
+open-iscsi (2.0.873-3ubuntu11) vivid; urgency=medium
+
+  * Factor out logic from debian/open-iscsi.iscsi-network-interface.upstart
+    into debian/net-interface-handler, and install the latter in debian/rules.
+  * Add debian/ifup@.service.conf: Drop-in for ifup@.service to run
+    net-interface-handler under systemd. (LP: #1432829)
+
+ -- Martin Pitt <[e-mail]>  Fri, 27 Mar 2015 09:51:05 +0100
+
+open-iscsi (2.0.873-3ubuntu10) vivid; urgency=medium
+
+  * Start open-iscsi after installation and make sure initiatorname is
+    generated. (Patch backported from Debian)
+  * debian/tests/daemon: Stop calling the init.d script as we expect the
+    daemon to start automatically now.
+
+ -- Martin Pitt <[e-mail]>  Fri, 06 Mar 2015 13:17:26 +0100
+
+open-iscsi (2.0.873-3ubuntu9) trusty; urgency=medium
+
+  * Add missing python test dependency.
+
+ -- Martin Pitt <[e-mail]>  Wed, 26 Feb 2014 16:07:37 +0100
+
+open-iscsi (2.0.873-3ubuntu8) trusty; urgency=medium
+
+  * open-iscsi-udeb: Enable builds on armhf, arm64, ppc64el, x32 (LP: #1274203)
+
+ -- dann frazier <[e-mail]>  Wed, 29 Jan 2014 12:34:45 -0700
+
+open-iscsi (2.0.873-3ubuntu7) saucy; urgency=low
+
+  * Use dh_autotools-dev to update config.sub|guess.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Fri, 11 Oct 2013 17:03:37 +0100
+
+open-iscsi (2.0.873-3ubuntu6) saucy; urgency=low
+
+  * debian/tests: Add autopkgtest.
+
+ -- Yolanda <[e-mail]>  Mon, 27 May 2013 10:39:35 +0200
+
+open-iscsi (2.0.873-3ubuntu5) quantal-proposed; urgency=low
+
+  * Ensure all udev events have been processed before trying to configure
+    iscsi networking in the initramfs (LP: #1066945): 
+    - debian/extra/initramfs.local-top: Restore wait_for_udev call before
+      configure_networking to ensure network devices are present.
+
+ -- James Page <[e-mail]>  Wed, 17 Oct 2012 12:37:43 +0100
+
+open-iscsi (2.0.873-3ubuntu4) quantal-proposed; urgency=low
+
+  * Generate initiator name on install, not first boot, ensuring that the
+    initramfs built during install contains a valid iSCSI initiator name
+    resulting in a iSCSI based root volume that will actually boot
+    (LP: #1057635):
+    - debian/{rules,initiatorname.iscsi}: Don't install a default
+      initiatorname.iscsi.
+    - debian/open-iscsi.postinst: Generate initiatorname.iscsi on install.
+
+ -- James Page <[e-mail]>  Mon, 15 Oct 2012 12:42:53 +0100
+
+open-iscsi (2.0.873-3ubuntu3) quantal; urgency=low
+
+  * debian/open-iscsi.iscsi-network-interface.upstart: fix bad syntax
+    in 'post-stop'
+
+ -- Scott Moser <[e-mail]>  Mon, 17 Sep 2012 16:50:22 -0400
+
+open-iscsi (2.0.873-3ubuntu2) quantal; urgency=low
+
+  * debian/extra/initramfs.local-top: start writing
+    /run/initramfs/open-iscsi.interface file again (LP: #1050480)
+  * debian/open-iscsi.iscsi-network-interface.upstart: integrate with
+    resolvconf (LP: #1050487)
+
+ -- Scott Moser <[e-mail]>  Mon, 17 Sep 2012 15:46:26 -0400
+
+open-iscsi (2.0.873-3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian. Remaining changes: (LP: #961114, LP: #677333)
+    - Add upstart job iscsi-network-interface
+    - Migrate from /var/run and /lib/init/rw to /run, from /var/lock to
+      /run/lock.
+  * Turn open-iscsi-utils into a transitional package
+
+ -- Stéphane Graber <[e-mail]>  Tue, 10 Jul 2012 13:53:52 -0400
+
 open-iscsi (2.0.873-3) unstable; urgency=low
 
   * [4939401] Fix build to install udeb stuff only on supported architectures
@@ -698,6 +1676,239 @@ open-iscsi (2.0.871-1) unstable; urgency=low
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sat, 06 Feb 2010 20:28:23 +0530
 
+open-iscsi (2.0.871-0ubuntu9) oneiric-proposed; urgency=low
+
+  * Make sure the upstart job triggers ifupdown's upstart script to avoid
+    waiting 2 minutes at boot time for network to come up. (LP: #870214)
+
+ -- Stéphane Graber <[e-mail]>  Tue, 11 Oct 2011 22:31:39 +0100
+
+open-iscsi (2.0.871-0ubuntu8) oneiric; urgency=low
+
+  * Disable open-iscsi init script when root is on iscsi (LP: #838809)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 15 Sep 2011 10:01:12 -0400
+
+open-iscsi (2.0.871-0ubuntu7) oneiric; urgency=low
+
+  * Migrate from /var/run and /lib/init/rw to /run, from /var/lock to
+    /run/lock, and from /dev/.initramfs to /run/initramfs.
+
+ -- Colin Watson <[e-mail]>  Thu, 14 Jul 2011 17:01:42 +0100
+
+open-iscsi (2.0.871-0ubuntu6) oneiric; urgency=low
+
+  * Fix initramfs iSCSI login (many thanks to Amos Hayes for lending me a
+    test system; LP: #728088):
+    - Write out /dev/.initramfs/open-iscsi.interface in the same subshell as
+      configure_networking, so that we can get at the value of DEVICE.
+    - Wait for udev to settle before attempting to configure networking.
+
+ -- Colin Watson <[e-mail]>  Fri, 27 May 2011 23:27:31 +0100
+
+open-iscsi (2.0.871-0ubuntu5) maverick; urgency=low
+
+  * Include <sys/types.h> and <sys/stat.h> in usr/iscsi_sysfs.c for S_*
+    macros (LP: #600953).
+
+ -- Colin Watson <[e-mail]>  Fri, 02 Jul 2010 17:08:14 +0100
+
+open-iscsi (2.0.871-0ubuntu4) lucid; urgency=low
+
+  * Revert ISCSI_NETDEVICE change; it's normally better to select the
+    interface by MAC address (LP: #473036).
+
+ -- Colin Watson <[e-mail]>  Fri, 05 Feb 2010 12:06:06 -0800
+
+open-iscsi (2.0.871-0ubuntu3) lucid; urgency=low
+
+  * If ISCSI_NETDEVICE is set, configure that interface in the initramfs
+    (LP: #473036).
+
+ -- Colin Watson <[e-mail]>  Fri, 22 Jan 2010 17:01:17 +0000
+
+open-iscsi (2.0.871-0ubuntu2) lucid; urgency=low
+
+  * Fix handling of ISCSI_USERNAME, ISCSI_PASSWORD, ISCSI_IN_USERNAME, and
+    ISCSI_IN_PASSWORD in iscsi.initramfs (closes: #525053).
+
+ -- Colin Watson <[e-mail]>  Mon, 14 Dec 2009 12:24:42 +0000
+
+open-iscsi (2.0.871-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+  * If the root filesystem is on iSCSI, prevent the network interface used
+    for it from being brought up or down automatically (LP: #457767).
+  * Backport from upstream:
+    - Allow updating of discovery records (Hannes Reinecke).
+    - Fix discovery record use, rather than always using iscsid.conf
+      settings (Mike Christie).
+
+ -- Colin Watson <[e-mail]>  Thu, 10 Dec 2009 18:19:20 +0000
+
+open-iscsi (2.0.870.1-0ubuntu12) karmic; urgency=low
+
+  * debian/open-iscsi-udeb.finish-install: Stop checking
+    disk-detect/iscsi/enable, as that template doesn't exist any more.
+
+ -- Colin Watson <[e-mail]>  Fri, 02 Oct 2009 18:49:18 +0100
+
+open-iscsi (2.0.870.1-0ubuntu11) karmic; urgency=low
+
+  * open-iscsi-utils Replaces: old versions of open-iscsi.
+  * SECURITY UPDATE: temporary file vulnerability (LP: #408915)
+    - utils/iscsi_discovery: store iscsiadm -m discovery result in a
+      variable rather than writing it to an insecurely-created temporary
+      file
+    - CVE-2009-1297
+
+ -- Colin Watson <[e-mail]>  Mon, 24 Aug 2009 23:42:10 +0100
+
+open-iscsi (2.0.870.1-0ubuntu10) karmic; urgency=low
+
+  * debian/control, debian/open-iscsi-utils.install,
+    open-iscsi-utils.manpages : create a new binary package which
+    contains /sbin/iscsiadm, needed for some packages to build against
+    (eg, libvirt), but not containing the init script, LP: #414986
+
+ -- Dustin Kirkland <[e-mail]>  Tue, 18 Aug 2009 08:11:34 -0500
+
+open-iscsi (2.0.870.1-0ubuntu9) karmic; urgency=low
+
+  * debian/open-iscsi.init: don't exit with error if
+    /lib/init/rw/sendsigs.omit.d/ doesn't exist (LP: #414986)
+
+ -- Jamie Strandboge <[e-mail]>  Mon, 17 Aug 2009 14:12:01 -0500
+
+open-iscsi (2.0.870.1-0ubuntu8) karmic; urgency=low
+
+  * Make sure network devices are always included in the initramfs if
+    booting with / on iSCSI.
+  * Retry initramfs network configuration for a while until it works (LP:
+    #237460).
+
+ -- Colin Watson <[e-mail]>  Tue, 11 Aug 2009 13:05:43 +0100
+
+open-iscsi (2.0.870.1-0ubuntu7) karmic; urgency=low
+
+  [ Colin Watson ]
+  * debian/open-iscsi-udeb.postinst, debian/open-iscsi-udeb.templates:
+    Remove; this is being taken over by disk-detect and partman-iscsi.
+  * debian/control: Remove XB-Installer-Menu-Item.
+
+  [ Mathias Gug ]
+  * debian/open-iscsi.postinst: Fix backwards use of update-rc.d (LP:
+    #306678).
+  * debian/open-iscsi.init: Overwrite existing pid file symlinks in
+    /lib/init/rw/sendsigs.omit.d/.
+
+ -- Colin Watson <[e-mail]>  Mon, 10 Aug 2009 13:28:41 +0100
+
+open-iscsi (2.0.870.1-0ubuntu6) karmic; urgency=low
+
+  * utils/iscsi_discovery: Fix several bashisms (test ==, &> redirection,
+    trap with numeric signals).
+
+ -- Colin Watson <[e-mail]>  Tue, 04 Aug 2009 12:30:44 +0100
+
+open-iscsi (2.0.870.1-0ubuntu5) karmic; urgency=low
+
+  * utils/iscsi_discovery: replace uses of awk with other shell voodoo, so
+    that this works in the installer.  LP: #236640.
+  * debian/rules, debian/open-iscsi-udeb.dirs: install the open-isci-udeb
+    finish script to /usr/lib/finish-install.d, not to /lib/finish-install.d.
+  * debian/open-iscsi-udeb.finish-install: copy the config from the root
+    to the correct directory in the target.
+
+ -- Steve Langasek <[e-mail]>  Tue, 07 Jul 2009 22:10:17 -0700
+
+open-iscsi (2.0.870.1-0ubuntu4) karmic; urgency=low
+
+  * debian/extra/initramfs.hook: iscsistart is in /sbin, not /usr/sbin (LP:
+    #364616).
+
+ -- Colin Watson <[e-mail]>  Thu, 02 Jul 2009 14:12:25 +0100
+
+open-iscsi (2.0.870.1-0ubuntu3) jaunty; urgency=low
+
+  * Invoke iscsi-iname using normal $PATH lookup rather than using an
+    incorrect explicit path (see LP #236640).
+
+ -- Colin Watson <[e-mail]>  Thu, 09 Apr 2009 16:49:08 +0100
+
+open-iscsi (2.0.870.1-0ubuntu2) jaunty; urgency=low
+
+  * debian/control: Drop udeb dependency on crypto-modules; as best as I can
+    tell, this is required for crc32c support, which is now built-in to the
+    Ubuntu kernels.
+
+ -- Dustin Kirkland <[e-mail]>  Tue, 03 Feb 2009 11:20:35 +0100
+
+open-iscsi (2.0.870.1-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release:
+   - Support 2.6.26/27 kernels (LP: #289470).
+   - Fix iscsid shutdown (LP: #181188).
+  * Merge from Debian. Remaining Ubuntu changes:
+   - Note: Debian version isn't 870~rc3 but 869.2 which leads to a big
+     .diff.gz file. Only files in debian/ have been considered for this merge
+     since debian hasn't patched the source.
+   - debian/control, debian/rules, debian/open-iscsi-udeb*:
+     + Add open-iscsi-udeb.
+   - debian/open-iscsi.dirs:
+     + rename dirs to open-iscsi.dirs because of open-iscsi-udeb addition.
+     + drop network/if-up.d/ directory since we're using symlinks instead.
+     + utilities installed in /bin,/sbin rather than /usr/bin,/usr/sbin.
+   - debian/open-iscsi.init:
+     + utilities installed in /bin,/sbin rather than /usr/bin,/usr/sbin.
+     + lsb log messages.
+     + Don't generate initiatorname name (moved to postinst).
+     + Support for being called from ifup/ifdown scripts.
+     + Refactor start functions:
+       - move daemon start to startdaemon function.
+       - call udevadm settle rather then udevsettle (which doesn't do anything
+         useful).
+       - don't exit if the daemon is already running during sanitychecks.
+         Instead check in startdaemon if the daemon needs to be started.
+       - only start automatic targets if necessary.
+       - add waitfordevices function: called during rcS, waits for all 
+         automatic targets to be ready. Iscsi targets are considered as
+         local block devices - they don't need to be marked with _netdev in
+         fstab. (LP: #227848) 
+       - start targets if not run from rcS.
+     + Check status of iscsid daemon in addition to listing the iscsi sessions 
+       when status action is called.  
+     + Add iscsid to the list of processes that should not be killed by
+       sendsigs during shutdown (LP: #192080).
+     + Add starttargets, stoptargets and restarttargets to usage message.
+   - debian/rules:
+     + Install utilities /bin,/sbin rather than /usr/bin,/usr/sbin.
+     + Start open-iscsi at S25 (waiting for devices created by ifupdown
+       calls and before local filesystems are checked and mounted)
+     + stop at S41 (after local filesystems are unmounted). Don't use 
+       umountiscsi.sh script from debian. (LP: #192080).
+   - debian/initiatorname.iscsi, debian/open-iscsi.postinst:
+     + Generate the random initiatorname during postinstall rather than in the
+     init script.
+     + Don't ship a default initiatorname.iscsi file.
+   - debian/open-iscsi.postinst:
+     + fix init script ordering on upgrades.
+   - debian/open-iscsi.links:
+     + symlink open-iscsi init script in if-up.d and if-down.d directory so
+       that the iscsi subsystem is started/stopped when network interfaces 
+       are configured.
+   - debian/open-iscsi.postrm:
+     + delete iscsi configuration when the package is purged.
+   - utils/iscsi_discovery: De-bashify iscsi_discovery.
+   - usr/idbm.c: Fix build failure with new glibc. LP: #299843.
+  * Dropped:
+   - Exit without error if /sys is not available. Otherwise, it's not possible
+     to use this package as a build-dependency (in Debian).
+   - Drop upstream url in long description now that it's in the Homepage
+     field (in Debian).
+
+ -- Mathias Gug <[e-mail]>  Mon, 01 Dec 2008 10:45:03 -0500
+
 open-iscsi (2.0.870~rc3-0.6) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -797,6 +2008,47 @@ open-iscsi (2.0.869~rc4-1) experimental; urgency=low
 
  -- Philipp Hug <[e-mail]>  Sat, 12 Apr 2008 15:53:12 +0200
 
+open-iscsi (2.0.865-1ubuntu5) jaunty; urgency=low
+
+  * Fix build failure with new glibc. LP: #299843.
+
+ -- Matthias Klose <[e-mail]>  Thu, 27 Nov 2008 15:58:15 +0100
+
+open-iscsi (2.0.865-1ubuntu4) intrepid; urgency=low
+
+  * Exit without error if /sys is not available. Otherwise, it's not possible
+    to use this package as a build-dependency.
+
+ -- Soren Hansen <[e-mail]>  Fri, 02 May 2008 00:57:02 +0200
+
+open-iscsi (2.0.865-1ubuntu3) hardy; urgency=low
+
+  * Migration of /usr/{bin,sbin,lib} -> to /{bin,sbin,lib}. 
+    (LP: #208441)
+  * Push the shutdown scripts back. (LP: #196748)
+  * Update control to 3.7.3.
+  * Updated the maintainer according to spec. 
+
+ -- Chuck Short <[e-mail]>  Wed, 09 Apr 2008 18:09:28 -0400
+
+open-iscsi (2.0.865-1ubuntu2) hardy; urgency=low
+
+  * Fixed init script to point to the right iscsiadm. (LP: #206520) 
+
+ -- Chuck Short <[e-mail]>  Tue, 25 Mar 2008 09:53:08 -0400
+
+open-iscsi (2.0.865-1ubuntu1) hardy; urgency=low
+
+  * Add open-iscsi-udeb.
+  * Include iscsi_discovery.
+  * De-bashify iscsi_discovery.
+  * Start open-iscsi in single user mode.
+  * Properly lsb-ify init script.
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Soren Hansen <[e-mail]>  Fri, 08 Feb 2008 11:56:11 +0100
+
 open-iscsi (2.0.865-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index a69ce2c..daf7950 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: open-iscsi
 Section: net
 Priority: optional
-Maintainer: Debian iSCSI Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian iSCSI Maintainers <[e-mail]>
 Uploaders: Ritesh Raj Sarraf <[e-mail]>,
            Christian Seiler <[e-mail]>,
            Chris Hofstaedtler <[e-mail]>
@@ -31,6 +32,7 @@ Depends: ${misc:Depends},
          ${shlibs:Depends},
          libopeniscsiusr,
          udev
+Recommends: ${busybox:Recommends}, finalrd (>= 3)
 Pre-Depends: debconf | debconf-2.0
 Description: iSCSI initiator tools
  The Open-iSCSI project is a high-performance, transport independent,
@@ -58,6 +60,8 @@ Package: libopeniscsiusr
 Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Replaces: libopeniscsiusr0.2.0 (<< 2.1.4-0ubuntu1~)
+Breaks: libopeniscsiusr0.2.0 (<< 2.1.4-0ubuntu1~)
 Enhances: open-iscsi
 Description: iSCSI userspace library
  The Open-iSCSI project is a high-performance, transport independent,
@@ -139,7 +143,7 @@ Package: open-iscsi-udeb
 #       linux kernel udebs) must exist for these architectures - so
 #       check that before adding them to this list; the other
 #       scsi-(core|common|...)-modules are NOT sufficient!
-Architecture: amd64 arm64 armhf i386 ia64 mips mipsel powerpc ppc64 ppc64el s390x
+Architecture: amd64 arm64 armhf ia64 mips mipsel powerpc ppc64 ppc64el s390x
 Section: debian-installer
 Package-Type: udeb
 Depends: ${misc:Depends},
@@ -150,3 +154,11 @@ Description: Configure iSCSI
  multi-platform implementation of RFC3720 iSCSI.
  .
  This is the minimal package (udeb) used by debian-installer.
+
+Package: libopeniscsiusr0.2.0
+Depends: libopeniscsiusr, ${misc:Depends}
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
diff --git a/debian/extra/initramfs.hook b/debian/extra/initramfs.hook
index 6a430eb..7458571 100755
--- a/debian/extra/initramfs.hook
+++ b/debian/extra/initramfs.hook
@@ -32,7 +32,7 @@ if [ -r /etc/iscsi/iscsi.initramfs ] ; then
 	cp /etc/iscsi/iscsi.initramfs $DESTDIR/etc
 fi
 
-for x in crc32c libcrc32c iscsi_tcp libiscsi scsi_transport_iscsi iscsi_ibft; do
+for x in crc32c libcrc32c ib_iser iscsi_tcp libiscsi scsi_transport_iscsi iscsi_ibft; do
 	manual_add_modules ${x}
 done
 for x in cxgb3i cxgb4i; do
diff --git a/debian/extra/initramfs.local-bottom b/debian/extra/initramfs.local-bottom
index c32e5fe..06ddc56 100755
--- a/debian/extra/initramfs.local-bottom
+++ b/debian/extra/initramfs.local-bottom
@@ -7,4 +7,24 @@ if [ -x /sbin/iscsiuio ] && [ -e /run/initramfs/iscsiuio.pid ] ; then
 		--name iscsiuio --exec /sbin/iscsiuio || :
 fi
 
+# Remove the interface file if no disks are present
+if [ -f /run/initramfs/open-iscsi.interface ] ; then
+	found=0
+	for disk in /dev/disk/by-path/*-iscsi-*; do
+		if [ ! -e "$disk" ] ; then
+			# If we have no matches, we stil go through the for loop once with
+			# the pattern as a string
+			continue
+		fi
+		if ! readlink -f "$disk" > /dev/null ; then
+			continue
+		fi
+		found=1
+		break;
+	done
+	if [ $found = 0 ] ; then
+		rm /run/initramfs/open-iscsi.interface
+	fi
+fi
+
 exit 0
diff --git a/debian/extra/initramfs.local-top b/debian/extra/initramfs.local-top
index 1045c50..9f3af32 100755
--- a/debian/extra/initramfs.local-top
+++ b/debian/extra/initramfs.local-top
@@ -93,6 +93,7 @@ do_iscsi_login ()
 	. /scripts/functions
 
 	udevadm settle
+	IBFT_DHCP_DEVICE=""
 
 	if [ -n "$ISCSI_AUTO" ] ; then
 		# try to auto-configure network interface based
@@ -136,7 +137,13 @@ do_iscsi_login ()
 					echo "UPTIME='${UPTIME}'"
 					echo "DHCPLEASETIME='${DHCPLEASETIME}'"
 					echo "DOMAINSEARCH=''"
-				} > "/run/net-${DEVICE}.conf"
+				} > "/run/net-${DEVICE}.conf.ibft"
+				if [ "$PROTO" != "dhcp" -a "$DHCPLEASETIME" = "0" ]; then
+					# this is static ibft configuration.
+					mv "/run/net-${DEVICE}.conf.ibft" "/run/net-${DEVICE}.conf"
+				else
+					IBFT_DHCP_DEVICE="$DEVICE"
+				fi
 				echo "${DEVICE}" > /run/initramfs/open-iscsi.interface
 				# iscsistart -N doesn't set the default gateway. Therefore,
 				# we need to add it ourselves. However, the ip command is
@@ -172,9 +179,23 @@ do_iscsi_login ()
 
 	# run configure_networking even if we have iscsi_auto, because there
 	# could be other network interfaces that need to be configured
-	# manually
+	# also, if we set up DHCP iBFT, we need ipconfig to run so it creates
+	# a proper /run/net-${DEVICE}.conf file that includes the DNS search
+	# domain, which we don't get in our iBFT data (see LP: #1806777)
 	configure_networking
 
+	if [ -n "$IBFT_DHCP_DEVICE" ]; then
+		if ! [ -e "/run/net-${DEVICE}.conf" ] ; then
+			echo "WARN: ipconfig dhcp failed, using iSCSI iBFT config - DNS search domain may be missing at runtime" >&2
+			# We have DHCP iBFT, but ipconfig DHCP failed;
+			# so we should fallback to just using the iBFT config,
+			# though that will not include the DNS search domain
+			mv "/run/net-${DEVICE}.conf.ibft" "/run/net-${DEVICE}.conf"
+			# need to re-run configure_networking to process conf file
+			configure_networking
+		fi
+	fi
+
 	# Save network device we configured via configure_networking, but only
 	# if we didn't already get one from autoconfiguration (then we always
 	# prefer that).
@@ -186,6 +207,13 @@ do_iscsi_login ()
 		fi
 		if [ -n "${DEVICE}" ] ; then
 			echo "${DEVICE}" > /run/initramfs/open-iscsi.interface
+                else
+			for i in /run/net6-*.conf; do
+				[ -e "${i}" ] && { . "${i}" ; break ; }
+			done
+		fi
+		if [ -z "${DEVICE}" ] && [ -n "${DEVICE6}" ] ; then
+			echo "${DEVICE6}" > /run/initramfs/open-iscsi.interface
 		fi
 	fi
 
diff --git a/debian/extra/net-interface-handler b/debian/extra/net-interface-handler
 new file mode 100755
index 0000000..9cd6e1e
--- /dev/null
+++ b/debian/extra/net-interface-handler
@@ -0,0 +1,80 @@
+#!/bin/sh -e
+# suppress configuration of network interface used
+# by iSCSI root device
+#
+# If the root filesystem is on iSCSI, then we must take care to avoid
+# changing the state of its network interface. To this end, the initramfs
+# leaves a note for us which interface was used, and we mangle
+# /run/network/ifstate manually to stop it being brought up or down
+# automatically. This is a slight layering violation, but, unfortunately,
+# 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
+
+    [ -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
+
+        if [ -f /run/net-$iface.conf ]; then
+            conf=/run/net-$iface.conf
+        elif [ -f /run/net6-$iface.conf ]; then
+            conf=/run/net6-$iface.conf
+        else
+            conf=""
+        fi
+        if command -v resolvconf >/dev/null &&
+           [ -n "$conf" ]; then
+            . "$conf"
+            R=""
+            [ -n "$DOMAINSEARCH" ] && R="$R${CR}search $DOMAINSEARCH"
+            [ -n "$IPV6DOMAINSEARCH" ] && R="$R${CR}search $IPV6DOMAINSEARCH"
+            for ns in "$IPV4DNS0" "$IPV4DNS1" "$IPV6DNS0" "$IPV6DNS1"; do
+                [ -n "$ns" -a "$ns" != "0.0.0.0" ] && R="$R${CR}nameserver $ns"
+            done
+            if [ -n "$R" ]; then
+                # create the dir in case resolvconf did not start yet
+                mkdir -p /run/resolvconf/interface
+                resolvconf -a $iface.iscsi-network <<EOF
+${R#${CR}}
+EOF
+            fi
+        fi
+    fi
+}
+
+stop() {
+    assert_interface || return
+    ifile=/run/initramfs/open-iscsi.interface
+    [ -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
+
+        if command -v resolvconf >/dev/null; then
+            resolvconf -d $iface.iscsi-network
+        fi
+    fi
+}
+
+case "$1" in
+    start) start ;;
+    stop) stop ;;
+    *) echo "ERROR: must be called with 'start' or 'stop'" >&2; exit 1 ;;
+esac
diff --git a/debian/extra/startup-checks.sh b/debian/extra/startup-checks.sh
index a369785..a7c3ecd 100755
--- a/debian/extra/startup-checks.sh
+++ b/debian/extra/startup-checks.sh
@@ -33,7 +33,7 @@ if grep -q "^GenerateName=yes" $NAMEFILE ; then
 		exit 1
 	fi
 	# Generate a unique InitiatorName and save it
-	INAME=`/sbin/iscsi-iname -p iqn.1993-08.org.debian:01`
+	INAME=`/sbin/iscsi-iname -p iqn.2004-10.com.ubuntu:01`
 	if [ "$INAME" != "" ] ; then
 		echo "## DO NOT EDIT OR REMOVE THIS FILE!" > $NAMEFILE
 		echo "## If you remove this file, the iSCSI daemon will not start." >> $NAMEFILE
diff --git a/debian/iscsi-network-interface.rules b/debian/iscsi-network-interface.rules
 new file mode 100644
index 0000000..e0408d7
--- /dev/null
+++ b/debian/iscsi-network-interface.rules
@@ -0,0 +1,3 @@
+# run before 80-networking.rules to run before ifupdown
+SUBSYSTEM=="net", ACTION=="add", RUN+="/lib/open-iscsi/net-interface-handler start"
+SUBSYSTEM=="net", ACTION=="remove", RUN+="/lib/open-iscsi/net-interface-handler stop"
diff --git a/debian/iscsid.service b/debian/iscsid.service
index d05953d..c98fd7e 100644
--- a/debian/iscsid.service
+++ b/debian/iscsid.service
@@ -7,13 +7,13 @@ After=network.target network-online.target
 DefaultDependencies=no
 Conflicts=shutdown.target
 Before=shutdown.target
+ConditionVirtualization=!private-users
 
 [Service]
 Type=forking
 PIDFile=/run/iscsid.pid
 ExecStartPre=/lib/open-iscsi/startup-checks.sh
 ExecStart=/sbin/iscsid
-ExecStop=/sbin/iscsiadm -k 0 2
 
 [Install]
 WantedBy=sysinit.target
diff --git a/debian/open-iscsi-udeb.start b/debian/open-iscsi-udeb.start
index beea0ae..127b7bf 100644
--- a/debian/open-iscsi-udeb.start
+++ b/debian/open-iscsi-udeb.start
@@ -6,7 +6,7 @@
 
 if ! [ -f /etc/iscsi/initiatorname.iscsi ]; then
 	# Generate a unique InitiatorName and save it
-	INAME=`iscsi-iname -p iqn.1993-08.org.debian:01`
+	INAME=`iscsi-iname -p iqn.2004-10.com.ubuntu:01`
 	echo "## DO NOT EDIT OR REMOVE THIS FILE!" > /etc/iscsi/initiatorname.iscsi
 	echo "## If you remove this file, the iSCSI daemon will not start." >> /etc/iscsi/initiatorname.iscsi
 	echo "## If you change the InitiatorName, existing access control lists" >> /etc/iscsi/initiatorname.iscsi
diff --git a/debian/open-iscsi.finalrd b/debian/open-iscsi.finalrd
 new file mode 100755
index 0000000..d0f4352
--- /dev/null
+++ b/debian/open-iscsi.finalrd
@@ -0,0 +1,47 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-only
+
+set -e
+
+if [ "$1" = "setup" ]
+then
+    . /usr/share/initramfs-tools/hook-functions
+    copy_exec /bin/grep
+    copy_exec /bin/sleep
+    copy_exec /sbin/iscsiadm
+    copy_exec /sbin/iscsid
+    # hm, not sure why expr is copied
+    copy_exec /usr/bin/expr
+    copy_file config /etc/iscsi/iscsid.conf
+    copy_file config /etc/iscsi/initiatorname.iscsi
+    # needed to resolve UIDs (LP: #1922976)
+    copy_exec /usr/lib/*/libnss_files.so.*
+    exit 0
+fi
+
+# if not present in the environment, then fake a trivial passwd file (LP: #1922976)
+if [ ! -e /etc/passwd ] ; then
+    echo "root:x:0:0:root:/:/bin/sh" > /etc/passwd
+fi
+
+# re-establish connection and logout during shutdown
+# if initramfs did bring up open-iscsi on boot
+[ -f /open-iscsi.interface ] || exit 0
+
+iscsid
+
+# After restarting iscsid, wait for an active connection.
+# Limit the wait time in case of unexpected failure of iscsid.
+MAX_RETRIES=30
+RETRY=0
+while ! iscsiadm -m session -P 1 | grep -q "iSCSI Connection State: LOGGED IN"; do
+    RETRY=$(($RETRY + 1))
+    if [ $RETRY -gt $MAX_RETRIES ]; then
+        echo "Unexpected iSCSI Connection State, forcing iSCSI logout."
+        break
+    fi
+    sleep 1
+done
+
+# Issue an iSCSI logout.
+iscsiadm -m node -u
diff --git a/debian/open-iscsi.kmod b/debian/open-iscsi.kmod
 deleted file mode 100644
index c5f90f3..0000000
--- a/debian/open-iscsi.kmod
+++ /dev/null
@@ -1,2 +0,0 @@
-iscsi_tcp
-ib_iser
diff --git a/debian/open-iscsi.postinst b/debian/open-iscsi.postinst
index f9867d4..ccc8ed7 100644
--- a/debian/open-iscsi.postinst
+++ b/debian/open-iscsi.postinst
@@ -17,16 +17,6 @@ restore_old_timeouts()
 case "$1" in
     configure)
 
-        # We switched over to modules-load.d logic, this is needed
-        MODULES_FILE=/lib/modules-load.d/open-iscsi.conf
-        if [ -f /etc/modules-load.d/open-iscsi.conf ] ; then
-            MODULES_FILE=/etc/modules-load.d/open-iscsi.conf
-        fi
-        grep '^[^#]' $MODULES_FILE | while read module args ; do
-            [ "$module" ] || continue
-            modprobe $module $args >/dev/null 2>&1 || true
-        done
-
         # Compatibility symlinks
         for file in iscsid iscsi_discovery iscsi-iname iscsistart; do
             if [ ! -e /usr/sbin/$file ]; then
@@ -37,7 +27,7 @@ case "$1" in
         # Generate a unique iSCSI InitiatorName
         NAMEFILE=/etc/iscsi/initiatorname.iscsi
         if [ ! -e $NAMEFILE ] && [ -z "$2" ] ; then
-            INAME=$(iscsi-iname -p iqn.1993-08.org.debian:01)
+            INAME=$(iscsi-iname -p iqn.2004-10.com.ubuntu:01)
             if [ -n "$INAME" ] ; then
                 echo "## DO NOT EDIT OR REMOVE THIS FILE!" > $NAMEFILE
                 echo "## If you remove this file, the iSCSI daemon will not start." >> $NAMEFILE
@@ -65,7 +55,9 @@ esac
 
 #DEBHELPER#
 
-if [ "$1" = configure ] ; then
+if [ "$1" = configure ] && [ -n "$2" ] && [ -d /run/systemd/system ] &&
+    systemctl is-active iscsid.service > /dev/null
+then
     # There already is a check in preinst with a debconf prompt that
     # allows the administrator to abort. Don't abort here, because
     # leaving the package in a half-configured state is probably worse.
@@ -109,25 +101,9 @@ if [ "$1" = configure ] ; then
     # Just in case something goes wrong:
     sync
 
-    # Note: 3>&- is required because iscsid doesn't close unused
-    #       FDs, but debconf/confmodule will make the fd 3 point to
-    #       the original stdout (and stdout to stderr) to make sure
-    #       no program accidentally issues a command on stdout. On
-    #       sysvinit systems this combination (iscsid not closing
-    #       fds, fd 3 remaining open) will cause dpkg to wait
-    #       forever for the maintscript to finish. (iscsid keeps
-    #       this end of the pipe open even though the maintscript
-    #       is finished, so dpkg will never receive a POLLHUP on
-    #       its end of the pipe, waiting forever.) Closing fd 3
-    #       here is the simplest solution. This issue does not
-    #       occur with other init systems, since they start
-    #       services in a clean environment without any extraneous
-    #       open fds.
-    if [ -n "$2" ]; then
-        invoke-rc.d iscsid restart 3>&-
-    else
-        invoke-rc.d iscsid start 3>&-
-    fi
+    # we want to be able to be explicit to start .service, but follow policy.d
+    # therefore use deb-systemd-invoke
+    deb-systemd-invoke restart iscsid.service || true
 
     RETRIES=0
     while cat /sys/class/iscsi_session/session*/state 2>/dev/null | grep -qv LOGGED_IN ; do
@@ -149,17 +125,26 @@ if [ "$1" = configure ] ; then
 
     restore_old_timeouts
     trap - EXIT
+fi
 
-    # Don't restart (and therefore stop) open-iscsi, because we don't
-    # want to logout from targets during a simple upgrade. But also,
-    # if for some reason there's some misconfigured target in the
-    # config that couldn't be activated, don't break postinst, so
-    # ignore the exit code.
-    # See above for why 3>&- is here. (Technically it's not required
-    # for postinst to work, but vgchange likes to complain about leaked
-    # file descriptors, and we don't need to show that message to the
-    # user.)
-    invoke-rc.d open-iscsi start 3>&- || true
+if [ "$1" = configure ]; then
+    # With socket based activation one wants iscsid.socket to be active
+    # But on upgrades the iscsid.service might already be active
+    # Due to that directly starting iscsid.socket might fail:
+    #   systemd[1]: iscsid.socket: Socket service iscsid.service already active, refusing.
+    # Therefore check if iscsid.service is:
+    # - active:
+    #    - ok for now, do not start iscsid.socket as it would conflict
+    #    - on a reboot .socket will be started as it is enabled
+    # - inactive:
+    #    - start iscsid.socket - to be ready
+    # In both cases:
+    #    - disable iscsid.service so it only starts by the socket after reboot
+    if [ -d /run/systemd/system ]; then
+        if ! systemctl is-active iscsid.service > /dev/null; then
+            deb-systemd-invoke start iscsid.socket || true
+        fi
+    fi
 fi
 
 exit 0
diff --git a/debian/open-iscsi.service b/debian/open-iscsi.service
index a62825e..06f83fe 100644
--- a/debian/open-iscsi.service
+++ b/debian/open-iscsi.service
@@ -1,12 +1,16 @@
 [Unit]
 Description=Login to default iSCSI targets
 Documentation=man:iscsiadm(8) man:iscsid(8)
-Wants=network-online.target remote-fs-pre.target iscsid.service
+Wants=network-online.target remote-fs-pre.target
 After=network-online.target iscsid.service
 Before=remote-fs-pre.target
 DefaultDependencies=no
 Conflicts=shutdown.target
 Before=shutdown.target
+# Must have some pre-defined targets to login to
+ConditionDirectoryNotEmpty=|/etc/iscsi/nodes
+# or have a session to use via iscsid
+ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
 
 [Service]
 Type=oneshot
@@ -15,11 +19,7 @@ RemainAfterExit=true
 # and 15 if a session is alread logged in (which we do not
 # consider an error)
 SuccessExitStatus=15 21
-# iscsiadm will only work if iscsid is running. But we can't use a
-# Requires= dependency, since restarts of iscsid would then be
-# propagated to this service - and that would cause all sorts of
-# mayhem. Therefore, check it in ExecStartPre.
-ExecStartPre=/bin/systemctl --quiet is-active iscsid.service
+# Note: iscsid will be socket activated by iscsiadm
 ExecStart=/sbin/iscsiadm -m node --loginall=automatic
 ExecStart=/lib/open-iscsi/activate-storage.sh
 ExecStop=/lib/open-iscsi/umountiscsi.sh
diff --git a/debian/patches/lp1755858-default-iscsid_conf-to-iscsid_socket.patch b/debian/patches/lp1755858-default-iscsid_conf-to-iscsid_socket.patch
 new file mode 100644
index 0000000..d587922
--- /dev/null
+++ b/debian/patches/lp1755858-default-iscsid_conf-to-iscsid_socket.patch
@@ -0,0 +1,25 @@
+Description: default in iscid.conf to use iscsid.socket
+
+People do not want iscsid to run if not needed.
+To do so it is configured to be socket activated.
+Internally iscsid code has a fallback if the service is missing to run the
+command specified in iscsid.conf as "iscsid.startup".
+Set this to ensure the socket is active instead of calling the binary, which
+would not be what we want anyway as it would not be from the .service context.
+
+Forwarded: no (Downstream config)
+Author: Christian Ehrhardt <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1755858
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-08-13
+
+--- a/etc/iscsid.conf
++++ b/etc/iscsid.conf
+@@ -20,6 +20,7 @@
+ #
+ # Default for Fedora and RHEL. (uncomment to activate).
+ # iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
++iscsid.startup = /bin/systemctl start iscsid.socket
+ #
+ # Default if you are not using systemd (uncomment to activate)
+ # iscsid.startup = /usr/bin/service start iscsid
diff --git a/debian/patches/series b/debian/patches/series
index 8585afd..909a8f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-upstream/0001-iscsiadm-Fix-memory-leak-in-iscsiadm.patch
-upstream/0002-Fix-iscsiadm-segfault-when-exiting.patch
-upstream/0003-Fix-iscsistart-login-issue-when-target-is-delayed.patch
+lp1755858-default-iscsid_conf-to-iscsid_socket.patch
diff --git a/debian/patches/upstream/0001-iscsiadm-Fix-memory-leak-in-iscsiadm.patch b/debian/patches/upstream/0001-iscsiadm-Fix-memory-leak-in-iscsiadm.patch
 deleted file mode 100644
index dda9a00..0000000
--- a/debian/patches/upstream/0001-iscsiadm-Fix-memory-leak-in-iscsiadm.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From: Wenchao Hao <[e-mail]>
-Date: Tue, 29 Dec 2020 20:30:25 +0800
-Subject: iscsiadm: Fix memory leak in iscsiadm
-
-Memory allocated by iscsi_context_new() would not be freed if
-error occurred during parameters parser stage and goto free_ifaces
-is used to jump to resource clean.
-
-Since all resource clean is performed after verified, so change
-all goto free_ifaces to goto out where handles resource better.
-
-Signed-off-by: Wenchao Hao <[e-mail]>
----
- libopeniscsiusr/context.c |  6 +++++-
- usr/iscsiadm.c            | 27 +++++++++++++--------------
- 2 files changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/libopeniscsiusr/context.c b/libopeniscsiusr/context.c
-index fe92155..c5e869f 100644
---- a/libopeniscsiusr/context.c
-+++ b/libopeniscsiusr/context.c
-@@ -55,8 +55,12 @@ struct iscsi_context *iscsi_context_new(void)
- 
- void iscsi_context_free(struct iscsi_context *ctx)
- {
--	if (ctx != NULL)
-+	if (ctx == NULL)
-+		return;
-+
-+	if (ctx->db)
- 		_idbm_free(ctx->db);
-+
- 	free(ctx);
- }
- 
-diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
-index ea1643b..3987168 100644
---- a/usr/iscsiadm.c
-+++ b/usr/iscsiadm.c
-@@ -3627,7 +3627,7 @@ main(int argc, char **argv)
- 					  "Priority must be greater than or "
- 					  "equal to zero.", killiscsid);
- 				rc = ISCSI_ERR_INVAL;
--				goto free_ifaces;
-+				goto out;
- 			}
- 			break;
- 		case 't':
-@@ -3639,7 +3639,7 @@ main(int argc, char **argv)
- 				log_error("can not recognize operation: '%s'",
- 					optarg);
- 				rc = ISCSI_ERR_INVAL;
--				goto free_ifaces;
-+				goto out;
- 			}
- 			break;
- 		case 'n':
-@@ -3651,7 +3651,7 @@ main(int argc, char **argv)
- 		case 'H':
- 			host_no = parse_host_info(optarg, &rc);
- 			if (rc)
--				goto free_ifaces;
-+				goto out;
- 			break;
- 		case 'r':
- 			sid = iscsi_sysfs_get_sid_from_path(optarg);
-@@ -3659,7 +3659,7 @@ main(int argc, char **argv)
- 				log_error("invalid sid '%s'",
- 					  optarg);
- 				rc = ISCSI_ERR_INVAL;
--				goto free_ifaces;
-+				goto out;
- 			}
- 			break;
- 		case 'R':
-@@ -3710,7 +3710,7 @@ main(int argc, char **argv)
- 			mode = str_to_mode(optarg);
- 			rc = verify_mode_params(argc, argv, mode);
- 			if (ISCSI_SUCCESS != rc)
--				goto free_ifaces;
-+				goto out;
- 			break;
- 		case 'C':
- 			sub_mode = str_to_submode(optarg);
-@@ -3739,11 +3739,11 @@ main(int argc, char **argv)
- 				printf("Invalid iface name %s. Must be from "
- 					"1 to %d characters.\n",
- 					optarg, ISCSI_MAX_IFACE_LEN - 1);
--				goto free_ifaces;
-+				goto out;
- 			} else if (!iface || rc) {
- 				printf("Could not add iface %s.", optarg);
- 				rc = ISCSI_ERR_INVAL;
--				goto free_ifaces;
-+				goto out;
- 			}
- 
- 			list_add_tail(&iface->list, &ifaces);
-@@ -3760,7 +3760,7 @@ main(int argc, char **argv)
- 				log_error("Invalid index %s. %s.",
- 					  optarg, strerror(errno));
- 				rc = ISCSI_ERR_INVAL;
--				goto free_ifaces;
-+				goto out;
- 			}
- 			break;
- 		case 'A':
-@@ -3778,7 +3778,7 @@ main(int argc, char **argv)
- 			if (!param) {
- 				log_error("Cannot allocate memory for params.");
- 				rc = ISCSI_ERR_NOMEM;
--				goto free_ifaces;
-+				goto out;
- 			}
- 			list_add_tail(&param->list, &params);
- 			name = NULL;
-@@ -3789,12 +3789,12 @@ main(int argc, char **argv)
- 	if (optopt) {
- 		log_error("unrecognized character '%c'", optopt);
- 		rc = ISCSI_ERR_INVAL;
--		goto free_ifaces;
-+		goto out;
- 	}
- 
- 	if (killiscsid >= 0) {
- 		kill_iscsid(killiscsid, timeout);
--		goto free_ifaces;
-+		goto out;
- 	}
- 
- 	if (mode < 0)
-@@ -3802,14 +3802,14 @@ main(int argc, char **argv)
- 
- 	if (mode == MODE_FW) {
- 		rc = exec_fw_op(NULL, NULL, info_level, do_login, op);
--		goto free_ifaces;
-+		goto out;
- 	}
- 
- 	increase_max_files();
- 	if (idbm_init(get_config_file)) {
- 		log_warning("exiting due to idbm configuration error");
- 		rc = ISCSI_ERR_IDBM;
--		goto free_ifaces;
-+		goto out;
- 	}
- 
- 	switch (mode) {
-@@ -4070,7 +4070,6 @@ out:
- 		free(rec);
- 	iscsi_sessions_free(ses, se_count);
- 	idbm_terminate();
--free_ifaces:
- 	list_for_each_entry_safe(iface, tmp, &ifaces, list) {
- 		list_del(&iface->list);
- 		free(iface);
diff --git a/debian/patches/upstream/0002-Fix-iscsiadm-segfault-when-exiting.patch b/debian/patches/upstream/0002-Fix-iscsiadm-segfault-when-exiting.patch
 deleted file mode 100644
index 183bdaa..0000000
--- a/debian/patches/upstream/0002-Fix-iscsiadm-segfault-when-exiting.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Lee Duncan <[e-mail]>
-Date: Tue, 26 Jan 2021 11:48:32 -0800
-Subject: Fix iscsiadm segfault when exiting
-
-Commit b532ad67d495d added some cleanup code
-to iscsiadm right before it exits, but it
-used a list_for_each_entry() to iterate through
-a list was being deleted, when it should use
-list_for_each_entry_safe().
-
-Fixes: b532ad67d495d
----
- usr/iscsiadm.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
-index 3987168..bb6821d 100644
---- a/usr/iscsiadm.c
-+++ b/usr/iscsiadm.c
-@@ -3582,11 +3582,11 @@ main(int argc, char **argv)
- 	struct sigaction sa_old;
- 	struct sigaction sa_new;
- 	LIST_HEAD(ifaces);
--	struct iface_rec *iface = NULL, *tmp;
-+	struct iface_rec *iface = NULL, *tmp_iface;
- 	struct node_rec *rec = NULL;
- 	uint32_t host_no =  MAX_HOST_NO + 1;
- 	uint64_t index = ULLONG_MAX;
--	struct user_param *param;
-+	struct user_param *param, *tmp_param;
- 	LIST_HEAD(params);
- 	struct iscsi_context *ctx = NULL;
- 	int librc = LIBISCSI_OK;
-@@ -4070,11 +4070,11 @@ out:
- 		free(rec);
- 	iscsi_sessions_free(ses, se_count);
- 	idbm_terminate();
--	list_for_each_entry_safe(iface, tmp, &ifaces, list) {
-+	list_for_each_entry_safe(iface, tmp_iface, &ifaces, list) {
- 		list_del(&iface->list);
- 		free(iface);
- 	}
--	list_for_each_entry(param, &params, list) {
-+	list_for_each_entry_safe(param, tmp_param, &params, list) {
- 		list_del(&param->list);
- 		idbm_free_user_param(param);
- 	}
diff --git a/debian/patches/upstream/0003-Fix-iscsistart-login-issue-when-target-is-delayed.patch b/debian/patches/upstream/0003-Fix-iscsistart-login-issue-when-target-is-delayed.patch
 deleted file mode 100644
index 6602f3a..0000000
--- a/debian/patches/upstream/0003-Fix-iscsistart-login-issue-when-target-is-delayed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Lee Duncan <[e-mail]>
-Date: Thu, 4 Feb 2021 11:45:00 -0800
-Subject: Fix iscsistart login issue when target is delayed.
-
-Earlier commit 9258c8eae046 changed the return value fron
-iscsid_response() from ISCSI_ERR_ISCSID_NOTCONN to
-ISCSI_ERR_SESSION_NOT_CONNECTED in the case where no iscsi response is
-received when expected.
-
-This effected the login code in iscsistart when the target is not
-completely ready at iscsi login time. This commit updates iscsistart
-to expect the new error code, but fixing this uncovered another issue,
-causing iscsistart logins to continue to fail if the target returned its
-login response too slowly.
-
-This commit ups the timeout time for iscsistart logins from 1 second per
-try to 10 seconds per try. This is perhaps excessive, and a shorter
-delay would be more appropriate, but the retry/nanosleep logic in
-iscsistart meant to retry the login in such cases seems problematic in
-this case, since retrying the 2nd time returns "session already exists",
-and most iscsistart clients aren't prepared for the command to return a
-non-zero return value.
----
- usr/iscsistart.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/usr/iscsistart.c b/usr/iscsistart.c
-index 73991b3..755489f 100644
---- a/usr/iscsistart.c
-+++ b/usr/iscsistart.c
-@@ -241,12 +241,25 @@ static int login_session(struct node_rec *rec)
- 	/*
- 	 * Need to handle race where iscsid proc is starting up while we are
- 	 * trying to connect. Retry with exponential backoff, start from 50 ms.
-+	 *
-+	 * NOTE: another race condition can occur if the system is just coming
-+	 * up, where our login request will be sent, but the login response
-+	 * takes a while. In such a case, if we timeout and give up, the
-+	 * login response may still show up once we give up, in which case
-+	 * it seems to get iscsistart into a state where it cannot try to
-+	 * login again because it thinks there's already a session. So make
-+	 * sure our timeout is long enough, on each try, to give the response
-+	 * a chance to show up. The old value of 1 second was not enough,
-+	 * so we multiply that by 10, which seems reasonable for initial
-+	 * login.
- 	 */
- 	for (msec = 50; msec <= 15000; msec <<= 1) {
--		rc = iscsid_exec_req(&req, &rsp, 0, ISCSID_REQ_TIMEOUT);
-+		int tmo = ISCSID_REQ_TIMEOUT * 10;
-+
-+		rc = iscsid_exec_req(&req, &rsp, 0, tmo);
- 		if (rc == 0) {
- 			return rc;
--		} else if (rc == ISCSI_ERR_ISCSID_NOTCONN) {
-+		} else if (rc == ISCSI_ERR_SESSION_NOT_CONNECTED) {
- 			ts.tv_sec = msec / 1000;
- 			ts.tv_nsec = (msec % 1000) * 1000000L;
- 
diff --git a/debian/rules b/debian/rules
index 2451953..7eac4a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,10 @@ export KBUILD_BUILD_TIMESTAMP = @$(SOURCE_DATE_EPOCH)
 
 UDEB := $(filter open-iscsi-udeb,$(shell dh_listpackages))
 
+# Fix gcc10 warnings as errors while upstream doesn't catch up
+export DEB_CFLAGS_PREPEND=-Wno-error=zero-length-bounds -Wno-error=format-overflow= -Wno-error=format-truncation= -Wno-error=maybe-uninitialized
+export DEB_CXXFLAGS_PREPEND=${DEB_CFLAGS_PREPEND}
+
 %:
 	dh $@
 
@@ -43,6 +47,9 @@ override_dh_auto_install:
 	dh_install -p open-iscsi debian/extra/logout-all.sh lib/open-iscsi/
 	dh_install -p open-iscsi debian/extra/startup-checks.sh lib/open-iscsi/
 	dh_install -p open-iscsi debian/extra/activate-storage.sh lib/open-iscsi/
+	dh_install -p open-iscsi debian/extra/net-interface-handler lib/open-iscsi/
+	dh_install -p open-iscsi debian/open-iscsi.finalrd usr/share/finalrd/
+	dh_install -p open-iscsi etc/systemd/iscsid.socket lib/systemd/system/
 	mkdir -p debian/open-iscsi/usr/bin
 	ln -s /sbin/iscsiadm debian/open-iscsi/usr/bin/iscsiadm
 	mkdir -p debian/open-iscsi/usr/share/initramfs-tools/hooks
@@ -51,10 +58,9 @@ override_dh_auto_install:
 	cp -p debian/extra/initramfs.hook debian/open-iscsi/usr/share/initramfs-tools/hooks/iscsi
 	cp -p debian/extra/initramfs.local-top debian/open-iscsi/usr/share/initramfs-tools/scripts/local-top/iscsi
 	cp -p debian/extra/initramfs.local-bottom debian/open-iscsi/usr/share/initramfs-tools/scripts/local-bottom/iscsi
-	mkdir -p debian/open-iscsi/lib/modules-load.d/
-	cp -p debian/open-iscsi.kmod debian/open-iscsi/lib/modules-load.d/open-iscsi.conf
 	mkdir -p debian/open-iscsi/lib/udev/rules.d/
 	cp -p debian/open-iscsi.rules debian/open-iscsi/lib/udev/rules.d/70-open-iscsi.rules
+	cp -p debian/iscsi-network-interface.rules debian/open-iscsi/lib/udev/rules.d/70-iscsi-network-interface.rules
 
 	@# iscsiuio
 	dh_install -p iscsiuio iscsiuio/src/unix/iscsiuio /sbin
@@ -77,17 +83,19 @@ ifneq ($(UDEB),)
 endif
 
 override_dh_installinit:
-	dh_installinit -p open-iscsi --name=iscsid
-	dh_installinit -p open-iscsi
-	dh_installinit -p iscsiuio
+	dh_installinit -p open-iscsi --no-start --no-enable --no-stop-on-upgrade --name=iscsid
+	dh_installinit -p open-iscsi --no-start --no-enable --no-stop-on-upgrade
+	dh_installinit -p iscsiuio --no-start --no-enable --no-stop-on-upgrade
 
 override_dh_systemd_enable:
-	dh_systemd_enable -p open-iscsi --name=iscsid
-	dh_systemd_enable -p open-iscsi
+	dh_systemd_enable -p open-iscsi --name=iscsid --no-enable iscsid.service
+	dh_systemd_enable -p open-iscsi --name=iscsid iscsid.socket
+	dh_systemd_enable -p open-iscsi open-iscsi.service
 	dh_systemd_enable -p iscsiuio
 
 override_dh_systemd_start:
-	dh_systemd_start -p open-iscsi --no-restart-on-upgrade iscsid.service open-iscsi.service
+	dh_systemd_start -p open-iscsi --no-restart-on-upgrade iscsid.socket
+	dh_systemd_start -p open-iscsi --no-restart-on-upgrade open-iscsi.service
 	dh_systemd_start -p iscsiuio --no-restart-on-upgrade iscsiuio.service
 
 override_dh_installman:
@@ -110,3 +118,14 @@ ifneq ($(UDEB),)
 else
 	dh_makeshlibs
 endif
+
+# The following is taken from the initramfs-tools package. (We recommend
+# busybox in the initramfs because otherwise we don't have access to the
+# ip utility to set the default gateway after iscsistart -N is done.)
+# On Debian we can use either busybox or busybox-static, but on Ubuntu
+# and derivatives only busybox-initramfs will work.
+BUSYBOX_PACKAGES := $(shell if dpkg-vendor --derives-from ubuntu; then echo busybox-initramfs; else echo busybox busybox-static; fi)
+
+override_dh_gencontrol:
+	echo >> debian/open-iscsi.substvars "busybox:Recommends=$(wordlist 2,100,$(BUSYBOX_PACKAGES:%=| %))"
+	dh_gencontrol
diff --git a/debian/tests/README-boot-test.md b/debian/tests/README-boot-test.md
 new file mode 100644
index 0000000..e45bbf0
--- /dev/null
+++ b/debian/tests/README-boot-test.md
@@ -0,0 +1,139 @@
+## open-iscsi boot test
+The purpose of this test (`CloudImageTest`) is to test the boot of a system
+using an iscsi root target.  In order to accomplish that, the tests does
+
+  1. Download Ubuntu cloud image
+  2. installs the open-iscsi deb inside
+  3. collect kernel and initramfs from inside
+  4. register the image as a read-only iscsi target served by tgt
+  5. boot kernel and initramfs with a command line to use the image as root.
+     And additionally attach a local disk for collecting output.
+  6. provide user-data that executes commands, colects files and writes them
+     to the output disk and then shuts the system down.
+  7. extract the collected files from the output disk and inspect them.
+
+The `CloudImageTest` uses qemu user networking.
+
+
+## Caveats
+
+  1. It depends on a cloud-image being present.
+
+     Cloud-images are often not available for the first few weeks of a cycle.
+     If no cloud-image of 'REL' is available, then boot-test will skip.
+     If 'REL' is not known in distro-info-data, then test will fail.
+
+     This means that uploads of open-iscsi (or its dependencies) will not
+     be properly tested until a cloud-image is available, and will fail
+     until distro-info-data is uploaded.
+
+  2. Installation of large packages via patch-image may fail.
+     An ubuntu image downloaded has only a small amount of extra space.
+     Installation of a new kernel into the target would probably fail.
+
+     If this becomes a problem, we could grow the disk like done at
+       https://gist.github.com/smoser/6a048a0e2795b48221fc44962202fa14
+
+
+### testing manually ###
+The test case in `debian/tests/test-open-iscsi.py` uses some helper tools.
+
+  * **patch-image**: this is used to install packages into the pristine image
+     and collect the kernel and initramfs out of the image.  This allows us to
+     test the portions of open-iscsi that update the initramfs.  Without
+     using the updated initramfs we wouldn't really be testing the new
+     open-iscsi.
+
+     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.
+
+     It installs packages into the target by copying the host system's
+     /etc/apt content in, and also includes copying local (file://) apt
+     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.
+
+  * **tgt-boot-test**: this registers an image in tgt locally, and then boots
+     kernel and initramfs to mount that.  It knows how to build iscsi kernel
+     command lines.
+
+     By default, the xkvm process that is started will be allowed `60m` to
+     complete.  This can be adjusted by setting `BOOT_TIMEOUT` in the
+     environment.
+
+  * **xkvm**: this is a helper/wrapper around qemu.  It is taken from the curtin
+     projects tools/ directory.  It allows some simplified command lines, and
+     most usefully, the '--netdev=<bridge>' argument will create a tun/tap
+     device and attach it to the bridge.
+
+     If the host system is not bare metal, kvm will not be
+     enabled in the guest that is lauched.  To force use of kvm, set
+     _USE_KVM=1 in the environment.  See 'should_try_kvm' in xkvm for details.
+
+Testing manually looks like this:
+
+    ## set up path to include debian/tests directory.
+    $ PATH=$PWD/debian/tests:$PATH
+
+    ## 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.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)
+    $ 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.d/disk.img xenial.d/kernel xenial.d/initrd
+
+
+### Features of tgt-boot-test ###
+
+tgt-boot-test does a number of useful things.
+
+ * determines the host address that the guest will use.
+   This should support ipv6 and ipv4 addresses on bridges, and
+   knows values that qemu's user networking uses.  Flags passed to `--netdev`
+   are read intelligently.  This can be overriden with `--host-addr`, but
+   it does a good job of determining what the right values are.
+
+ * provides a nocloud metadata service with a python web server that
+   supports ipv4 and ipv6.
+
+ * provides the ability to provide additional kernel command line options
+   or to provide a 'template' that references variables it knows such as
+   {iserver} (iscsi server) or {seed_url}.
+
+ * Sets ubuntu (passw0rd) and root password (root) and imports users
+   ssh keys to the ubuntu user.
+
+One thing to note is that yakkety's version of qemu does not run an ipv6
+dhcp server on its user-network, so a stateful dhclient request will not
+work.
+
+In order to create a bridge easily with a ipv6 dhcp server, you can use
+lxd at sufficent version (https://github.com/lxc/lxd/issues/2481).
+Assuming that bug is fixed, to create an ipv6 only bridge:
+
+    $ netname="ipv6-only"
+    $ lxc network create $netname
+    $ lxc network unset $netname ipv4.address
+    $ lxc network unset $netname ipv4.nat
+    $ lxc network set $netname ipv6.dhcp.stateful true
+
+Then, you can use tgt-boot-test with that:
+
+    $ PATH=$PWD/debian/tests:$PATH
+    $ ./debian/tests/tgt-boot-test -vv --netdev=ipv6-only \
+       --cmdline-ip="ip=off ip6=dhcp" \
+       disk.img kernel initramfs
diff --git a/debian/tests/control b/debian/tests/control
index 7b3c9e2..0fcfd11 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,10 @@
 Tests: install
 Restrictions: needs-root, isolation-machine, breaks-testbed
 
+Tests: testsuite
+Restrictions: needs-root isolation-machine breaks-testbed
+Depends: open-iscsi, python3, tgt, qemu-system, ubuntu-cloudimage-keyring, simplestreams, python3-netifaces, distro-info, cloud-image-utils, dctrl-tools, rsync
+
 Tests: nested
 Restrictions: needs-root, isolation-machine, breaks-testbed, allow-stderr
 Depends: targetcli-fb, qemu-system, qemu-utils, python3, python3-netifaces
diff --git a/debian/tests/get-image b/debian/tests/get-image
 new file mode 100755
index 0000000..41b903c
--- /dev/null
+++ b/debian/tests/get-image
@@ -0,0 +1,227 @@
+#!/bin/bash
+Usage() {
+   cat <<EOF
+${0##*/} out-directory release
+
+By default, the cloud image for 'release' is downloaded from the
+daily cloud image stream.
+
+Additional arguments can change behavior of what is downloaded.
+Some supported arguments:
+   * cloud-daily: use daily stream [default]
+   * cloud-release: use release stream rather than daily stream.
+   * maas-release, maas-daily: download maas images instead of cloud-image
+   * hwe-N: download the hwe kernel from release 'N' instead of default
+     this is only respected if maas stream is used.
+   * YYYYMMDD[.X] : download the specific build version
+
+example:
+ ${0##*/} xenial_dir xenial cloud-daily
+EOF
+}
+TEMP_D=""
+
+NO_IMAGE_AVAILABLE_RC=3
+
+cleanup() {
+   [ ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
+}
+VERBOSITY=1
+inargs() {
+  local n=$1 x="";
+  shift;
+  for x in "$@"; do [ "$n" = "$x" ] && return 0; done;
+  return 1
+}
+debug() { [ $1 -ge $VERBOSITY ] || return 0; shift; echo "$@" 1>&2; }
+error() { echo "$@" 1>&2; }
+fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
+
+VERBOSITY=0
+TEMP_D=$(mktemp -d ${TMPDIR:-/tmp}/${0##*/}.XXXXXX) || exit 1
+trap cleanup EXIT
+
+arches=( ppc64el i386 amd64 )
+releases=( $(ubuntu-distro-info --all) )
+mbase="http://maas.ubuntu.com/images/ephemeral-v2"
+cbase="http://cloud-images.ubuntu.com"
+def_stream_type="cloud"
+stream_src=""
+curbase="$mbase"
+def_rel="xenial"
+vername=""
+
+[ "$1" = "-h" -o "$1" = "--help" ] && { Usage; exit 0; }
+[ $# -lt 2 ] && { Usage 1>&2; exit 1; }
+out_d="$1"
+shift
+
+myarch=$(uname -m)
+case "$myarch" in
+   ppc64*) def_arch="ppc64el";;
+   i?86) def_arch="i386";;
+   x86_64) def_arch="amd64";;
+   arm*) def_arch="armel";;
+esac
+
+pt=( )
+for x in "$@"; do
+   inargs "$x" "${arches[@]}" && pt[${#pt[@]}]=arch=$x && arch="$x" && continue
+   inargs "$x" "${releases[@]}" && pt[${#pt[@]}]="release=$x" && release=$x && continue
+   [ "$x" = "released" -o "$x" = "release" ] && x="releases"
+   case "$x" in
+      cloud-released|cloud-release) x="cloud-releases";;
+      maas-released|maas-release) x="maas-releases";;
+   esac
+
+   case "$x" in
+      maas|cloud) stream_type="$x";;
+      cloud-daily|maas-daily|cloud-releases|maas-releases)
+          stream_type="${x%-*}"
+          stream_sub=${x#*-};;
+      http://*) stream=$x;;
+      hwe-*) subarch="$x";;
+      subarch=*) subarch=${x#*=};;
+      *=*) pt[${#pt[@]}]="$x";;
+      *~*) pt[${#pt[@]}]="$x";;
+      [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]|[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].[0-9])
+         pt[${#pt[@]}]="version_name=$x"
+         vername="$x";;
+      *) fail "Confused by input token '$x'";;
+   esac
+done
+
+[ -n "$stream_type" ] || stream_type="${def_stream_type}"
+if [ -z "$stream" ]; then
+    stream_sub=${stream_sub:-daily}
+    case "$stream_type" in
+        maas) stream="$mbase/$stream_sub";;
+        cloud) stream="$cbase/$stream_sub";;
+        *) fail "unknown stream_type '$stream_type'";;
+    esac
+fi
+
+[ -n "$arch" ] || pt[${#pt[@]}]="arch=$def_arch"
+
+if [ "$stream_type" = "maas" ]; then
+    if [ -z "$subarch" ]; then
+        t=${release#?}
+        first_letter=${release%${t}}
+        subarch="hwe-${first_letter}"
+        error "selected subarch=${subarch} for $release"
+    fi
+    pt[${#pt[@]}]="subarch=$subarch"
+    ofmt="%(sha256)s %(ftype)s %(subarch)s %(item_url)s"
+else
+    ofmt="%(sha256)s %(ftype)s %(item_url)s"
+fi
+
+OIFS="$IFS"
+mkdir -p "$out_d"
+case "$stream" in
+   *.json) :;;
+   *) keyring="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg";;
+esac
+
+needs=""
+[ -n "$keyring" -a ! -f "$keyring" ] &&
+   needs="${needs} ubuntu-cloudimage-keyring"
+
+for pair in sstream-query:simplestreams tgt-admin:tgt; do
+   cmd=${pair%:*}
+   pkg=${pair#*:}
+   command -v "$cmd" >/dev/null 2>&1 || needs="$needs $pkg"
+done
+
+if [ -n "${needs# }" ]; then
+   error "missing dependencies"
+   fail "sudo apt-get install -qy ${needs# }"
+fi
+
+qcmd=( sstream-query ${keyring:+"--keyring=$keyring"} ${vername:---max=1}
+       --output-format="$ofmt" "${stream}" datatype="image-downloads" 
+       "${pt[@]}" )
+echo "${qcmd[@]}"
+"${qcmd[@]}" > "${TEMP_D}/qout"
+roots=$(awk '$2 == "root-image.gz" || $2 == "disk1.img" { print $2 }' \
+        "${TEMP_D}/qout" | sort -u | wc -l)
+if [ "$roots" = "0" ]; then
+   error "No image available for $release in $stream${pt:+ (${pt[*]})}"
+   exit ${NO_IMAGE_AVAILABLE_RC}
+elif [ "$roots" != "1" ]; then
+   error "query resulted in '$roots' root images. expect 1 and only 1"
+   error "cmd was ${qcmd[*]}"
+   cat "${TEMP_D}/qout"
+   fail
+fi
+
+set -f
+while read line; do
+    set -- $line
+    if [ "$stream_type" = "maas" ]; then
+        sha256="$1"; ftype="$2"; subarch="$3"; url="$4"
+    else
+        sha256="$1"; ftype="$2"; url="$3"
+    fi
+    case "$ftype" in
+        boot-kernel|boot-initrd|root-image.gz|disk1.img) :;;
+        *) continue
+    esac
+    if [ "$ftype" = "root-image.gz" ]; then
+       fname="$ftype"
+       image_src="$out_d/$fname"
+       image="$out_d/root-image"
+    elif [ "$ftype" = "disk1.img" ]; then
+       fname="disk.img.dist"
+       image_src="$out_d/$fname"
+       image="$out_d/disk.img"
+    else
+       fname="$subarch/$ftype"
+    fi
+    out_f="${out_d}/$fname"
+    if [ -f "$out_f" ]; then
+        debug 1 "reusing existing '$out_f' rather than downloading $url."
+        continue
+    fi
+    [ -d "${out_f%/*}" ] || mkdir -p "${out_f%/*}"
+    tmp="${out_f}.tmp"
+    wget --progress=dot:mega -O "$tmp" "$url" || {
+        error "Failed to download $url to $tmp."
+        rm -f "$tmp"
+        exit 3
+    }
+    debug 1 "checksumming $tmp from $url"
+    out=$(sha256sum "$tmp") || {
+        error "Failed to checksum $tmp"
+        rm -f "$tmp"
+        exit 3;
+    }
+    found=${out%  *}
+    if [ "$found" != "$sha256" ]; then
+        error "$tmp from $url found sha256 of $found. expected $sha256."
+        ls -l "$tmp" 1>&2
+        rm -f "$tmp"
+        exit 3
+    fi
+    mv "$tmp" "$out_f" || fail "failed renaming $tmp to $out_f"
+    echo "$fname" "$url" >> "$out_d/contents"
+done < "${TEMP_D}/qout"
+
+if [ ! -f "$image" ]; then
+    case "$image_src" in
+        */root-image.gz)
+           debug 1 "decompressing $image_src"
+           zcat "$image_src" > "$image.tmp" &&
+             mv "$image.tmp" "$image" ||
+             { rm -f "$image.tmp"; exit 1; }
+           ;;
+        */disk.img.dist)
+           debug 1 "converting qcow2 in $image_src -> raw in $image"
+           qemu-img convert -O raw "$image_src" "$image.tmp" &&
+               mv "$image.tmp" "$image" ||
+               { rm -f "$image.tmp"; exit 1; }
+           ;;
+    esac
+fi
+
+# vi: ts=4 expandtab
diff --git a/debian/tests/install b/debian/tests/install
index ae2fe79..5077b7b 100755
--- a/debian/tests/install
+++ b/debian/tests/install
@@ -28,5 +28,8 @@ grep -vq '^GenerateName=yes' /etc/iscsi/initiatorname.iscsi || die_with_file /et
 grep -q '^InitiatorName=' /etc/iscsi/initiatorname.iscsi || die_with_file /etc/iscsi/initiatorname.iscsi "InitiatorName is not set"
 
 # Make sure the daemon is started
-service iscsid status || die "iscsid not running"
-pgrep -c iscsid >/dev/null || die "iscsid not running"
+systemctl is-active iscsid.socket || die "iscsid socket not running"
+# no-op discovery to socket activate service
+iscsiadm -m discovery -t sendtargets -p 127.0.0.1 >/dev/null 2>&1|| /bin/true
+systemctl is-active iscsid.service || die "iscsid service not running"
+pgrep -c iscsid >/dev/null || die "iscsid process not running"
diff --git a/debian/tests/patch-image b/debian/tests/patch-image
 new file mode 100755
index 0000000..0688912
--- /dev/null
+++ b/debian/tests/patch-image
@@ -0,0 +1,374 @@
+#!/bin/bash
+
+VERBOSITY=1
+TEMP_D=""
+
+error() { echo "$@" 1>&2; }
+fail() { local r=$?;  [ $r -eq 0 ] && r=1; failrc "$r" "$@"; }
+failrc() { local r=$1; shift; [ $# -eq 0 ] || error "$@"; exit $r; }
+
+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
+
+    --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.
+  to override that behavior pass package 'none'.
+EOF
+
+}
+
+bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || error "$@"; return 1; }
+cleanup() {
+    [ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
+}
+
+debug() {
+    local level=${1}; shift;
+    [ "${level}" -gt "${VERBOSITY}" ] && return
+    error "${@}"
+}
+
+adt_test_triggers_to_bin_pkgs() {
+    # ADT_TEST_TRIGGERS is space delimited <src>/version
+    # returns a scalar '_RET', caller has to expand
+    local tok src="" ver="" binpkgs=""
+    for tok in "$@"; do
+        src=${tok%/*}
+        ver=${tok#*/}
+        bin_packages_from_source_pkg "$src" "$ver" || return
+        if [ -z "${_RET}" ]; then
+            error "$tok: (source=$src ver=$ver) No packages available!"
+            return 1
+        fi
+        binpkgs="${binpkgs} ${_RET}"
+    done
+    _RET=${binpkgs# }
+}
+
+bin_packages_from_source_pkg() {
+    local pkg=$1 ver=${2} cmd="" out="" p="" ret=""
+    if ! command -v grep-aptavail >/dev/null; then
+        error "No command grep-aptavail: apt-get install dctrl-tools"
+        return 1
+    fi
+    cmd=( grep-aptavail --show-field=Package
+        --exact-match --field=Source:Package "$pkg" )
+    if [ -n "$ver" ]; then
+       cmd=( "${cmd[@]}" --and --field=Version "$ver" )
+    fi
+    out=$("${cmd[@]}" | sed 's,Package: ,,')
+    ret=""
+    for p in $out; do
+        ret="$ret ${p#Package: }${ver:+=${ver}}"
+    done
+    # if no version was provided, we could have multiple results
+    _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"
+}
+
+cat_debug_script() {
+    cat <<"EOF"
+#!/bin/sh
+set -f
+NAME=${1:-debug-pid-$$}
+[ "$(id -u)" = "0" ] && log="/run/${NAME}.log" || log="/tmp/${NAME}.log"
+
+msg() {
+   echo "===" "$@" "===" 1>&2
+}
+showcmd() {
+    msg "showcmd$" "$@"
+    "$@"
+}
+
+main() {
+    issues=$(journalctl | egrep "[.]mount: ")
+    if [ -z "$issues" ]; then
+        msg "$NAME:" "MOUNT ISSUES FOUND: NO"
+    else
+        msg "$NAME:" "MOUNT ISSUES FOUND: YES"
+    fi
+    showcmd systemctl list-units --no-pager --all --full "*.mount"
+    showcmd systemctl cat --no-pager --all --full "*.mount"
+    showcmd systemctl status --no-pager --all --full "*.mount"
+    showcmd cat /etc/fstab
+    showcmd cat /proc/1/mountinfo
+}
+
+main > "$log" 2>&1
+echo "============ $NAME ============="
+cat "$log"
+EOF
+}
+
+add_systemd_job() {
+    local target="$1" name="$2" after="$3" start="$4"
+    local spath="lib/systemd/system/xdebug-$name.service"
+    debug 1 "writing $name to $target/$spath"
+    cat > "$target/$spath" <<EOF
+[Unit]
+Description=Execute xdebug ${name}
+After=${after}
+
+[Service]
+Type=oneshot
+ExecStart=${start} ${name}
+RemainAfterExit=yes
+StandardOutput=journal+console
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    [ $? -eq 0 ] || { error "failed writing $target/$spath"; return 1; }
+    local wantsdir="$target/etc/systemd/system/multi-user.target.wants"
+    ln -s "/$spath" "$wantsdir/" ||
+        { error "failed ln -s '/$spath' '$wantsdir/'"; return 1; }
+}
+
+insert_debug_1788188() {
+    # This is an attempt to collect more debug information in the
+    # event that the tests trigger LP: #1788188.
+    local target="$1"
+    [ "$target" = "/" -o -z "$target" ] &&
+        { error "target was / in insert_debug"; return 1; }
+    local script="usr/local/bin/debug-mounts"
+    cat_debug_script > "$target/$script" &&
+        chmod 755 "$target/$script" ||
+       { error "failed writing $target/script"; return 1; }
+    local name=""
+    ( set +f;
+      rm -f "$target/lib/systemd/system/xdebug"-*.service \
+            "$target/etc/systemd/system/"*.wants/xdebug*.service )
+    add_systemd_job "$target" network network-online.target "/$script" &&
+        add_systemd_job "$target" local-fs local-fs.target "/$script" ||
+        { error "failed adding systemd jobs"; return 1; }
+}
+
+main() {
+    local short_opts="hv"
+    local long_opts="help,no-copy-apt,initrd:,kernel:,verbose"
+    local getopt_out="" orig_args=""
+    orig_args=( "$@" )
+    getopt_out=$(getopt --name "${0##*/}" \
+        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
+        eval set -- "${getopt_out}" ||
+        { bad_Usage; return; }
+
+    local cur="" next=""
+    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));;
+            --) shift; break;;
+        esac
+        shift;
+    done
+
+    [ $# -ne 0 ] || { bad_Usage "must provide at least image"; return; }
+
+    [ "$(id -u)" = "0" ] || fail "not root"
+    target="$1"
+    shift
+    if [ -f "$target" ]; then
+        local nargs=""
+        nargs=( "${orig_args[@]}" )
+        # replace the first occurance of target in orig args with _MOUNTPOINT_
+        for((i=0;i<${#nargs[@]};i++)); do
+            [ "${nargs[$i]}" = "$target" ] && nargs[$i]=_MOUNTPOINT_ && break
+        done
+        debug 1 "mic $target -- $0 ${nargs[*]}"
+        IMAGE="$target" exec mount-image-callback \
+            --system-resolvconf "$target" -- "$0" "${nargs[@]}"
+    fi
+
+    if [ ! -d "$target" ]; then
+        fail "$target: not a directory or file"
+    fi
+
+    local tsrc=${IMAGE:-${target}}
+    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
+        adt_test_triggers_to_bin_pkgs ${ADT_TEST_TRIGGERS} ||
+            fail "failed to find binary packages " \
+                "from ADT_TEST_TRIGGERS=$ADT_TEST_TRIGGERS"
+        packages=( $_RET )
+        debug 1 "read ADT_TEST_TRIGGERS=$ADT_TEST_TRIGGERS to set" \
+            "packages=${packages[*]}"
+    else
+        local opackages="" debs="" pkg=""
+        opackages=( "${packages[@]}" )
+        packages=( )
+        debs=( )
+        for pkg in "${opackages[@]}"; do
+            [ -f "${pkg}" ] && debs[${#debs[@]}]="$pkg" ||
+                packages[${packages[@]}]="$pkg"
+        done
+        if [ "${#packages[@]}" -eq 0 -a "${#debs[@]}" -eq 0 ]; then
+            packages=( open-iscsi )
+            debug 1 "no packages or debs given, using packages=${packages[*]}"
+        fi
+    fi
+
+    # if open-iscsi is not in the packages list above, we handle it specifically
+    # so that even if the image did not have open-iscsi, it will get it.
+    local pkg="" mypkg="open-iscsi"
+    for pkg in "${packages[@]}"; do
+        case "$pkg" in
+            open-iscsi|open-iscsi/*) mypkg="none";;
+        esac
+    done
+
+    TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX") ||
+        fail "failed to make tempdir"
+    trap cleanup EXIT
+
+    if $copy_apt; then
+        local distdir="${target}/etc/apt.dist.${0##*/}"
+        if [ ! -d "$distdir" ]; then
+            mv "$target/etc/apt" "$distdir" ||
+                fail "failed to backup /etc/apt in $tsrc"
+        fi
+        cp -a /etc/apt "$target/etc/" ||
+            fail "failed to replace /etc/apt in $tsrc"
+
+        # find file:// repos in apt sources and copy them in
+        local file_repos=""
+        file_repos=$(
+            fm='s,.*[[:space:]]file:///*\([^[[:space:]]*\).*,/\1,p'
+            shopt -s nullglob
+            for f in /etc/apt/sources.list /etc/apt/sources.list.d/*.list; do
+                sed -n -e 's/#.*//' -e "$fm" "$f"
+            done
+        )
+        local dir="" bdir="" tdir=""
+        for dir in ${file_repos}; do
+            tdir="${target}$(dirname $dir)/$(basename ${dir})"
+            if [ -d "$dir" ]; then
+                debug 1 "copying $dir -> $tdir"
+                mkdir -p "$tdir" ||
+                    fail "failed to create $tdir"
+                rsync --delete -a "$dir/" "$tdir" ||
+                    fail "failed copy from $dir/ to $tdir"
+            fi
+        done
+    fi
+
+    if $update_fstab; then
+        update_fstab "$target/etc/fstab" ||
+            { error "failed updating /etc/fstab in target"; return 1; }
+    fi
+
+    insert_debug_1788188 "$target" || return 1
+
+    mount -o bind /sys "$target"/sys || :
+    mount -o bind /proc "$target"/proc || :
+    mount -o bind /dev "$target"/dev || :
+    mount -o bind /dev/pts "$target"/dev/pts || :
+
+    debug 1 "${#packages[@]} packages: ${packages[*]}"
+    if [ "${#packages[@]}" != "0" ]; then
+        DEBIAN_FRONTEND=noninteractive chroot "$target" sh -exc '
+            mypkg=$1
+            shift
+            apt-get update -q
+            if [ "$mypkg" != "none" ]; then
+                apt-get install -qy "$mypkg"
+            fi
+            apt-get install -qy --only-upgrade "$@"' \
+                chroot-inst "$mypkg" "${packages[@]}" ||
+            fail "failed to install ${packages[*]} in $target"
+    fi
+
+    debug 1 "${#debs[@]} debs: ${debs[*]}"
+    if [ "${#debs[@]}" != "0" ]; then
+        local tmpd=""
+        tmpd=$(mktemp -d "${target}/tmp/${0##*/}.XXXXXX")
+        cp "${debs[@]}" "$tmpd"
+        DEBIAN_FRONTEND=noninteractive chroot "$target" sh -exc \
+            'cd "$1"; shift; dpkg -i *.deb' debinstalls "${tmpd#${target}}"
+        rm -Rf "${tmpd}"
+    fi
+
+    umount "$target"/dev/pts || :
+    umount "$target"/dev || :
+    umount "$target"/proc || :
+    umount "$target"/sys || :
+
+    local kpath="" ipath=""
+    for f in "$target/boot/"*; do
+        case "${f##*/}" in
+            *.signed) continue;;
+            vmlinu?-*) kpath="$f";;
+            initrd.img-*) ipath="$f";;
+        esac
+    done
+
+    if [ -n "$kernel" ]; then
+        [ -n "$kpath" ] || fail "unable to find kernel in $tsrc"
+        debug 1 "using kernel ${kpath#${target}}"
+        cp "$kpath" "$kernel" ||
+            fail "failed copy $kpath to $kernel"
+        [ -z "$IMAGE" ] || chown "--reference=$IMAGE" "$kernel"
+    fi
+
+    if [ -n "$initrd" ]; then
+        [ -n "$ipath" ] || fail "unable to find initrd in $tsrc"
+        debug 1 "using initrd ${ipath#${target}}"
+        cp "$ipath" "$initrd" ||
+            fail "failed copy $ipath to $initrd"
+        [ -z "$IMAGE" ] || chown "--reference=$IMAGE" "$initrd"
+    fi
+
+}
+
+main "$@"
+
+# vi: ts=4 expandtab
diff --git a/debian/tests/test-open-iscsi.py b/debian/tests/test-open-iscsi.py
 new file mode 100644
index 0000000..1ad8b4f
--- /dev/null
+++ b/debian/tests/test-open-iscsi.py
@@ -0,0 +1,427 @@
+#!/usr/bin/python3
+#
+#    test-open-iscsi.py quality assurance test script for open-iscsi
+#    Copyright (C) 2011 Canonical Ltd.
+#    Author: Jamie Strandboge <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3,
+#    as published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# packages required for test to run:
+# QRT-Packages: open-iscsi
+# packages where more than one package can satisfy a runtime requirement:
+# QRT-Alternates: 
+# files and directories required for the test to run:
+# QRT-Depends: 
+# privilege required for the test to run (remove line if running as user is okay):
+# QRT-Privilege: root
+
+'''
+    In general, this test should be run in a virtual machine (VM) or possibly
+    a chroot and not on a production machine. While efforts are made to make
+    these tests non-destructive, there is no guarantee this script will not
+    alter the machine. You have been warned.
+
+    How to run in a clean VM:
+    $ sudo apt-get -y install <QRT-Packages> && sudo ./test-PKG.py -v'
+
+    How to run in a clean schroot named 'lucid':
+    $ schroot -c lucid -u root -- sh -c 'apt-get -y install <QRT-Packages> && ./test-PKG.py -v'
+
+
+    NOTES:
+    - currently only tested on Ubuntu 8.04
+'''
+
+from __future__ import print_function
+
+from netifaces import gateways, AF_INET
+import unittest, subprocess, sys, os, glob
+import shutil
+import testlib
+import textwrap
+from tempfile import mkdtemp
+import time
+
+# There are setup based on README.multipurpose-vm. Feel free to override.
+remote_server = ''
+username = 'ubuntu'
+password = 'passwd'
+username_in = 'ubuntu'
+password_in = 'ubuntupasswd'
+initiatorname = 'iqn.2009-10.com.example.hardy-multi:iscsi-01'
+
+COLLECT_USER_DATA = """\
+#cloud-config
+bukket:
+ - &get_resolved_status |
+   if [ "${1:--}" != "-" ]; then
+      exec >"$1" 2>&1
+   fi
+   if ! command -v systemd-resolve >/dev/null 2>&1; then
+       echo "systemd-resolve: not available."
+       exit
+   fi
+   if ! ( systemd-resolve --help | grep -q -- --status ); then
+       echo "systemd-resolve: no --status."
+       exit
+   fi
+   systemd-resolve --status --no-pager
+
+ - &get_iscsid_status |
+   [ "${1:--}" != "-" ] && exec >"$1" 2>&1
+   udevadm settle
+   systemctl is-active iscsid.service
+   systemctl status --no-pager --full iscsid.service
+
+ - &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
+
+ - &collect_debug_mounts |
+   [ "${1:--}" != "-" ] && exec >"$1" 2>&1
+   [ -x /usr/local/bin/debug-mounts ] || exit 0
+   /usr/local/bin/debug-mounts
+
+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 ]
+ - [ sh, -c, *get_iscsid_status, --, /output/iscsid-status.txt ]
+ - [ sh, -c, *collect_debug_mounts, --, /output/debug-mounts.txt ]
+ - [ sh, -c, 'journalctl --boot=0 --output=short-monotonic > /output/journal.txt' ]
+ - [ sh, -c, 'dpkg-query --show > /output/manifest.txt' ]
+ - [ tar, -C, /output, -cf, /dev/disk/by-id/virtio-output-disk, . ]
+
+power_state:
+ mode: poweroff
+ message: cloud-init finished. Shutting down.
+ timeout: 60
+"""
+
+try:
+    from private.qrt.OpenIscsi import PrivateOpenIscsiTest
+except ImportError:
+    class PrivateOpenIscsiTest(object):
+        '''Empty class'''
+    print("Skipping private tests", file=sys.stdout)
+
+class OpenIscsiTest(testlib.TestlibCase, PrivateOpenIscsiTest):
+    '''Test my thing.'''
+
+    def setUp(self):
+        '''Set up prior to each test_* function'''
+        self.pidfile = "/var/run/iscsid.pid"
+        self.exe = "/sbin/iscsid"
+        self.daemon = testlib.TestDaemon("open-iscsi")
+        self.initiatorname_iscsi = '/etc/iscsi/initiatorname.iscsi'
+        self.iscsid_conf = '/etc/iscsi/iscsid.conf'
+
+    def tearDown(self):
+        '''Clean up after each test_* function'''
+        global remote_server
+        global initiatorname
+
+        # If remote server is setup, convert back to manual, logout, remove
+        # testlib configs and restart (in that order)
+        if remote_server != '':
+            testlib.cmd(['iscsiadm', '-m', 'node', '--targetname', initiatorname, '-p', '%s:3260' % remote_server, '--op=update', '--name', 'node.startup', '--value=manual'])
+            testlib.cmd(['iscsiadm', '-m', 'node', '--targetname', initiatorname, '-p', '%s:3260' % remote_server, '--op=update', '--name',  'node.conn[0].startup', '--value=manual'])
+            testlib.cmd(['iscsiadm', '-m', 'node', '--targetname', initiatorname, '-p', '%s:3260' % remote_server, '--logout'])
+
+        testlib.config_restore(self.initiatorname_iscsi)
+        testlib.config_restore(self.iscsid_conf)
+        self.daemon.restart()
+
+    def test_discovery_with_server(self):
+        '''Test iscsi_discovery to remote server'''
+        global remote_server
+        global username
+        global password
+        global username_in
+        global password_in
+        global initiatorname
+
+        if remote_server == '':
+            return self._skipped("--remote-server not specified")
+
+        contents = '''
+InitiatorName=%s
+InitiatorAlias=ubuntu
+''' % (initiatorname)
+        testlib.config_replace(self.initiatorname_iscsi, contents, True)
+
+        contents = '''
+node.session.auth.authmethod = CHAP
+node.session.auth.username = %s
+node.session.auth.password = %s
+node.session.auth.username_in = %s
+node.session.auth.password_in = %s
+
+discovery.sendtargets.auth.authmethod = CHAP
+discovery.sendtargets.auth.username = %s
+discovery.sendtargets.auth.password = %s
+discovery.sendtargets.auth.username_in = %s
+discovery.sendtargets.auth.password_in = %s
+''' % (username, password, username_in, password_in, username, password, username_in, password_in)
+        testlib.config_replace(self.iscsid_conf, contents, True)
+
+        self.assertTrue(self.daemon.restart())
+        time.sleep(2)
+        self.assertTrue(self.daemon.status()[0])
+
+        rc, report = testlib.cmd(["/sbin/iscsi_discovery", remote_server])
+        expected = 0
+        result = 'Got exit code %d, expected %d\n' % (rc, expected)
+        self.assertEqual(expected, rc, result + report)
+        for i in ['starting discovery to %s' % remote_server,
+                  'Testing iser-login to target %s portal %s' % (initiatorname, remote_server),
+                  'starting to test tcp-login to target %s portal %s' % (initiatorname, remote_server),
+                  'discovered 1 targets at %s, connected to 1' % remote_server]:
+            result = "Could not find '%s' in report:\n" % i
+            self.assertTrue(i in report, result + report)
+
+    def test_net_interface_handler_execute_bit(self):
+        '''Test /lib/open-iscsi/net-interface-handler is executable.'''
+        nih_path = '/lib/open-iscsi/net-interface-handler'
+        self.assertTrue(os.access(nih_path, os.X_OK))
+
+class CloudImageTest(testlib.TestlibCase, PrivateOpenIscsiTest):
+    '''Test the cloud image can boot on iscsi root.
+
+    See README-boot-test.md for more information.
+    '''
+
+    @classmethod
+    def setUpClass(cls):
+        reason = (
+            "Skipped Cloud Image test on {arch}. whitelisted are: {whitelist}")
+        whitelisted = os.environ.get('WHITELIST_ARCHES', 'amd64').split(",")
+        curarch = testlib.manager.dpkg_arch
+        if testlib.manager.dpkg_arch not in whitelisted:
+            raise unittest.SkipTest(
+                reason.format(arch=curarch, whitelist=whitelisted))
+
+        here = os.path.dirname(os.path.abspath(__file__))
+        os.environ['PATH'] = "%s:%s" % (here, os.environ['PATH'])
+        release = os.environ.get(
+            "ISCSI_TEST_RELEASE", testlib.ubuntu_release())
+        image_d = os.path.join(here, '{}.d'.format(release))
+        # Download MAAS ephemeral image.
+        info = {'release': release,
+                'image_d': image_d,
+                'root_image': os.path.join(image_d, 'disk.img'),
+                'kernel': os.path.join(image_d, 'kernel'),
+                'initrd': os.path.join(image_d, 'initrd')}
+        try:
+            get_image(info['image_d'], release)
+        except subprocess.CalledProcessError as e:
+            if e.return_code != 3:
+                raise e
+            raise unittest.SkipTest(
+                "Cloud Image not available for release '%s'." % release)
+        if os.environ.get("NO_PATCH_IMAGE", "0") == "0":
+            patch_image(info['root_image'],
+                        kernel=info['kernel'], initrd=info['initrd'])
+        cls.info = info
+        cls.here = here
+
+    def tearDown(self):
+        super(CloudImageTest, self).tearDown()
+        if os.path.exists(self.tmpdir):
+            shutil.rmtree(self.tmpdir)
+
+    def setUp(self):
+        super(CloudImageTest, self).setUp()
+        self.tmpdir = mkdtemp()
+        udp = os.path.join(self.tmpdir, 'user-data')
+        with open(udp, "w") as fp:
+            fp.write(COLLECT_USER_DATA)
+        self.info['user-data'] = udp
+
+    def create_output_disk(self):
+        path = os.path.join(self.tmpdir, 'output-disk.img')
+        subprocess.check_call([
+            'qemu-img', 'create', '-f',  'raw', path, '10M'])
+        return path
+
+    def extract_files(self, path):
+        # get contents in a dictionary of tarball at 'path'
+        tmpdir = mkdtemp()
+        try:
+            subprocess.check_call(['tar', '-C', tmpdir, '-xf', path])
+            flist = {}
+            prefix = len(tmpdir) + 1
+            for root, dirs, files in os.walk(tmpdir):
+                for fname in files:
+                    fpath = os.path.join(root, fname)
+                    key = fpath[prefix:]
+                    with open(fpath, "r") as fp:
+                        flist[key] = fp.read()
+            return flist
+        finally:
+            shutil.rmtree(tmpdir)
+
+    def test_tgt_boot(self):
+        tgt_boot_cmd = os.path.join(self.here, 'tgt-boot-test')
+        # Add self.here to PATH so xkvm will be available to tgt-boot-test
+        dns_addr = '10.1.1.4'
+        rel_dir = '{}.d'.format(self.info['release'])
+        dns_search = 'example.com'
+        info = {'host': '10.1.1.2', 'dns': dns_addr,
+                'dnssearch': dns_search, 'network': '10.1.1.0/24'}
+        netdev = ("--netdev=user,net={network},host={host},dns={dns},"
+                  "dnssearch={dnssearch}").format(**info)
+
+        artifacts_dir = os.environ.get('AUTOPKGTEST_ARTIFACTS')
+        if artifacts_dir and not os.path.isdir(artifacts_dir):
+            os.makedirs(artifacts_dir)
+
+        output_disk = self.create_output_disk()
+        cmd = [
+            tgt_boot_cmd, '-v', netdev,
+            '--disk=%s,serial=output-disk' % output_disk,
+            '--user-data-add=%s' % self.info['user-data'],
+            self.info['root_image'], self.info['kernel'],
+            self.info['initrd']]
+        sys.stderr.write(' '.join(cmd) + "\n")
+
+        env = os.environ.copy()
+        env['BOOT_TIMEOUT'] = env.get('BOOT_TIMEOUT', '60m')
+        subprocess.check_call(cmd, env=env)
+
+        if artifacts_dir:
+            tgz = os.path.join(artifacts_dir, "tgt-collected.tar.gz")
+            shutil.copy(output_disk, tgz)
+            print("Copied output_disk '%s' to artifacts dir '%s'" %
+                  (output_disk, tgz))
+
+        files = self.extract_files(output_disk)
+        print("collected files: %s" % files.keys())
+        resolvconf = files.get('resolv.conf', "NO_RESOLVCONF_FOUND")
+        resolve_status = files.get('systemd-resolve-status.txt')
+
+        resolvconf_id = 'generated by resolvconf'
+        resolved_addr = "127.0.0.53"
+        if resolvconf_id in resolvconf:
+            print("resolvconf manages resolvconf.\n")
+            self.assertIn(
+                dns_addr, resolvconf,
+                msg = ("%s not in resolvconf contents: \n%s" %
+                       (dns_addr, resolvconf)))
+            if dns_search in resolvconf:
+                print("%s was found in resolv.conf." % dns_search)
+            elif resolved_addr in resolvconf and dns_search in resolve_status:
+                # zesty has resolvconf and systemd-resolved.
+                print("%s was in resolve_status and %s in resolv.conf" %
+                      (resolved_addr, dns_search))
+            else:
+                raise AssertionError(
+                    "%s domain is not being searched." % dns_search)
+
+        else:
+            print("systemd-resolved managing resolve.conf\n")
+            self.assertIn(
+                resolved_addr, resolvconf,
+                msg="%s not in resolved resolv.conf: %s" % (resolved_addr,
+                                                            resolvconf))
+            self.assertIn(dns_addr, resolve_status,
+                msg=("%s not in systemd-resolve status: %s" %
+                     (dns_addr, resolve_status)))
+            self.assertIn(dns_search, resolve_status,
+                msg=("search addr '%s' not in systemd-resolve status: %s" %
+                     (dns_search, resolve_status)))
+
+        # iscsid-status.txt has first line output from
+        # 'systemctl is-active iscsid.service' and then 'systemcl status'
+        iscsid_status = files.get('iscsid-status.txt')
+        is_active = iscsid_status.splitlines()[0]
+        self.assertEqual(
+            "active", is_active,
+            msg=("Expected iscsid.service active, found '%s'.\n%s\n" %
+                 (is_active, iscsid_status)))
+
+
+def get_image(top_d, release):
+    cmd = ['get-image', top_d, 'cloud-daily', release]
+    subprocess.check_call(cmd)
+
+
+def patch_image(image, packages=None, kernel=None, initrd=None):
+    '''Patch root-image with dep8 built open-iscsi package.'''
+
+    if packages is None:
+        # an empty 'packages' to patch-image still installs open-iscsi
+        packages = []
+
+    cmd = ['patch-image', image]
+    if kernel:
+        cmd.append('--kernel=%s' % kernel)
+    if initrd:
+        cmd.append('--initrd=%s' % initrd)
+    cmd.extend(packages)
+
+    subprocess.check_call(cmd)
+
+
+if __name__ == '__main__':
+    import optparse
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", dest="verbose", help="Verbose", action="store_true")
+    parser.add_option("-s", "--remote-server", dest="remote_server", help="Specify host with available iSCSI volumes", metavar="HOST")
+
+    parser.add_option("-n", "--initiatorname", dest="initiatorname", help="Specify initiatorname for use with --remote-server", metavar="NAME")
+
+    parser.add_option("--password", dest="password", help="Specify password for use with --remote-server", metavar="PASS")
+    parser.add_option("--password-in", dest="password_in", help="Specify password_in for use with --remote-server", metavar="PASS")
+
+    parser.add_option("--username", dest="username", help="Specify username for use with --remote-server", metavar="USER")
+    parser.add_option("--username-in", dest="username_in", help="Specify username_in for use with --remote-server", metavar="USER")
+
+    (options, args) = parser.parse_args()
+
+    if options.remote_server:
+        remote_server = options.remote_server
+
+        if options.username:
+            username = options.username
+        if options.password:
+            password = options.password
+        if options.username_in:
+            username_in = options.username_in
+        if options.password_in:
+            password_in = options.password_in
+        if options.initiatorname:
+            initiatorname = options.initiatorname
+        print("Connecting to remote server with:")
+        print(" host = %s " % remote_server)
+        print(' initiatorname = %s' % initiatorname)
+        print(' username = %s' % username)
+        print(' password = %s' % password)
+        print(' username_in = %s' % username_in)
+        print(' password_in = %s' % password_in)
+
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(OpenIscsiTest))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
+        CloudImageTest))
+    rc = unittest.TextTestRunner(verbosity=2).run(suite)
+    if not rc.wasSuccessful():
+        sys.exit(1)
diff --git a/debian/tests/testlib.py b/debian/tests/testlib.py
 new file mode 100644
index 0000000..dce4252
--- /dev/null
+++ b/debian/tests/testlib.py
@@ -0,0 +1,1488 @@
+from __future__ import print_function
+#
+#    testlib.py quality assurance test script
+#    Copyright (C) 2008-2016 Canonical Ltd.
+#
+#    This library is free software; you can redistribute it and/or
+#    modify it under the terms of the GNU Library General Public
+#    License as published by the Free Software Foundation; either
+#    version 2 of the License.
+#
+#    This library is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Library General Public License for more details.
+#
+#    You should have received a copy of the GNU Library General Public
+#    License along with this program.  If not, see
+#    <http://www.gnu.org/licenses/>.
+#
+
+'''Common classes and functions for package tests.'''
+
+import crypt
+import glob
+import grp
+import gzip
+import os
+import os.path
+import platform
+import pwd
+import random
+import re
+import shutil
+import socket
+import string
+import subprocess
+import sys
+import tempfile
+import time
+import unittest
+
+from stat import ST_SIZE
+
+# Don't make python-pexpect mandatory
+try:
+    import pexpect
+except ImportError:
+    pass
+
+import warnings
+warnings.filterwarnings('ignore', message=r'.*apt_pkg\.TagFile.*', category=DeprecationWarning)
+try:
+    import apt_pkg
+    # cope with apt_pkg api changes.
+    if 'init_system' in dir(apt_pkg):
+        apt_pkg.init_system()
+    else:
+        apt_pkg.InitSystem()
+except:
+    # On non-Debian system, fall back to simple comparison without debianisms
+    class apt_pkg(object):
+        @staticmethod
+        def version_compare(one, two):
+            list_one = one.split('.')
+            list_two = two.split('.')
+            while len(list_one) > 0 and len(list_two) > 0:
+                try:
+                    if int(list_one[0]) > int(list_two[0]):
+                        return 1
+                    if int(list_one[0]) < int(list_two[0]):
+                        return -1
+                except:
+                    # ugh, non-numerics in the version, fall back to
+                    # string comparison, which will be wrong for e.g.
+                    # 3.2 vs 3.16rc1
+                    if list_one[0] > list_two[0]:
+                        return 1
+                    if list_one[0] < list_two[0]:
+                        return -1
+                list_one.pop(0)
+                list_two.pop(0)
+            return 0
+
+        @staticmethod
+        def VersionCompare(one, two):
+            return apt_pkg.version_compare(one, two)
+
+bogus_nxdomain = "208.69.32.132"
+
+# http://www.chiark.greenend.org.uk/ucgi/~cjwatson/blosxom/2009-07-02-python-sigpipe.html
+# This is needed so that the subprocesses that produce endless output
+# actually quit when the reader goes away.
+import signal
+def subprocess_setup():
+    # Python installs a SIGPIPE handler by default. This is usually not what
+    # non-Python subprocesses expect.
+    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+
+class TimedOutException(Exception):
+    def __init__(self, value="Timed Out"):
+        self.value = value
+
+    def __str__(self):
+        return repr(self.value)
+
+
+def _restore_backup(path):
+    pathbackup = path + '.autotest'
+    if os.path.exists(pathbackup):
+        shutil.move(pathbackup, path)
+
+
+def _save_backup(path):
+    pathbackup = path + '.autotest'
+    if os.path.exists(path) and not os.path.exists(pathbackup):
+        shutil.copy2(path, pathbackup)
+        # copy2 does not copy ownership, so do it here.
+        # Reference: http://docs.python.org/library/shutil.html
+        a = os.stat(path)
+        os.chown(pathbackup, a[4], a[5])
+
+
+def config_copydir(path):
+    if os.path.exists(path) and not os.path.isdir(path):
+        raise OSError("'%s' is not a directory" % (path))
+    _restore_backup(path)
+
+    pathbackup = path + '.autotest'
+    if os.path.exists(path):
+        shutil.copytree(path, pathbackup, symlinks=True)
+
+
+def config_replace(path, contents, append=False):
+    '''Replace (or append) to a config file'''
+    _restore_backup(path)
+    if os.path.exists(path):
+        _save_backup(path)
+        if append:
+            with open(path) as fh:
+                contents = fh.read() + contents
+    with open(path, 'w') as fh:
+        fh.write(contents)
+
+
+def config_comment(path, field):
+    _save_backup(path)
+    contents = ""
+    with open(path) as fh:
+        for line in fh:
+            if re.search("^\s*%s\s*=" % (field), line):
+                line = "#" + line
+            contents += line
+
+    with open(path + '.new', 'w') as new_fh:
+        new_fh.write(contents)
+    os.rename(path + '.new', path)
+
+
+def config_set(path, field, value, spaces=True):
+    _save_backup(path)
+    contents = ""
+    if spaces:
+        setting = '%s = %s\n' % (field, value)
+    else:
+        setting = '%s=%s\n' % (field, value)
+    found = False
+    with open(path) as fh:
+        for line in fh:
+            if re.search("^\s*%s\s*=" % (field), line):
+                found = True
+                line = setting
+            contents += line
+    if not found:
+        contents += setting
+
+    with open(path + '.new', 'w') as new_config:
+        new_config.write(contents)
+    os.rename(path + '.new', path)
+
+
+def config_patch(path, patch, depth=1):
+    '''Patch a config file'''
+    _restore_backup(path)
+    _save_backup(path)
+
+    handle, name = mkstemp_fill(patch)
+    rc = subprocess.call(['/usr/bin/patch', '-p%s' % depth, path], stdin=handle, stdout=subprocess.PIPE)
+    os.unlink(name)
+    if rc != 0:
+        raise Exception("Patch failed")
+
+
+def config_restore(path):
+    '''Rename a replaced config file back to its initial state'''
+    _restore_backup(path)
+
+
+def timeout(secs, f, *args):
+    def handler(signum, frame):
+        raise TimedOutException()
+
+    old = signal.signal(signal.SIGALRM, handler)
+    result = None
+    signal.alarm(secs)
+    try:
+        result = f(*args)
+    finally:
+        signal.alarm(0)
+        signal.signal(signal.SIGALRM, old)
+
+    return result
+
+
+def require_nonroot():
+    if os.geteuid() == 0:
+        print("This series of tests should be run as a regular user with sudo access, not as root.", file=sys.stderr)
+        sys.exit(1)
+
+
+def require_root():
+    if os.geteuid() != 0:
+        print("This series of tests should be run with root privileges (e.g. via sudo).", file=sys.stderr)
+        sys.exit(1)
+
+
+def require_sudo():
+    if os.geteuid() != 0 or os.environ.get('SUDO_USER', None) is None:
+        print("This series of tests must be run under sudo.", file=sys.stderr)
+        sys.exit(1)
+    if os.environ['SUDO_USER'] == 'root':
+        print('Please run this test using sudo from a regular user. (You ran sudo from root.)', file=sys.stderr)
+        sys.exit(1)
+
+
+def random_string(length, lower=False):
+    '''Return a random string, consisting of ASCII letters, with given
+    length.'''
+
+    s = ''
+    selection = string.ascii_letters
+    if lower:
+        selection = string.ascii_lowercase
+    maxind = len(selection) - 1
+    for l in range(length):
+        s += selection[random.randint(0, maxind)]
+    return s
+
+
+def mkstemp_fill(contents, suffix='', prefix='testlib-', dir=None):
+    '''As tempfile.mkstemp does, return a (file, name) pair, but with
+    prefilled contents.'''
+
+    handle, name = tempfile.mkstemp(suffix=suffix, prefix=prefix, dir=dir)
+    os.close(handle)
+    handle = open(name, "w+")
+    handle.write(contents)
+    handle.flush()
+    handle.seek(0)
+
+    return handle, name
+
+
+def create_fill(path, contents, mode=0o644):
+    '''Safely create a page'''
+    # make the temp file in the same dir as the destination file so we
+    # don't get invalid cross-device link errors when we rename
+    handle, name = mkstemp_fill(contents, dir=os.path.dirname(path))
+    handle.close()
+    os.rename(name, path)
+    os.chmod(path, mode)
+
+
+def login_exists(login):
+    '''Checks whether the given login exists on the system.'''
+
+    try:
+        pwd.getpwnam(login)
+        return True
+    except KeyError:
+        return False
+
+
+def group_exists(group):
+    '''Checks whether the given login exists on the system.'''
+
+    try:
+        grp.getgrnam(group)
+        return True
+    except KeyError:
+        return False
+
+
+def is_empty_file(path):
+    '''test if file is empty, returns True if so'''
+    with open(path) as fh:
+        return (len(fh.read()) == 0)
+
+
+def recursive_rm(dirPath, contents_only=False):
+    '''recursively remove directory'''
+    names = os.listdir(dirPath)
+    for name in names:
+        path = os.path.join(dirPath, name)
+        if os.path.islink(path) or not os.path.isdir(path):
+            os.unlink(path)
+        else:
+            recursive_rm(path)
+    if not contents_only:
+        os.rmdir(dirPath)
+
+
+def check_pidfile(exe, pidfile):
+    '''Checks if pid in pidfile is running'''
+    if not os.path.exists(pidfile):
+        return False
+
+    # get the pid
+    try:
+        with open(pidfile, 'r') as fd:
+            pid = fd.readline().rstrip('\n')
+    except:
+        return False
+
+    return check_pid(exe, pid)
+
+
+def check_pid(exe, pid):
+    '''Checks if pid is running'''
+    cmdline = "/proc/%s/cmdline" % (str(pid))
+    if not os.path.exists(cmdline):
+        return False
+
+    # get the command line
+    try:
+        with open(cmdline, 'r') as fd:
+            tmp = fd.readline().split('\0')
+    except:
+        return False
+
+    # this allows us to match absolute paths or just the executable name
+    if re.match('^' + exe + '$', tmp[0]) or \
+       re.match('.*/' + exe + '$', tmp[0]) or \
+       re.match('^' + exe + ': ', tmp[0]) or \
+       re.match('^\(' + exe + '\)', tmp[0]):
+        return True
+
+    return False
+
+
+def check_port(port, proto, ver=4):
+    '''Check if something is listening on the specified port.
+       WARNING: for some reason this does not work with a bind mounted /proc
+    '''
+    assert (port >= 1)
+    assert (port <= 65535)
+    assert (proto.lower() == "tcp" or proto.lower() == "udp")
+    assert (ver == 4 or ver == 6)
+
+    fn = "/proc/net/%s" % (proto)
+    if ver == 6:
+        fn += str(ver)
+
+    rc, report = cmd(['cat', fn])
+    assert (rc == 0)
+
+    hport = "%0.4x" % port
+
+    if re.search(': [0-9a-f]{8}:%s [0-9a-f]' % str(hport).lower(), report.lower()):
+        return True
+    return False
+
+
+def get_arch():
+    '''Get the current architecture'''
+    rc, report = cmd(['uname', '-m'])
+    assert (rc == 0)
+    return report.strip()
+
+
+def get_multiarch_tuple():
+    '''Get the current debian multiarch tuple'''
+
+    # XXX dpkg-architecture on Ubuntu 12.04 requires -q be adjacent to
+    # the variable name
+    rc, report = cmd(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'])
+    assert (rc == 0)
+    return report.strip()
+
+
+def get_bits():
+    '''return the default architecture number of bits (32 or 64, usually)'''
+    return platform.architecture()[0][0:2]
+
+
+def get_memory():
+    '''Gets total ram and swap'''
+    meminfo = "/proc/meminfo"
+    memtotal = 0
+    swaptotal = 0
+    if not os.path.exists(meminfo):
+        return (False, False)
+
+    try:
+        fd = open(meminfo, 'r')
+        for line in fd.readlines():
+            splitline = line.split()
+            if splitline[0] == 'MemTotal:':
+                memtotal = int(splitline[1])
+            elif splitline[0] == 'SwapTotal:':
+                swaptotal = int(splitline[1])
+        fd.close()
+    except:
+        return (False, False)
+
+    return (memtotal, swaptotal)
+
+
+def is_running_in_vm():
+    '''Check if running under a VM'''
+    # add other virtualization environments here
+    for search in ['QEMU Virtual CPU']:
+        rc, report = cmd_pipe(['dmesg'], ['grep', search])
+        if rc == 0:
+            return True
+    return False
+
+
+def ubuntu_release():
+    '''Get the Ubuntu release'''
+    f = "/etc/lsb-release"
+    try:
+        size = os.stat(f)[ST_SIZE]
+    except:
+        return "UNKNOWN"
+
+    if size > 1024 * 1024:
+        raise IOError('Could not open "%s" (too big)' % f)
+
+    with open("/etc/lsb-release", 'r') as fh:
+        lines = fh.readlines()
+
+    pat = re.compile(r'DISTRIB_CODENAME')
+    for line in lines:
+        if pat.search(line):
+            return line.split('=')[1].rstrip('\n').rstrip('\r')
+
+    return "UNKNOWN"
+
+
+def cmd(command, input=None, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, stdin=None, timeout=None, env=None, shell=False, text=True):
+    '''Try to execute given command (array) and return its stdout, or return
+    a textual error if it failed.'''
+
+    try:
+        sp = subprocess.Popen(command, stdin=stdin, stdout=stdout, stderr=stderr, close_fds=True, preexec_fn=subprocess_setup, env=env, universal_newlines=text, shell=shell)
+        if sys.version_info[0] >= 3 and sys.version_info[1] > 3:
+            out, outerr = sp.communicate(input, timeout=timeout)
+        else:
+            out, outerr = sp.communicate(input)
+    except OSError as e:
+        return [127, str(e)]
+
+    # Handle redirection of stdout
+    if out is None:
+        out = ''
+    # Handle redirection of stderr
+    if outerr is None:
+        outerr = ''
+    if text == False:
+        out = str(out)
+    return [sp.returncode, out + outerr]
+
+
+def cmd_pipe(command1, command2, input=None, stderr=subprocess.STDOUT, stdin=None):
+    '''Try to pipe command1 into command2.'''
+    try:
+        sp1 = subprocess.Popen(command1, stdin=stdin, stdout=subprocess.PIPE, stderr=stderr, close_fds=True)
+        sp2 = subprocess.Popen(command2, stdin=sp1.stdout, stdout=subprocess.PIPE, stderr=stderr, close_fds=True, universal_newlines=True)
+    except OSError as e:
+        return [127, str(e)]
+
+    out = sp2.communicate(input)[0]
+    # ensure we don't leak open files and that sp1 is stopped
+    sp1.stdout.close()
+    sp1.wait()
+    return [sp2.returncode, out]
+
+
+def cwd_has_enough_space(cdir, total_bytes):
+    '''Determine if the partition of the current working directory has 'bytes'
+       free.'''
+    rc, df_output = cmd(['df'])
+    if rc != 0:
+        result = 'df failed, got exit code %d, expected %d\n' % (rc, 0)
+        raise OSError(result)
+    if rc != 0:
+        return False
+
+    kb = total_bytes / 1024
+
+    mounts = dict()
+    for line in df_output.splitlines():
+        if '/' not in line:
+            continue
+        tmp = line.split()
+        mounts[tmp[5]] = int(tmp[3])
+
+    cdir = os.getcwd()
+    while cdir != '/':
+        if cdir not in mounts:
+            cdir = os.path.dirname(cdir)
+            continue
+        return kb < mounts[cdir]
+
+    return kb < mounts['/']
+
+
+def get_md5(filename):
+    '''Gets the md5sum of the file specified'''
+
+    (rc, report) = cmd(["/usr/bin/md5sum", "-b", filename])
+    expected = 0
+    assert (expected == rc)
+
+    return report.split(' ')[0]
+
+
+def dpkg_compare_installed_version(pkg, check, version):
+    '''Gets the version for the installed package, and compares it to the
+       specified version.
+    '''
+    (rc, report) = cmd(["/usr/bin/dpkg", "-s", pkg])
+    assert (rc == 0)
+    assert ("Status: install ok installed" in report)
+    installed_version = ""
+    for line in report.splitlines():
+        if line.startswith("Version: "):
+            installed_version = line.split()[1]
+
+    assert (installed_version != "")
+
+    (rc, report) = cmd(["/usr/bin/dpkg", "--compare-versions", installed_version, check, version])
+    assert (rc == 0 or rc == 1)
+    if rc == 0:
+        return True
+    return False
+
+
+def _run_apt_command(pkg_list, apt_cmd='install'):
+    env = os.environ.copy()
+    env['DEBIAN_FRONTEND'] = 'noninteractive'
+    # debugging version, but on precise doesn't actually run dpkg
+    # command = ['apt-get', '-y', '--force-yes', '-o', 'Dpkg::Options::=--force-confold', '-o', 'Debug::pkgDPkgPM=true', apt_cmd]
+    command = ['apt-get', '-y', '--force-yes', '-o', 'Dpkg::Options::=--force-confold', apt_cmd]
+    command.extend(pkg_list)
+    rc, report = cmd(command)
+    return rc, report
+
+
+# note: for the following install_* functions, you probably want the
+# versions in the TestlibCase class (see below)
+def install_builddeps(src_pkg):
+    rc, report = _run_apt_command([src_pkg], 'build-dep')
+    assert(rc == 0)
+
+
+def install_package(package):
+    rc, report = _run_apt_command([package], 'install')
+    assert(rc == 0)
+
+
+def install_packages(pkg_list):
+    rc, report = _run_apt_command(pkg_list, 'install')
+    assert(rc == 0)
+
+
+def prepare_source(source, builder, cached_src, build_src, patch_system):
+    '''Download and unpack source package, installing necessary build depends,
+       adjusting the permissions for the 'builder' user, and returning the
+       directory of the unpacked source. Patch system can be one of:
+       - cdbs
+       - dpatch
+       - quilt
+       - quiltv3
+       - None (not the string)
+
+       This is normally used like this:
+
+       def setUp(self):
+           ...
+           self.topdir = os.getcwd()
+           self.cached_src = os.path.join(os.getcwd(), "source")
+           self.tmpdir = tempfile.mkdtemp(prefix='testlib', dir='/tmp')
+           self.builder = testlib.TestUser()
+           testlib.cmd(['chgrp', self.builder.login, self.tmpdir])
+           os.chmod(self.tmpdir, 0o775)
+
+       def tearDown(self):
+           ...
+           self.builder = None
+           self.topdir = os.getcwd()
+           if os.path.exists(self.tmpdir):
+               testlib.recursive_rm(self.tmpdir)
+
+       def test_suite_build(self):
+           ...
+           build_dir = testlib.prepare_source('foo', \
+                                         self.builder, \
+                                         self.cached_src, \
+                                         os.path.join(self.tmpdir, \
+                                           os.path.basename(self.cached_src)),
+                                         "quilt")
+           os.chdir(build_dir)
+
+           # Example for typical build, adjust as necessary
+           print("")
+           print("  make clean")
+           rc, report = testlib.cmd(['sudo', '-u', self.builder.login, 'make', 'clean'])
+
+           print("  configure")
+           rc, report = testlib.cmd(['sudo', '-u', self.builder.login, './configure', '--prefix=%s' % self.tmpdir, '--enable-debug'])
+
+           print("  make (will take a while)")
+           rc, report = testlib.cmd(['sudo', '-u', self.builder.login, 'make'])
+
+           print("  make check (will take a while)",)
+           rc, report = testlib.cmd(['sudo', '-u', self.builder.login, 'make', 'check'])
+           expected = 0
+           result = 'Got exit code %d, expected %d\n' % (rc, expected)
+           self.assertEqual(expected, rc, result + report)
+
+        def test_suite_cleanup(self):
+            ...
+            if os.path.exists(self.cached_src):
+                testlib.recursive_rm(self.cached_src)
+
+       It is up to the caller to clean up cached_src and build_src (as in the
+       above example, often the build_src is in a tmpdir that is cleaned in
+       tearDown() and the cached_src is cleaned in a one time clean-up
+       operation (eg 'test_suite_cleanup()) which must be run after the build
+       suite test (obviously).
+       '''
+
+    # Make sure we have a clean slate
+    assert (os.path.exists(os.path.dirname(build_src)))
+    assert (not os.path.exists(build_src))
+
+    cdir = os.getcwd()
+    if os.path.exists(cached_src):
+        shutil.copytree(cached_src, build_src)
+        os.chdir(build_src)
+    else:
+        # Only install the build dependencies on the initial setup
+        install_builddeps(source)
+        os.makedirs(build_src)
+        os.chdir(build_src)
+
+        # These are always needed
+        pkgs = ['build-essential', 'dpkg-dev', 'fakeroot']
+        install_packages(pkgs)
+
+        rc, report = cmd(['apt-get', 'source', source])
+        assert (rc == 0)
+        shutil.copytree(build_src, cached_src)
+        print("(unpacked %s)" % os.path.basename(glob.glob('%s_*.dsc' % source)[0]), end=' ')
+
+    unpacked_dir = os.path.join(build_src, glob.glob('%s-*' % source)[0])
+
+    # Now apply the patches. Do it here so that we don't mess up our cached
+    # sources.
+    os.chdir(unpacked_dir)
+    assert (patch_system in ['cdbs', 'dpatch', 'quilt', 'quiltv3', None])
+    if patch_system is not None and patch_system != "quiltv3":
+        if patch_system == "quilt":
+            os.environ.setdefault('QUILT_PATCHES', 'debian/patches')
+            rc, report = cmd(['quilt', 'push', '-a'])
+            assert (rc == 0)
+        elif patch_system == "cdbs":
+            rc, report = cmd(['./debian/rules', 'apply-patches'])
+            assert (rc == 0)
+        elif patch_system == "dpatch":
+            rc, report = cmd(['dpatch', 'apply-all'])
+            assert (rc == 0)
+
+    cmd(['chown', '-R', '%s:%s' % (builder.uid, builder.gid), build_src])
+    os.chdir(cdir)
+
+    return unpacked_dir
+
+
+def get_changelog_version(source_dir):
+    '''Extract a package version from a changelog'''
+    package_version = ""
+
+    changelog_file = os.path.join(source_dir, "debian/changelog")
+
+    if os.path.exists(changelog_file):
+        changelog = open(changelog_file, 'r')
+        header = changelog.readline().split()
+        package_version = header[1].strip('()')
+
+    return package_version
+
+
+def _aa_status():
+    '''Get aa-status output'''
+    exe = "/usr/sbin/aa-status"
+    assert (os.path.exists(exe))
+    if os.geteuid() == 0:
+        return cmd([exe])
+    return cmd(['sudo', exe])
+
+
+def is_apparmor_loaded(path):
+    '''Check if profile is loaded'''
+    rc, report = _aa_status()
+    if rc != 0:
+        return False
+
+    for line in report.splitlines():
+        if line.endswith(path):
+            return True
+    return False
+
+
+def is_apparmor_confined(path):
+    '''Check if application is confined'''
+    rc, report = _aa_status()
+    if rc != 0:
+        return False
+
+    for line in report.splitlines():
+        if re.search('%s \(' % path, line):
+            return True
+    return False
+
+
+def check_apparmor(path, first_ubuntu_release, is_running=True):
+    '''Check if path is loaded and confined for everything higher than the
+       first Ubuntu release specified.
+
+       Usage:
+        rc, report = testlib.check_apparmor('/usr/sbin/foo', 8.04, is_running=True)
+        if rc < 0:
+            return self._skipped(report)
+
+        expected = 0
+        result = 'Got exit code %d, expected %d\n' % (rc, expected)
+        self.assertEqual(expected, rc, result + report)
+     '''
+    global manager
+    rc = -1
+
+    if manager.lsb_release["Release"] < first_ubuntu_release:
+        return (rc, "Skipped apparmor check")
+
+    if not os.path.exists('/sbin/apparmor_parser'):
+        return (rc, "Skipped (couldn't find apparmor_parser)")
+
+    rc = 0
+    msg = ""
+    if not is_apparmor_loaded(path):
+        rc = 1
+        msg = "Profile not loaded for '%s'" % path
+
+    # this check only makes sense it the 'path' is currently executing
+    if is_running and rc == 0 and not is_apparmor_confined(path):
+        rc = 1
+        msg = "'%s' is not running in enforce mode" % path
+
+    return (rc, msg)
+
+
+def get_gcc_version(gcc, full=True):
+    gcc_version = 'none'
+    if not gcc.startswith('/'):
+        gcc = '/usr/bin/%s' % (gcc)
+    if os.path.exists(gcc):
+        gcc_version = 'unknown'
+        lines = cmd([gcc, '-v'])[1].strip().splitlines()
+        version_lines = [x for x in lines if x.startswith('gcc version')]
+        if len(version_lines) == 1:
+            gcc_version = " ".join(version_lines[0].split()[2:])
+    if not full:
+        return gcc_version.split()[0]
+    return gcc_version
+
+
+def is_kdeinit_running():
+    '''Test if kdeinit is running'''
+    # applications that use kdeinit will spawn it if it isn't running in the
+    # test. This is a problem because it does not exit. This is a helper to
+    # check for it.
+    rc, report = cmd(['ps', 'x'])
+    if 'kdeinit4 Running' not in report:
+        print("kdeinit not running (you may start/stop any KDE application then run this script again)", file=sys.stderr)
+        return False
+    return True
+
+
+def get_pkgconfig_flags(libs=[]):
+    '''Find pkg-config flags for libraries'''
+    assert (len(libs) > 0)
+    rc, pkg_config = cmd(['pkg-config', '--cflags', '--libs'] + libs)
+    expected = 0
+    if rc != expected:
+        print('Got exit code %d, expected %d\n' % (rc, expected), file=sys.stderr)
+    assert(rc == expected)
+    return pkg_config.split()
+
+
+def cap_to_name(cap_num):
+    '''given an integer, return the capability name'''
+    rc, output = cmd(['capsh', '--decode=%x' % cap_num])
+    expected = 0
+    if rc != expected:
+        print('capsh: got exit code %d, expected %d\n' % (rc, expected), file=sys.stderr)
+    cap_name = output.strip().split('=')[1]
+    return cap_name
+
+
+def enumerate_capabilities():
+    i = 0
+    cap_list = []
+    done = False
+    while not done:
+        cap_name = cap_to_name(pow(2, i))
+        if cap_name == str(i):
+            done = True
+        else:
+            cap_list.append(cap_name)
+            i += 1
+        if i > 64:
+            done = True
+    return cap_list
+
+
+def _run_snap_install(snapname, track="latest/stable", classic=False):
+    # crude, but effective
+    if os.path.exists(os.path.join("/snap", snapname)):
+        return 0, ""
+
+    command = ["snap", "install", "--channel=%s" % track, snapname]
+    if classic:
+        command.append("--classic")
+    rc, report = cmd(command)
+    return rc, report
+
+
+def _run_snap_remove(snapname):
+    # crude, but effective
+    if not os.path.exists(os.path.join("/snap", snapname)):
+        return 0, ""
+
+    command = ["snap", "remove", "--purge", snapname]
+    rc, report = cmd(command)
+    return rc, report
+
+
+def install_snap(self, snapname, track="latest/stable", classic=False):
+    rc, report = _run_snap_install(snapname, track, classic)
+    self.assertEqual(0, rc, "Failed to install snap %s\nOutput:\n%s" %
+                            (snapname, report))
+
+
+def remove_snap(self, snapname):
+    rc, report = _run_snap_remove(snapname)
+    self.assertEqual(0, rc, "Failed to install snap %s\nOutput:\n%s" %
+                            (snapname, report))
+
+
+class TestDaemon:
+    '''Helper class to manage daemons consistently'''
+    def __init__(self, service_name):
+        '''Setup daemon attributes'''
+        if os.path.isfile('/usr/sbin/service') or os.path.islink('/usr/sbin/service'):
+            self.test_daemon_commands = ['service', service_name]
+        else:
+            self.test_daemon_commands = ['/etc/init.d/' + service_name]
+
+    def _run_command(self, action, seconds_to_wait=2):
+        command = list(self.test_daemon_commands)
+        command.append(action)
+        rc, report = cmd(command)
+        expected = 0
+        result = 'Got exit code %d, expected %d\n' % (rc, expected)
+        time.sleep(seconds_to_wait)
+        if expected != rc:
+            return False, result + report
+
+        if "fail" in report:
+            return False, "Found 'fail' in report\n" + report
+
+        return True, ""
+
+    def start(self):
+        '''Start daemon'''
+        return self._run_command('start')
+
+    def stop(self):
+        '''Stop daemon'''
+        return self._run_command('stop')
+
+    def reload(self):
+        '''Reload daemon'''
+        return self._run_command('force-reload')
+
+    def restart(self):
+        if self.test_daemon_commands[0] == 'service':
+            return self._run_command('restart')
+        else:
+            '''Restart daemon'''
+            (res, str) = self.stop()
+            if not res:
+                return res, str
+
+            (res, str) = self.start()
+            if not res:
+                return res, str
+
+            return True, ""
+
+    def force_restart(self):
+        '''Restart daemon even if already stopped'''
+        self.stop()
+
+        (res, str) = self.start()
+        if not res:
+            return res, str
+
+        return True, ""
+
+    def status(self):
+        '''Check daemon status'''
+        return self._run_command('status')
+
+
+class TestlibManager(object):
+    '''Singleton class used to set up per-test-run information'''
+    def __init__(self):
+        # Set glibc aborts to dump to stderr instead of the tty so test output
+        # is more sane.
+        os.environ.setdefault('LIBC_FATAL_STDERR_', '1')
+
+        # check verbosity
+        self.verbosity = False
+        if (len(sys.argv) > 1 and '-v' in sys.argv[1:]):
+            self.verbosity = True
+
+        # Load LSB release file
+        self.lsb_release = dict()
+        if not os.path.exists('/usr/bin/lsb_release') and not os.path.exists('/bin/lsb_release'):
+            raise OSError("Please install 'lsb-release'")
+        for line in subprocess.Popen(['lsb_release', '-a'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True).communicate()[0].splitlines():
+            field, value = line.split(':', 1)
+            value = value.strip()
+            field = field.strip()
+            # Convert numerics
+            try:
+                value = float(value)
+            except:
+                pass
+            self.lsb_release.setdefault(field, value)
+
+        # FIXME: hack OEM releases into known-Ubuntu versions
+        if self.lsb_release['Distributor ID'] == "HP MIE (Mobile Internet Experience)":
+            if self.lsb_release['Release'] == 1.0:
+                self.lsb_release['Distributor ID'] = "Ubuntu"
+                self.lsb_release['Release'] = 8.04
+            else:
+                raise OSError("Unknown version of HP MIE")
+
+        # FIXME: hack to assume a most-recent release if we're not
+        # running under Ubuntu.
+        if self.lsb_release['Distributor ID'] not in ["Ubuntu", "Linaro"]:
+            self.lsb_release['Release'] = 10000
+        # Adjust Linaro release to pretend to be Ubuntu
+        if self.lsb_release['Distributor ID'] in ["Linaro"]:
+            self.lsb_release['Distributor ID'] = "Ubuntu"
+            self.lsb_release['Release'] -= 0.01
+
+        # Load arch
+        if not os.path.exists('/usr/bin/dpkg'):
+            machine = cmd(['uname', '-m'])[1].strip()
+            if machine.endswith('86'):
+                self.dpkg_arch = 'i386'
+            elif machine.endswith('_64'):
+                self.dpkg_arch = 'amd64'
+            elif machine.startswith('arm'):
+                self.dpkg_arch = 'armel'
+            else:
+                raise ValueError("Unknown machine type '%s'" % (machine))
+        else:
+            self.dpkg_arch = cmd(['dpkg', '--print-architecture'])[1].strip()
+
+        # Find kernel version
+        self.kernel_is_ubuntu = False
+        self.kernel_version_signature = None
+        self.kernel_version = cmd(["uname", "-r"])[1].strip()
+        versig = '/proc/version_signature'
+        if os.path.exists(versig):
+            self.kernel_is_ubuntu = True
+            self.kernel_version_signature = open(versig).read().strip()
+            self.kernel_version_ubuntu = self.kernel_version
+        elif os.path.exists('/usr/bin/dpkg'):
+            # this can easily be inaccurate but is only an issue for Dapper
+            rc, out = cmd(['dpkg', '-l', 'linux-image-%s' % (self.kernel_version)])
+            if rc == 0:
+                self.kernel_version_signature = out.strip().split('\n').pop().split()[2]
+                self.kernel_version_ubuntu = self.kernel_version_signature
+        if self.kernel_version_signature is None:
+            # Attempt to fall back to something for non-Debian-based
+            self.kernel_version_signature = self.kernel_version
+            self.kernel_version_ubuntu = self.kernel_version
+        # Build ubuntu version without hardware suffix
+        try:
+            self.kernel_version_ubuntu = "-".join([x for x in self.kernel_version_signature.split(' ')[1].split('-') if re.search('^[0-9]', x)])
+        except:
+            pass
+
+        # Find gcc version
+        self.gcc_version = get_gcc_version('gcc')
+
+        # Find libc
+        self.path_libc = [x.split()[2] for x in cmd(['ldd', '/bin/ls'])[1].splitlines() if x.startswith('\tlibc.so.')][0]
+
+        # Report self
+        if self.verbosity:
+            kernel = self.kernel_version_ubuntu
+            if kernel != self.kernel_version_signature:
+                kernel += " (%s)" % (self.kernel_version_signature)
+            print("Running test: '%s' distro: '%s %.2f' kernel: '%s' arch: '%s' uid: %d/%d SUDO_USER: '%s')" % (
+                sys.argv[0],
+                self.lsb_release['Distributor ID'],
+                self.lsb_release['Release'],
+                kernel,
+                self.dpkg_arch,
+                os.geteuid(), os.getuid(),
+                os.environ.get('SUDO_USER', '')), file=sys.stdout)
+            sys.stdout.flush()
+
+        # Additional heuristics
+        # if os.environ.get('SUDO_USER', os.environ.get('USER', '')) in ['mdeslaur']:
+        #    sys.stdout.write("Replying to Marc Deslauriers in http://launchpad.net/bugs/%d: " % random.randint(600000, 980000))
+        #    sys.stdout.flush()
+        #    time.sleep(0.5)
+        #    sys.stdout.write("destroyed\n")
+        #    time.sleep(0.5)
+
+    def hello(self, msg):
+        print("Hello from %s" % (msg), file=sys.stderr)
+# The central instance
+manager = TestlibManager()
+
+
+class TestlibCase(unittest.TestCase):
+    def __init__(self, *args):
+        '''This is called for each TestCase test instance, which isn't much better
+           than SetUp.'''
+
+        unittest.TestCase.__init__(self, *args)
+
+        # Attach to and duplicate dicts from manager singleton
+        self.manager = manager
+        # self.manager.hello(repr(self) + repr(*args))
+        self.my_verbosity = self.manager.verbosity
+        self.lsb_release = self.manager.lsb_release
+        self.dpkg_arch = self.manager.dpkg_arch
+        self.kernel_version = self.manager.kernel_version
+        self.kernel_version_signature = self.manager.kernel_version_signature
+        self.kernel_version_ubuntu = self.manager.kernel_version_ubuntu
+        self.kernel_is_ubuntu = self.manager.kernel_is_ubuntu
+        self.gcc_version = self.manager.gcc_version
+        self.path_libc = self.manager.path_libc
+
+    def version_compare(self, one, two):
+        if 'version_compare' in dir(apt_pkg):
+            return apt_pkg.version_compare(one, two)
+        else:
+            return apt_pkg.VersionCompare(one, two)
+
+    def assertFileType(self, filename, filetype, strict=True):
+        '''Checks the file type of the file specified'''
+
+        (rc, report, out) = self._testlib_shell_cmd(["/usr/bin/file", "-b", filename])
+        out = out.strip()
+        expected = 0
+        # Absolutely no idea why this happens on Hardy
+        if self.lsb_release['Release'] == 8.04 and rc == 255 and len(out) > 0:
+            rc = 0
+        result = 'Got exit code %d, expected %d:\n%s\n' % (rc, expected, report)
+        self.assertEqual(expected, rc, result)
+
+        if strict:
+            filetype = '^%s$' % (filetype)
+        else:
+            # accept if the beginning of the line matches
+            filetype = '^%s' % (filetype)
+        result = 'File type reported by file: [%s], expected regex: [%s]\n' % (out, filetype)
+        self.assertNotEqual(None, re.search(filetype, out), result)
+
+    def yank_commonname_from_cert(self, certfile):
+        '''Extract the commonName from a given PEM'''
+        rc, out = cmd(['openssl', 'asn1parse', '-in', certfile])
+        if rc == 0:
+            ready = False
+            for line in out.splitlines():
+                if ready:
+                    return line.split(':')[-1]
+                if ':commonName' in line:
+                    ready = True
+        return socket.getfqdn()
+
+    def announce(self, text):
+        if self.my_verbosity:
+            print("(%s) " % (text), file=sys.stderr, end='')
+            sys.stdout.flush()
+
+    def make_clean(self):
+        rc, output = self.shell_cmd(['make', 'clean'])
+        self.assertEqual(rc, 0, output)
+
+    def get_makefile_compiler(self):
+        # Find potential compiler name
+        compiler = 'gcc'
+        if os.path.exists('Makefile'):
+            for line in open('Makefile'):
+                if line.startswith('CC') and '=' in line:
+                    items = [x.strip() for x in line.split('=')]
+                    if items[0] == 'CC':
+                        compiler = items[1]
+                        break
+        return compiler
+
+    def make_target(self, target, expected=0):
+        '''Compile a target and report output'''
+
+        compiler = self.get_makefile_compiler()
+        rc, output = self.shell_cmd(['make', target])
+        self.assertEqual(rc, expected, 'rc(%d)!=%d:\n' % (rc, expected) + output)
+        self.assertTrue('%s ' % (compiler) in output, 'Expected "%s":' % (compiler) + output)
+        return output
+
+    # call as   return testlib.skipped()
+    def _skipped(self, reason=""):
+        '''Provide a visible way to indicate that a test was skipped'''
+        if reason != "":
+            reason = ': %s' % (reason)
+        self.announce("skipped%s" % (reason))
+        return False
+
+    def _testlib_shell_cmd(self, args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=None):
+        argstr = "'" + "', '".join(args).strip() + "'"
+        rc, out = cmd(args, stdin=stdin, stdout=stdout, stderr=stderr, env=env)
+        report = 'Command: ' + argstr + '\nOutput:\n' + out
+        return rc, report, out
+
+    def shell_cmd(self, args, stdin=None):
+        return cmd(args, stdin=stdin)
+
+    def assertShellExitEquals(self, expected, args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=None, msg="", bare_report=False):
+        '''Test a shell command matches a specific exit code'''
+        rc, report, out = self._testlib_shell_cmd(args, stdin=stdin, stdout=stdout, stderr=stderr, env=env)
+        result = 'Got exit code %d, expected %d\n' % (rc, expected)
+        self.assertEqual(expected, rc, msg + result + report)
+        if bare_report:
+            return out
+        else:
+            return report
+
+    def assertShellExitSuccess(self, args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=None, msg="", bare_report=False):
+        '''Same as assertShellEquals but with an expected exit status of 0 (success).'''
+        return self.assertShellExitEquals(0, args, stdin, stdout, stderr, env, msg, bare_report)
+
+    # make sure exit value is in a list of expected values
+    def assertShellExitIn(self, expected, args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, msg=""):
+        '''Test a shell command matches a specific exit code'''
+        rc, report, out = self._testlib_shell_cmd(args, stdin=stdin, stdout=stdout, stderr=stderr)
+        result = 'Got exit code %d, expected one of %s\n' % (rc, ', '.join(map(str, expected)))
+        self.assertIn(rc, expected, msg + result + report)
+
+    def assertShellExitNotEquals(self, unwanted, args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, msg=""):
+        '''Test a shell command doesn't match a specific exit code'''
+        rc, report, out = self._testlib_shell_cmd(args, stdin=stdin, stdout=stdout, stderr=stderr)
+        result = 'Got (unwanted) exit code %d\n' % rc
+        self.assertNotEqual(unwanted, rc, msg + result + report)
+
+    def assertShellOutputContains(self, text, args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, msg="", invert=False, expected=None):
+        '''Test a shell command contains a specific output'''
+        rc, report, out = self._testlib_shell_cmd(args, stdin=stdin, stdout=stdout, stderr=stderr)
+        result = 'Got exit code %d.  Looking for text "%s"\n' % (rc, text)
+        if not invert:
+            self.assertTrue(text in out, msg + result + report)
+        else:
+            self.assertFalse(text in out, msg + result + report)
+        if expected is not None:
+            result = 'Got exit code %d. Expected %d (%s)\n' % (rc, expected, " ".join(args))
+            self.assertEqual(rc, expected, msg + result + report)
+
+    def assertShellOutputEquals(self, text, args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, msg="", invert=False, expected=None):
+        '''Test a shell command matches a specific output'''
+        rc, report, out = self._testlib_shell_cmd(args, stdin=stdin, stdout=stdout, stderr=stderr)
+        result = 'Got exit code %d. Looking for exact text "%s" (%s)\n' % (rc, text, " ".join(args))
+        if not invert:
+            self.assertEqual(text, out, msg + result + report)
+        else:
+            self.assertNotEqual(text, out, msg + result + report)
+        if expected is not None:
+            result = 'Got exit code %d. Expected %d (%s)\n' % (rc, expected, " ".join(args))
+            self.assertEqual(rc, expected, msg + result + report)
+
+    def _word_find(self, report, content, invert=False):
+        '''Check for a specific string'''
+        if invert:
+            warning = 'Found "%s"\n' % content
+            self.assertTrue(content not in report, warning + report)
+        else:
+            warning = 'Could not find "%s"\n' % content
+            self.assertTrue(content in report, warning + report)
+
+    def _test_sysctl_value(self, path, expected, msg=None, exists=True):
+        sysctl = '/proc/sys/%s' % (path)
+        self.assertEqual(exists, os.path.exists(sysctl), sysctl)
+        value = None
+        if exists:
+            with open(sysctl) as sysctl_fd:
+                value = int(sysctl_fd.read())
+            report = "%s is not %d: %d" % (sysctl, expected, value)
+            if msg:
+                report += " (%s)" % (msg)
+            self.assertEqual(value, expected, report)
+        return value
+
+    def set_sysctl_value(self, path, desired):
+        sysctl = '/proc/sys/%s' % (path)
+        self.assertTrue(os.path.exists(sysctl), "%s does not exist" % (sysctl))
+        with open(sysctl, 'w') as sysctl_fh:
+            sysctl_fh.write(str(desired))
+        self._test_sysctl_value(path, desired)
+
+    def kernel_at_least(self, introduced):
+        return self.version_compare(self.kernel_version_ubuntu,
+                                    introduced) >= 0
+
+    def kernel_claims_cve_fixed(self, cve):
+        changelog = "/usr/share/doc/linux-image-%s/changelog.Debian.gz" % (self.kernel_version)
+        if os.path.exists(changelog):
+            for line in gzip.open(changelog):
+                if cve in line and "revert" not in line and "Revert" not in line:
+                    return True
+        return False
+
+    def install_builddeps(self, src_pkg):
+        rc, report = _run_apt_command([src_pkg], 'build-dep')
+        self.assertEqual(0, rc, 'Failed to install build-deps for %s\nOutput:\n%s' % (src_pkg, report))
+
+    def install_package(self, package):
+        rc, report = _run_apt_command([package], 'install')
+        self.assertEqual(0, rc, 'Failed to install package %s\nOutput:\n%s' % (package, report))
+
+    def install_packages(self, pkg_list):
+        rc, report = _run_apt_command(pkg_list, 'install')
+        self.assertEqual(0, rc, 'Failed to install packages %s\nOutput:\n%s' % (','.join(pkg_list), report))
+
+    def install_snap(self, snapname, track="latest/stable", classic=False):
+        rc, report = _run_snap_install(snapname, track, classic)
+        self.assertEqual(0, rc, "Failed to install snap %s\nOutput:\n%s" %
+                                (snapname, report))
+
+    def remove_snap(self, snapname):
+        rc, report = _run_snap_remove(snapname)
+        self.assertEqual(0, rc, "Failed to install snap %s\nOutput:\n%s" %
+                                (snapname, report))
+
+
+class TestGroup:
+    '''Create a temporary test group and remove it again in the dtor.'''
+
+    def __init__(self, group=None, lower=False):
+        '''Create a new group'''
+
+        self.group = None
+        if group:
+            if group_exists(group):
+                raise ValueError('group name already exists')
+        else:
+            while(True):
+                group = random_string(7, lower=lower)
+                if not group_exists(group):
+                    break
+
+        assert subprocess.call(['groupadd', group]) == 0
+        self.group = group
+        g = grp.getgrnam(self.group)
+        self.gid = g[2]
+
+    def __del__(self):
+        '''Remove the created group.'''
+
+        if self.group:
+            rc, report = cmd(['groupdel', self.group])
+            assert rc == 0
+
+
+class TestUser:
+    '''Create a temporary test user and remove it again in the dtor.'''
+
+    def __init__(self, login=None, home=True, group=None, uidmin=None, lower=False, shell=None):
+        '''Create a new user account with a random password.
+
+        By default, the login name is random, too, but can be explicitly
+        specified with 'login'. By default, a home directory is created, this
+        can be suppressed with 'home=False'.'''
+
+        self.login = None
+
+        if os.geteuid() != 0:
+            raise ValueError("You must be root to run this test")
+
+        if login:
+            if login_exists(login):
+                raise ValueError('login name already exists')
+        else:
+            while(True):
+                login = 't' + random_string(7, lower=lower)
+                if not login_exists(login):
+                    break
+
+        # when fips is enabled, python2.7 crypt.crypt() returns None
+        # for DES salts for being too weak. Force sha256 with "$5$" for
+        # the salt. XXX in python3, the salt is optional and will
+        # generate strong passwords automatically.
+        self.salt = "$5$%s" % random_string(2)
+        self.password = random_string(8, lower=lower)
+        self.crypted = crypt.crypt(self.password, self.salt)
+
+        creation = ['useradd', '-p', self.crypted]
+        if home:
+            creation += ['-m']
+        if group:
+            creation += ['-G', group]
+        if uidmin:
+            creation += ['-K', 'UID_MIN=%d' % uidmin]
+        if shell:
+            creation += ['-s', shell]
+        creation += [login]
+        assert subprocess.call(creation) == 0
+        # Set GECOS
+        assert subprocess.call(['usermod', '-c', 'Buddy %s' % (login), login]) == 0
+
+        self.login = login
+        p = pwd.getpwnam(self.login)
+        self.uid   = p[2]
+        self.gid   = p[3]
+        self.gecos = p[4]
+        self.home  = p[5]
+        self.shell = p[6]
+
+    def __del__(self):
+        '''Remove the created user account.'''
+
+        if self.login:
+            # sanity check the login name so we don't accidentally wipe too much
+            if len(self.login) > 3 and '/' not in self.login:
+                subprocess.call(['rm', '-rf', '/home/' + self.login, '/var/mail/' + self.login])
+            rc, report = cmd(['userdel', '-f', self.login])
+            assert rc == 0
+
+    def add_to_group(self, group):
+        '''Add user to the specified group name'''
+        rc, report = cmd(['usermod', '-G', group, self.login])
+        if rc != 0:
+            print(report)
+        assert rc == 0
+
+
+class AddUser:
+    '''Create a temporary test user and remove it again in the dtor.'''
+
+    def __init__(self, login=None, home=True, encrypt_home=False, group=None, lower=False, shell=None):
+        '''Create a new user account with a random password.
+
+        By default, the login name is random, too, but can be explicitly
+        specified with 'login'. By default, a home directory is created, this
+        can be suppressed with 'home=False'.
+
+        This class differs from the TestUser class in that the adduser/deluser
+        tools are used rather than the useradd/user/del tools. The adduser
+        program is the only commandline program that can be used to add a new
+        user with an encrypted home directory. It is possible that the AddUser
+        class may replace the TestUser class in the future.'''
+
+        self.login = None
+
+        if os.geteuid() != 0:
+            raise ValueError("You must be root to run this test")
+
+        if login:
+            if login_exists(login):
+                raise ValueError('login name already exists')
+        else:
+            while(True):
+                login = 't' + random_string(7, lower=True)
+                if not login_exists(login):
+                    break
+
+        self.password = random_string(8, lower=lower)
+
+        creation = ['adduser', '--quiet']
+
+        if not home:
+            creation += ['--no-create-home']
+        elif encrypt_home:
+            creation += ['--encrypt-home']
+
+        if shell:
+            creation += ['--shell', shell]
+
+        creation += ['--gecos', 'Buddy %s' % (login), login]
+
+        child = pexpect.spawn(creation.pop(0), creation, timeout=5)
+        assert child.expect(b'(Enter new UNIX|New) password:') == 0
+        child.sendline(self.password)
+        assert child.expect(b'Retype new (UNIX )?password:') == 0
+        child.sendline(self.password)
+
+        child.wait()
+        child.close()
+        assert child.exitstatus == 0
+        assert child.signalstatus is None
+
+        self.login = login
+
+        if group:
+            assert self.add_to_group(group) == 0
+
+        p = pwd.getpwnam(self.login)
+        self.uid   = p[2]
+        self.gid   = p[3]
+        self.gecos = p[4]
+        self.home  = p[5]
+        self.shell = p[6]
+
+    def __del__(self):
+        '''Remove the created user account.'''
+
+        if self.login: