diff -pruN 0.0.60/debian/changelog 0.0.60ubuntu1/debian/changelog --- 0.0.60/debian/changelog 2017-12-10 19:59:00.000000000 +0000 +++ 0.0.60ubuntu1/debian/changelog 2018-01-17 11:12:47.000000000 +0000 @@ -1,3 +1,13 @@ +s390-netdevice (0.0.60ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Skip s390-netdevice module, if there are no qeth/ctc devices to + configure which is the case in modern KVM based installation, as well + as LPAR and z/VM with PCI network cards. Closes: #825931 + - Default to level2 qeth mode by default. + + -- Dimitri John Ledkov Wed, 17 Jan 2018 11:12:47 +0000 + s390-netdevice (0.0.60) unstable; urgency=medium [ Updated translations ] @@ -69,6 +79,16 @@ s390-netdevice (0.0.52) unstable; urgenc -- Christian Perrier Fri, 03 Feb 2017 18:35:16 +0100 +s390-netdevice (0.0.51ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Skip s390-netdevice module, if there are no qeth/ctc devices to + configure which is the case in modern KVM based installation, as well + as LPAR and z/VM with PCI network cards. Closes: #825931 + - Default to level2 qeth mode by default. + + -- Dimitri John Ledkov Thu, 19 Jan 2017 15:05:39 +0000 + s390-netdevice (0.0.51) unstable; urgency=medium [ Updated translations ] @@ -76,6 +96,16 @@ s390-netdevice (0.0.51) unstable; urgenc -- Christian Perrier Tue, 17 Jan 2017 08:11:26 +0100 +s390-netdevice (0.0.50ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Skip s390-netdevice module, if there are no qeth/ctc devices to + configure which is the case in modern KVM based installation, as well + as LPAR and z/VM with PCI network cards. Closes: #825931 + - Default to level2 qeth mode by default. + + -- Dimitri John Ledkov Tue, 06 Dec 2016 15:26:48 +0100 + s390-netdevice (0.0.50) unstable; urgency=medium [ Philipp Kern ] @@ -87,6 +117,16 @@ s390-netdevice (0.0.50) unstable; urgenc -- Christian Perrier Wed, 23 Nov 2016 07:27:08 +0100 +s390-netdevice (0.0.48ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Skip s390-netdevice module, if there are no qeth/ctc devices to + configure which is the case in modern KVM based installation, as well + as LPAR and z/VM with PCI network cards. Closes: #825931 + - Default to level2 qeth mode by default. + + -- Dimitri John Ledkov Mon, 21 Nov 2016 14:06:03 +0000 + s390-netdevice (0.0.48) unstable; urgency=medium [ Updated translations ] @@ -131,6 +171,21 @@ s390-netdevice (0.0.43) unstable; urgenc -- Christian Perrier Wed, 09 Mar 2016 06:47:27 +0100 +s390-netdevice (0.0.42ubuntu2) yakkety; urgency=medium + + * Skip s390-netdevice module, if there are no qeth/ctc devices to + configure which is the case in modern KVM based installation, as well + as LPAR and z/VM with PCI network cards. Closes: #825931 + + -- Dimitri John Ledkov Thu, 02 Jun 2016 11:16:14 +0100 + +s390-netdevice (0.0.42ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Default to level2 qeth mode by default. + + -- Dimitri John Ledkov Mon, 07 Mar 2016 12:07:33 +0000 + s390-netdevice (0.0.42) unstable; urgency=medium [ Updated translations ] @@ -146,6 +201,13 @@ s390-netdevice (0.0.41) unstable; urgenc -- Christian Perrier Mon, 15 Feb 2016 18:35:27 +0100 +s390-netdevice (0.0.40ubuntu1) xenial; urgency=low + + * Merge from Debian unstable LP: #1536649. Remaining changes: + - Default to level2 qeth mode by default. + + -- Dimitri John Ledkov Sun, 07 Feb 2016 05:16:30 +0000 + s390-netdevice (0.0.40) unstable; urgency=medium [ Colin Watson ] @@ -159,6 +221,14 @@ s390-netdevice (0.0.40) unstable; urgenc -- Philipp Kern Sun, 07 Feb 2016 01:41:26 +0100 +s390-netdevice (0.0.39ubuntu1) xenial; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from Debian unstable LP: #1539727. Remaining changes: + - Default to level2 qeth mode by default. LP: #1526801 + + -- Dimitri John Ledkov Tue, 02 Feb 2016 16:22:21 +0000 + s390-netdevice (0.0.39) unstable; urgency=medium [ Hendrik Brueckner ] @@ -167,6 +237,12 @@ s390-netdevice (0.0.39) unstable; urgenc -- Philipp Kern Fri, 29 Jan 2016 04:00:47 +0100 +s390-netdevice (0.0.38ubuntu1) xenial; urgency=high + + * Default to level2 qeth mode by default. LP: #1526801 + + -- Dimitri John Ledkov Wed, 16 Dec 2015 15:49:52 +0000 + s390-netdevice (0.0.38) unstable; urgency=medium [ Updated translations ] @@ -992,3 +1068,4 @@ s390-netdevice (0.0.1) unstable; urgency - fix depends -- Bastian Blank Wed, 13 Nov 2002 18:04:06 +0100 + diff -pruN 0.0.60/debian/control 0.0.60ubuntu1/debian/control --- 0.0.60/debian/control 2016-01-30 04:10:28.000000000 +0000 +++ 0.0.60ubuntu1/debian/control 2017-12-11 03:45:26.000000000 +0000 @@ -1,7 +1,8 @@ Source: s390-netdevice Section: debian-installer Priority: standard -Maintainer: Debian Install System Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Bastian Blank , Philipp Kern , Christian Perrier Build-Depends: debhelper (>= 9), po-debconf (>= 0.5.0), libsysfs-dev, libdebconfclient0-dev (>= 0.47), libdebian-installer-dev Vcs-Browser: https://anonscm.debian.org/cgit/d-i/s390-netdevice.git diff -pruN 0.0.60/debian/s390-netdevice.templates 0.0.60ubuntu1/debian/s390-netdevice.templates --- 0.0.60/debian/s390-netdevice.templates 2016-01-29 04:04:33.000000000 +0000 +++ 0.0.60ubuntu1/debian/s390-netdevice.templates 2017-12-11 03:45:26.000000000 +0000 @@ -82,7 +82,7 @@ _Description: Port: Template: s390-netdevice/qeth/layer2 Type: boolean -Default: false +Default: true # :sl5: _Description: Use this device in layer2 mode? By default OSA-Express cards use layer3 mode. In that mode LLC headers diff -pruN 0.0.60/netdevice.c 0.0.60ubuntu1/netdevice.c --- 0.0.60/netdevice.c 2016-10-24 03:04:33.000000000 +0000 +++ 0.0.60ubuntu1/netdevice.c 2017-12-11 03:45:26.000000000 +0000 @@ -294,6 +294,13 @@ static enum state_wanted detect_devices static enum state_wanted get_networktype (void) { + /* Check if there is anything to activate */ + if ((di_tree_size (channels) == 0) && + (di_tree_size (devices) == 0)) { + syslog (LOG_ERR, "No qeth/ctc network devices found, skipping s390-netdevice."); + return WANT_FINISH; + } + char *ptr; int ret = my_debconf_input ("critical", TEMPLATE_PREFIX "choose_networktype", &ptr);