Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2020-06-27 23:22:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Sat Jun 27 23:22:04 2020 rev:286 rq:816826 version:7.0.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2020-06-05
20:09:41.645637954 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.3060/linuxrc.changes
2020-06-27 23:22:09.449738880 +0200
@@ -1,0 +2,8 @@
+Wed Jun 24 12:01:57 UTC 2020 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#225
+- s390: set rd.zdev=no-auto if auto-config has been turned off
+ (bsc#1168036)
+- 7.0.18
+
+--------------------------------------------------------------------
Old:
----
linuxrc-7.0.17.tar.xz
New:
----
linuxrc-7.0.18.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.1282iQ/_old 2020-06-27 23:22:10.117741076 +0200
+++ /var/tmp/diff_new_pack.1282iQ/_new 2020-06-27 23:22:10.121741089 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 7.0.17
+Version: 7.0.18
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-7.0.17.tar.xz -> linuxrc-7.0.18.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.17/VERSION new/linuxrc-7.0.18/VERSION
--- old/linuxrc-7.0.17/VERSION 2020-06-03 14:56:12.000000000 +0200
+++ new/linuxrc-7.0.18/VERSION 2020-06-24 14:01:57.000000000 +0200
@@ -1 +1 @@
-7.0.17
+7.0.18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.17/changelog new/linuxrc-7.0.18/changelog
--- old/linuxrc-7.0.17/changelog 2020-06-03 14:56:12.000000000 +0200
+++ new/linuxrc-7.0.18/changelog 2020-06-24 14:01:57.000000000 +0200
@@ -1,3 +1,8 @@
+2020-06-24: 7.0.18
+ - merge gh#openSUSE/linuxrc#225
+ - s390: set rd.zdev=no-auto if auto-config has been turned off
+ (bsc#1168036)
+
2020-06-03: 7.0.17
- merge gh#openSUSE/linuxrc#224
- replace $releasever in URLs, similar to libzypp (bsc#1171018)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.17/file.c new/linuxrc-7.0.18/file.c
--- old/linuxrc-7.0.17/file.c 2020-06-03 14:56:12.000000000 +0200
+++ new/linuxrc-7.0.18/file.c 2020-06-24 14:01:57.000000000 +0200
@@ -318,6 +318,7 @@
{ key_norepo, "NoRepo", kf_cfg + kf_cmd },
{ key_auto_assembly, "AutoAssembly", kf_cfg + kf_cmd_early },
{ key_device_auto_config, "DeviceAutoConfig", kf_cfg + kf_cmd_early },
+ { key_rd_zdev, "rd.zdev", kf_cfg + kf_cmd_early },
};
static struct {
@@ -1809,6 +1810,12 @@
if(f->is.numeric) config.device_auto_config = f->nvalue;
break;
+ case key_rd_zdev:
+ if(!strcmp(f->value, "no-auto")) {
+ config.device_auto_config = 0;
+ }
+ break;
+
default:
break;
}
@@ -1899,7 +1906,6 @@
char file_name[256], *s;
slist_t *sl;
file_t *ft0, *ft;
- int i;
url_t *url = config.url.install;
if(!url) return;
@@ -2012,16 +2018,35 @@
ft0 = file_read_cmdline(kf_cmd + kf_cmd_early + kf_boot);
- for(i = 0, ft = ft0; ft; ft = ft->next) {
+ slist_t *parm_list = NULL;
+
+ for(ft = ft0; ft; ft = ft->next) {
if(
ft->key == key_none ||
ft->key == key_vga
) {
- fprintf(f, "%s%s", i ? " " : "Cmdline: ", ft->unparsed);
- i = 1;
+ slist_append_str(&parm_list, ft->unparsed);
}
}
- if(i) fprintf(f, "\n");
+
+#if defined(__s390x__)
+ /*
+ * bsc#1168036
+ *
+ * If device auto-config has been disabled pass this setting on to the
target system.
+ */
+ if(config.device_auto_config == 0 && util_has_device_auto_config()) {
+ slist_append_str(&parm_list, "rd.zdev=no-auto");
+ }
+#endif
+
+ if(parm_list) {
+ char *str = slist_join(" ", parm_list);
+ fprintf(f, "Cmdline: %s\n", str);
+ free(str);
+ }
+
+ slist_free(parm_list);
file_free_file(ft0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.17/file.h new/linuxrc-7.0.18/file.h
--- old/linuxrc-7.0.17/file.h 2020-06-03 14:56:12.000000000 +0200
+++ new/linuxrc-7.0.18/file.h 2020-06-24 14:01:57.000000000 +0200
@@ -57,7 +57,7 @@
key_nanny, key_vlanid,
key_sshkey, key_systemboot, key_sethostname, key_debugshell, key_self_update,
key_ibft_devices, key_linuxrc_core, key_norepo, key_auto_assembly,
key_autoyast_parse,
- key_device_auto_config, key_autoyast_passurl
+ key_device_auto_config, key_autoyast_passurl, key_rd_zdev
} file_key_t;
typedef enum {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.17/util.c new/linuxrc-7.0.18/util.c
--- old/linuxrc-7.0.17/util.c 2020-06-03 14:56:12.000000000 +0200
+++ new/linuxrc-7.0.18/util.c 2020-06-24 14:01:57.000000000 +0200
@@ -121,8 +121,6 @@
static int cmp_alpha_s(const void *p0, const void *p1);
static slist_t *get_kernel_list(char *dev);
-static int has_device_auto_config(void);
-
void util_redirect_kmsg()
{
static char newvt[2] = { 11, 4 /* console 4 */ };
@@ -5709,7 +5707,7 @@
{
unsigned do_it = config.device_auto_config;
- if(do_it && !has_device_auto_config()) do_it = 0;
+ if(do_it && !util_has_device_auto_config()) do_it = 0;
if(do_it == 2) {
int win_old = config.win;
@@ -5725,6 +5723,10 @@
log_info("applying I/O device auto-configuration\n");
util_run_script("device_auto_config");
config.device_auto_config_done = 1;
+ config.device_auto_config = 1;
+ }
+ else {
+ config.device_auto_config = 0;
}
}
@@ -5732,7 +5734,7 @@
/*
* Check if S390 I/O device auto-config data is available.
*/
-int has_device_auto_config()
+int util_has_device_auto_config()
{
FILE *f;
int has_it = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.17/util.h new/linuxrc-7.0.18/util.h
--- old/linuxrc-7.0.17/util.h 2020-06-03 14:56:12.000000000 +0200
+++ new/linuxrc-7.0.18/util.h 2020-06-24 14:01:57.000000000 +0200
@@ -166,3 +166,4 @@
void util_reparse_blockdev_urls(void);
void util_device_auto_config(void);
+int util_has_device_auto_config(void);
