Merge ~fheimes/ubuntu/+source/s390-tools:s390-tools-sru-lp1892367-focal into ubuntu/+source/s390-tools:ubuntu/focal-devel

[Frank Heimes]

s390-tools-sru-lp1892367-focal
    debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch
    Compile with ZDEV_ALWAYS_UPDATE_INITRD=1 option.
    This fixes calls to chzdev to trigger update-initramfs -u.
    (LP: #1892367)

Test build is available here:
https://launchpad.net/~fheimes/+archive/ubuntu/lp1892367

Unmerged commits

3a37b28... by Frank Heimes on 2021-03-11

  * debian/rules for debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch activation

df3ecb1... by Frank Heimes on 2021-03-11

  * debian/changelog for debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch

c874f7a... by Frank Heimes on 2021-03-11

  * debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch
    Compile with ZDEV_ALWAYS_UPDATE_INITRD=1 option. This fixes calls to chzdev to trigger update-initramfs -u. (LP: #1892367)

diff --git a/debian/changelog b/debian/changelog
index 402dbc6..dd6539d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+s390-tools (2.12.0-0ubuntu3.3) focal; urgency=medium
+
+  * debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch
+    Compile with ZDEV_ALWAYS_UPDATE_INITRD=1 option.
+    This fixes calls to chzdev to trigger update-initramfs -u.
+    Thanks to Vineeth Vijayan (LP: #1892367)
+
+ -- Frank Heimes <[e-mail]>  Thu, 11 Mar 2021 18:13:30 +0100
+
 s390-tools (2.12.0-0ubuntu3.2) focal; urgency=medium
 
   * debian/patches/s390-tools-sru-lp1903984-focal.patch
diff --git a/debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch b/debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch
new file mode 100644
index 0000000..a9baf57
--- /dev/null
+++ b/debian/patches/0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch
@@ -0,0 +1,247 @@
+From 7dd03eaeecdd0e2674f145aca34be1275d291bd8 Mon Sep 17 00:00:00 2001
+From: Vineeth Vijayan <[e-mail]>
+Date: Thu, 10 Dec 2020 18:52:27 +0100
+Subject: [PATCH] zdev: Add build option to update initial RAM-disk by default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some Linux distributions always include a copy of all persistent device
+configuration data when updating the initial RAM-disk. This makes
+chzdev's persistent device configuration changes ineffective because
+device configuration directives applied in the RAM-disk take precedence
+over those stored in the root filesystem.
+
+This patch introduces a new build-time switch which allows distributions
+to specify that whenever there is a persistent device configuration
+change, the RAM-disk is updated automatically.
+
+This feature can be enabled by adding 'ZDEV_ALWAYS_UPDATE_INITRD=1' as
+a zdev build option. Where, by default ZDEV_ALWAYS_UPDATE_INITRD is 0.
+
+Co-developed-by: Peter Oberparleiter <[e-mail]>
+Signed-off-by: Peter Oberparleiter <[e-mail]>
+Signed-off-by: Vineeth Vijayan <[e-mail]>
+Reviewed-by: Peter Oberparleiter <[e-mail]>
+Signed-off-by: Jan Höppner <[e-mail]>
+
+Author: Vineeth Vijayan <[e-mail]>
+Origin: upstream, https://github.com/ibm-s390-linux/s390-tools/commit/7dd03eaeecdd0e2674f145aca34be1275d291bd8
+Bug-IBM: Bugzilla 187578
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1892367
+Applied-Upstream: >= 2.16.0
+Reviewed-by: Frank Heimes <[e-mail]>
+Last-Update: 2021-03-11
+
+---
+ README.md           | 20 +++++++++---
+ zdev/include/root.h |  2 +-
+ zdev/src/Makefile   | 10 ++++++
+ zdev/src/chzdev.c   |  2 +-
+ zdev/src/root.c     | 76 +++++++++++++++++++++++++++++++++++++++------
+ 5 files changed, 95 insertions(+), 15 deletions(-)
+
+diff --git a/README.md b/README.md
+index 5a2153c9..44a90d72 100644
+--- a/README.md
++++ b/README.md
+@@ -284,10 +284,11 @@ build options:
+ 
+ This table lists additional build or install options:
+ 
+-| __COMPONENT__  | __OPTION__       | __TOOLS__                       |
+-|----------------|:----------------:|:-------------------------------:|
+-| dracut         | `HAVE_DRACUT`    | zdev                            |
+-| initramfs-tools| `HAVE_INITRAMFS` | zdev                            |
++| __COMPONENT__    | __OPTION__                   | __TOOLS__      |
++|------------------|:----------------------------:|:--------------:|
++| dracut           | `HAVE_DRACUT`                | zdev           |
++| initramfs-tools  | `HAVE_INITRAMFS`             | zdev           |
++|                  | `ZDEV_ALWAYS_UPDATE_INITRD`  | zdev           |
+ 
+ The s390-tools build process uses "pkg-config" if available and hard-coded
+ compiler and linker options otherwise.
+@@ -378,6 +379,17 @@ the different tools are provided:
+   Distributors with different boot or RAM-disk mechanisms should provide
+   a custom zdev-root-update helper script.
+ 
++  - `ZDEV_ALWAYS_UPDATE_INITRD=1` upon modification of any persistent device
++    configuration, chzdev updates the initial RAM-disk by default, without any
++    additional user interaction.
++
++  For some distributions, all the configuration attributes must be copied to
++  the initial RAM-disk. Because the device configuration directives applied
++  in the initial RAM-disk takes precedence over those stored in the root file-
++  system. This copying is done usually by explicitly invoking a command. This
++  build option makes it user-friendly and does this copying without any manual
++  intervention.
++
+   Some functions of zdev require that the following programs are available:
+ 
+   - modprobe (kmod)
+diff --git a/zdev/include/root.h b/zdev/include/root.h
+index 6fd78e7e..d15d3934 100644
+--- a/zdev/include/root.h
++++ b/zdev/include/root.h
+@@ -12,6 +12,6 @@
+ 
+ #include "exit_code.h"
+ 
+-exit_code_t root_check(void);
++exit_code_t initrd_check(bool all_pers);
+ 
+ #endif /* ROOT_H */
+diff --git a/zdev/src/Makefile b/zdev/src/Makefile
+index e9be1e2e..40a18792 100644
+--- a/zdev/src/Makefile
++++ b/zdev/src/Makefile
+@@ -4,6 +4,16 @@ include ../../common.mak
+ ALL_CPPFLAGS += -I ../include -std=gnu99 -Wno-unused-parameter \
+ 	-Wno-missing-field-initializers
+ 
++# Adding ZDEV_ALWAYS_UPDATE_INITRD=1 option will update the initial RAM-disk
++# without the user interaction upon the modification of a persistent device
++# configuration.
++
++ifeq ($(ZDEV_ALWAYS_UPDATE_INITRD),1)
++ALL_CPPFLAGS += -DZDEV_ALWAYS_UPDATE_INITRD=true
++else
++ALL_CPPFLAGS += -DZDEV_ALWAYS_UPDATE_INITRD=false
++endif
++
+ # Core
+ chzdev_objects += attrib.o chzdev.o device.o devnode.o devtype.o exit_code.o \
+ 		  export.o hash.o inuse.o misc.o namespace.o opts.o path.o \
+diff --git a/zdev/src/chzdev.c b/zdev/src/chzdev.c
+index 4e453335..76f7309d 100644
+--- a/zdev/src/chzdev.c
++++ b/zdev/src/chzdev.c
+@@ -3027,7 +3027,7 @@ int main(int argc, char *argv[])
+ 	    !dryrun) {
+ 		/* If the root device/device type or early devices have been
+ 		 * modified, additional work might be necessary. */
+-		rc = root_check();
++		rc = initrd_check(ZDEV_ALWAYS_UPDATE_INITRD);
+ 		if (rc && !drc)
+ 			drc = rc;
+ 	}
+diff --git a/zdev/src/root.c b/zdev/src/root.c
+index a6d9e0cc..385b7787 100644
+--- a/zdev/src/root.c
++++ b/zdev/src/root.c
+@@ -58,11 +58,50 @@ static void add_early_removed(struct util_list *selected)
+ 	}
+ }
+ 
++static void add_pers_removed(struct util_list *strlist)
++{
++	int i, j;
++	struct devtype *dt;
++	struct subtype *st;
++	struct device *dev;
++
++	for (i = 0; devtypes[i]; i++) {
++		dt = devtypes[i];
++		for (j = 0; dt->subtypes[j]; j++) {
++			st = dt->subtypes[j];
++			util_list_iterate(&st->devices->hash.list, dev) {
++				if (dev->persistent.deconfigured) {
++					strlist_add(strlist, "%s %s",
++						    dev->subtype->devname, dev->id);
++				}
++			}
++		}
++	}
++}
++
++static bool is_zdev_early_0(struct selected_dev_node *sel)
++{
++	struct setting *s;
++	struct device *dev;
++
++	dev = device_list_find(sel->st->devices, sel->id, NULL);
++	if (!dev)
++		return false;
++	s = setting_list_find(dev->persistent.settings,
++			      internal_attr_early.name);
++	if (!s)
++		return false;
++	if (s->specified && strcmp(s->value, "0") == 0)
++		return true;
++
++	return false;
++}
++
+ /* Determine if initial RAM-disk needs updating. If so, run the corresponding
+  * scripts if available. */
+-exit_code_t root_check(void)
++exit_code_t initrd_check(bool all_pers)
+ {
+-	struct util_list *selected, *params, *mod = NULL;
++	struct util_list *selected, *params, *mod = strlist_new();
+ 	struct selected_dev_node *sel;
+ 	struct device *dev;
+ 	char *params_str;
+@@ -76,6 +115,20 @@ exit_code_t root_check(void)
+ 	/* Get list of devices that provide the root device or require
+ 	 * early configuration. */
+ 	selected = selected_dev_list_new();
++
++	if (all_pers) {
++		/* Add all persistently configured devices. */
++		select = select_opts_new();
++		select->configured = 1;
++		select_devices(select, selected, 1, 0, 0, config_persistent,
++			       scope_mandatory, err_ignore);
++		select_opts_free(select);
++
++		/* Ensure that removed devices are considered. */
++		add_pers_removed(mod);
++		goto check_mod;
++	}
++
+ 	/* First add devices that had zdev:early removed or changed to 0.
+ 	 * The subsequent call to select_devices() will filter out any
+ 	 * duplicates. */
+@@ -95,8 +148,8 @@ exit_code_t root_check(void)
+ 		       err_ignore);
+ 	select_opts_free(select);
+ 
++check_mod:
+ 	/* Determine if any of the devices or device types has been modified. */
+-	mod = strlist_new();
+ 	util_list_iterate(selected, sel) {
+ 		dt = sel->st->devtype;
+ 
+@@ -127,17 +180,22 @@ exit_code_t root_check(void)
+ 		goto out;
+ 	}
+ 
+-	/* Ask for confirmation. */
+-	if (!confirm("Update initial RAM-disk now?")) {
+-		rc = EXIT_ABORTED;
+-		goto out;
++	if (!all_pers) {
++		/* Ask for confirmation. */
++		if (!confirm("Update initial RAM-disk now?")) {
++			rc = EXIT_ABORTED;
++			goto out;
++		}
+ 	}
+ 
+ 	/* Build the command line. */
+ 	params = strlist_new();
+ 	util_list_iterate(selected, sel) {
+-		strlist_add(params, "%s", sel->st->name);
+-		strlist_add(params, "%s", sel->id);
++		/* From the selected list, remove the devices with zdev:early=0 */
++		if (!is_zdev_early_0(sel)) {
++			strlist_add(params, "%s", sel->st->name);
++			strlist_add(params, "%s", sel->id);
++		}
+ 	}
+ 	params_str = strlist_flatten(params, " ");
+ 	strlist_free(params);
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 894d113..7959b7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -113,3 +113,4 @@ f742ed73e1db99dc04b821a1f9aa4a852584e4d8.patch
 s390-tools-sru-lp1903984-focal.patch
 s390-tools-sru-lp1908371-focal.patch
 s390-tools-sru-lp1902179-focal.patch
+0001-zdev-Add-build-option-to-update-initial-RAM-disk-by-default.patch
diff --git a/debian/rules b/debian/rules
index 4b6756c..833ad06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_LDFLAGS_MAINT_APPEND=-rdynamic
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-options= V=1 HAVE_SNMP=1 SYSTEMDSYSTEMUNITDIR=/lib/systemd/system
+options= V=1 HAVE_SNMP=1 SYSTEMDSYSTEMUNITDIR=/lib/systemd/system ZDEV_ALWAYS_UPDATE_INITRD=1
 
 # Enable signing in Launchpad Only for now
 SIGN_SIPL=