Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2019-05-03 22:27:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Fri May 3 22:27:23 2019 rev:269 rq:700121 version:6.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2019-03-27 16:12:37.731648791 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new.5148/linuxrc.changes 2019-05-03 22:27:25.688337709 +0200 @@ -1,0 +2,9 @@ +Thu May 2 12:00:28 UTC 2019 - wfeldt@opensuse.org + +- merge gh#openSUSE/linuxrc#188 +- add 'autoassembly' boot option to prevent MD/RAID autoassembly + (bsc#1132688) +- simplify code +- 6.0.10 + +-------------------------------------------------------------------- Old: ---- linuxrc-6.0.9.tar.xz New: ---- linuxrc-6.0.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.DjUztZ/_old 2019-05-03 22:27:26.224338807 +0200 +++ /var/tmp/diff_new_pack.DjUztZ/_new 2019-05-03 22:27:26.228338816 +0200 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 6.0.9 +Version: 6.0.10 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-6.0.9.tar.xz -> linuxrc-6.0.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.9/VERSION new/linuxrc-6.0.10/VERSION --- old/linuxrc-6.0.9/VERSION 2019-03-19 15:00:53.000000000 +0100 +++ new/linuxrc-6.0.10/VERSION 2019-05-02 14:00:28.000000000 +0200 @@ -1 +1 @@ -6.0.9 +6.0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.9/changelog new/linuxrc-6.0.10/changelog --- old/linuxrc-6.0.9/changelog 2019-03-19 15:00:53.000000000 +0100 +++ new/linuxrc-6.0.10/changelog 2019-05-02 14:00:28.000000000 +0200 @@ -1,3 +1,9 @@ +2019-05-02: 6.0.10 + - merge gh#openSUSE/linuxrc#188 + - add 'autoassembly' boot option to prevent MD/RAID autoassembly + (bsc#1132688) + - simplify code + 2019-03-19: 6.0.9 - merge gh#openSUSE/linuxrc#187 - fix network dialog workflow when VLAN is active (bsc#1124654) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.9/file.c new/linuxrc-6.0.10/file.c --- old/linuxrc-6.0.9/file.c 2019-03-19 15:00:53.000000000 +0100 +++ new/linuxrc-6.0.10/file.c 2019-05-02 14:00:28.000000000 +0200 @@ -312,6 +312,7 @@ { key_ibft_devices, "IBFTDevices", kf_cfg + kf_cmd }, { key_linuxrc_core, "LinuxrcCore", kf_cfg + kf_cmd_early }, { key_norepo, "NoRepo", kf_cfg + kf_cmd }, + { key_auto_assembly, "AutoAssembly", kf_cfg + kf_cmd_early }, }; static struct { @@ -1771,6 +1772,10 @@ if(f->is.numeric) config.norepo = f->nvalue; break; + case key_auto_assembly: + if(f->is.numeric) config.auto_assembly = f->nvalue; + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.9/file.h new/linuxrc-6.0.10/file.h --- old/linuxrc-6.0.9/file.h 2019-03-19 15:00:53.000000000 +0100 +++ new/linuxrc-6.0.10/file.h 2019-05-02 14:00:28.000000000 +0200 @@ -56,7 +56,7 @@ key_withipoib, key_upgrade, key_media_upgrade, key_ifcfg, key_defaultinstall, key_nanny, key_vlanid, key_sshkey, key_systemboot, key_sethostname, key_debugshell, key_self_update, - key_ibft_devices, key_linuxrc_core, key_norepo + key_ibft_devices, key_linuxrc_core, key_norepo, key_auto_assembly } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.9/global.h new/linuxrc-6.0.10/global.h --- old/linuxrc-6.0.9/global.h 2019-03-19 15:00:53.000000000 +0100 +++ new/linuxrc-6.0.10/global.h 2019-05-02 14:00:28.000000000 +0200 @@ -447,6 +447,7 @@ unsigned extend_running:1; /**< currently running an 'extend' job */ unsigned repomd:1; /**< install repo is repo-md */ unsigned norepo:1; /**< disable repo location check, expect YaST */ + unsigned auto_assembly:1; /**< enable MD/RAID auto-assembly */ struct { unsigned check:1; /**< check for braille displays and start brld if found */ char *dev; /**< braille device */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.9/linuxrc.c new/linuxrc-6.0.10/linuxrc.c --- old/linuxrc-6.0.9/linuxrc.c 2019-03-19 15:00:53.000000000 +0100 +++ new/linuxrc-6.0.10/linuxrc.c 2019-05-02 14:00:28.000000000 +0200 @@ -800,6 +800,7 @@ config.udev_mods = 1; config.devtmpfs = 1; config.kexec = 2; /* kexec if necessary, with user dialog */ + config.auto_assembly = 1; /* default to allow MD/RAID auto-assembly for now (bsc#1132688) */ // defaults for self-update feature config.self_update_url = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.9/util.c new/linuxrc-6.0.10/util.c --- old/linuxrc-6.0.9/util.c 2019-03-19 15:00:53.000000000 +0100 +++ new/linuxrc-6.0.10/util.c 2019-05-02 14:00:28.000000000 +0200 @@ -4573,6 +4573,21 @@ } +/* + * Outsource some setup tasks to shell scripts. + * + * Several linuxrc config settings are passed as environment vars to the + * scripts: + * + * config.loghost -> $LOGHOST + * !config.auto_assembly -> $linuxrc_no_auto_assembly + * config.debug -> $linuxrc_debug + * + * /etc/install.inf is available when the scripts run. + * + * Scripts can pass settings back to linuxrc by putting them into + * /tmp/script.result (ususal info-file syntax). + */ void util_run_script(char *name) { char *buf = NULL; @@ -4588,6 +4603,11 @@ setenv("linuxrc_debug", buf, 1); } + /* pass the negated setting to stay compatible */ + if(!config.auto_assembly) { + setenv("linuxrc_no_auto_assembly", "1", 1); + } + if(config.loghost) setenv("LOGHOST", config.loghost, 1); strprintf(&buf, "/scripts/%s", name);