Hello community, here is the log from the commit of package linuxrc for openSUSE:Leap:15.2 checked in at 2020-04-14 14:20:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/linuxrc (Old) and /work/SRC/openSUSE:Leap:15.2/.linuxrc.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Tue Apr 14 14:20:21 2020 rev:107 rq:792543 version:7.0.13 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/linuxrc/linuxrc.changes 2020-04-08 12:48:51.882357284 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.linuxrc.new.3248/linuxrc.changes 2020-04-14 14:20:28.229251621 +0200 @@ -1,0 +2,10 @@ +Mon Apr 6 14:48:37 UTC 2020 - [email protected] + +- merge gh#openSUSE/linuxrc#220 +- make I/O device pre-configuration optional (bsc#1168036, + jsc#SLE-7396) +- add check for pre-config data +- change displayed texts to 'auto-configuration' +- 7.0.13 + +-------------------------------------------------------------------- Old: ---- linuxrc-7.0.12.tar.xz New: ---- linuxrc-7.0.13.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.lm77CB/_old 2020-04-14 14:20:28.633251924 +0200 +++ /var/tmp/diff_new_pack.lm77CB/_new 2020-04-14 14:20:28.633251924 +0200 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 7.0.12 +Version: 7.0.13 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-7.0.12.tar.xz -> linuxrc-7.0.13.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/VERSION new/linuxrc-7.0.13/VERSION --- old/linuxrc-7.0.12/VERSION 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/VERSION 2020-04-06 16:48:37.000000000 +0200 @@ -1 +1 @@ -7.0.12 +7.0.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/changelog new/linuxrc-7.0.13/changelog --- old/linuxrc-7.0.12/changelog 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/changelog 2020-04-06 16:48:37.000000000 +0200 @@ -1,3 +1,10 @@ +2020-04-06: 7.0.13 + - merge gh#openSUSE/linuxrc#220 + - make I/O device pre-configuration optional (bsc#1168036, + jsc#SLE-7396) + - add check for pre-config data + - change displayed texts to 'auto-configuration' + 2020-04-02: 7.0.12 - merge gh#openSUSE/linuxrc#219 - parse 'try' keyword in ifcfg option (jsc#SLE-8965, jsc#SLE-9791) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/dialog.c new/linuxrc-7.0.13/dialog.c --- old/linuxrc-7.0.12/dialog.c 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/dialog.c 2020-04-06 16:48:37.000000000 +0200 @@ -57,6 +57,7 @@ { di_set_usessh, "Enable or Disable SSH Mode", }, { di_set_startshell, "Start shell before and after YaST?", }, { di_set_slp, "Get SLP info", }, + { di_set_auto_config, "I/O device auto-configuration" }, { di_inst_install, "Installation", }, { di_inst_update, "Upgrade", }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/dialog.h new/linuxrc-7.0.13/dialog.h --- old/linuxrc-7.0.12/dialog.h 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/dialog.h 2020-04-06 16:48:37.000000000 +0200 @@ -43,6 +43,7 @@ di_set_usessh, di_set_startshell, di_set_slp, + di_set_auto_config, di_inst_install, di_inst_update, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/file.c new/linuxrc-7.0.13/file.c --- old/linuxrc-7.0.12/file.c 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/file.c 2020-04-06 16:48:37.000000000 +0200 @@ -316,6 +316,7 @@ { 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 }, + { key_device_auto_config, "DeviceAutoConfig", kf_cfg + kf_cmd_early }, }; static struct { @@ -328,6 +329,7 @@ { "yes", 1 }, { "j", 1 }, // keep for compatibility? { "default", 1 }, + { "ask", 2 }, { "Undef", 0 }, { "Mono", 1 }, { "Color", 2 }, @@ -1798,6 +1800,10 @@ if(f->is.numeric) config.auto_assembly = f->nvalue; break; + case key_device_auto_config: + if(f->is.numeric) config.device_auto_config = f->nvalue; + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/file.h new/linuxrc-7.0.13/file.h --- old/linuxrc-7.0.12/file.h 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/file.h 2020-04-06 16:48:37.000000000 +0200 @@ -56,7 +56,8 @@ 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_auto_assembly, key_autoyast_parse + key_ibft_devices, key_linuxrc_core, key_norepo, key_auto_assembly, key_autoyast_parse, + key_device_auto_config } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/global.h new/linuxrc-7.0.13/global.h --- old/linuxrc-7.0.12/global.h 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/global.h 2020-04-06 16:48:37.000000000 +0200 @@ -450,6 +450,8 @@ unsigned norepo:1; /**< disable repo location check, expect YaST */ unsigned auto_assembly:1; /**< enable MD/RAID auto-assembly */ unsigned autoyast_parse:1; /**< analyse autoyast parameter */ + unsigned device_auto_config:2; /**< run s390 device auto-config (cf. bsc#1168036) */ + unsigned device_auto_config_done:1; /**< set after s390 device auto-config has been run */ 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-7.0.12/linuxrc.c new/linuxrc-7.0.13/linuxrc.c --- old/linuxrc-7.0.12/linuxrc.c 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/linuxrc.c 2020-04-06 16:48:37.000000000 +0200 @@ -808,6 +808,9 @@ config.kexec = 2; /* kexec if necessary, with user dialog */ config.auto_assembly = 0; /* default to disable MD/RAID auto-assembly (bsc#1132688) */ config.autoyast_parse = 1; /* analyse autoyast option and read autoyast file */ +#if defined(__s390x__) + config.device_auto_config = 2; /* ask before doing s390 device auto config */ +#endif // defaults for self-update feature config.self_update_url = NULL; @@ -1044,6 +1047,8 @@ LXRC_WAIT + util_device_auto_config(); + /* look for driver updates in initrd */ util_chk_driver_update("/", "/"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/settings.c new/linuxrc-7.0.13/settings.c --- old/linuxrc-7.0.12/settings.c 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/settings.c 2020-04-06 16:48:37.000000000 +0200 @@ -181,6 +181,9 @@ di_set_startshell, di_set_slp, di_inst_net_config, +#if defined(__s390x__) + di_set_auto_config, +#endif di_none }; @@ -302,6 +305,12 @@ rc = 1; break; + case di_set_auto_config: + config.device_auto_config = 2; + util_device_auto_config(); + rc = 1; + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/util.c new/linuxrc-7.0.13/util.c --- old/linuxrc-7.0.12/util.c 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/util.c 2020-04-06 16:48:37.000000000 +0200 @@ -121,6 +121,7 @@ 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() { @@ -1204,6 +1205,7 @@ add_flag(&sl0, buf, config.self_update, "self_update"); add_flag(&sl0, buf, config.repomd, "repomd"); add_flag(&sl0, buf, config.norepo, "norepo"); + add_flag(&sl0, buf, config.device_auto_config, "deviceautoconfig"); if(*buf) slist_append_str(&sl0, buf); if(config.self_update_url) { @@ -5672,3 +5674,50 @@ util_reparse_blockdev_url(&config.url.install); util_reparse_blockdev_url(&config.url.instsys); } + +/* + * Apply S390 I/O device auto-config. + * + * Ask user before doing so, if requested. + */ +void util_device_auto_config() +{ + unsigned do_it = config.device_auto_config; + + if(do_it && !has_device_auto_config()) do_it = 0; + + if(do_it == 2) { + int win_old = config.win; + char *msg = config.device_auto_config_done ? + "Reapply I/O device auto-configuration?" : "Apply I/O device auto-configuration?"; + + if(!config.win) util_disp_init(); + do_it = dia_yesno(msg, YES) == YES; + if(config.win && !win_old) util_disp_done(); + } + + if(do_it) { + log_info("applying I/O device auto-configuration\n"); + util_run_script("device_auto_config"); + config.device_auto_config_done = 1; + } +} + + +/* + * Check if S390 I/O device auto-config data is available. + */ +int has_device_auto_config() +{ + FILE *f; + int has_it = 0; + + if((f = fopen("/sys/firmware/sclp_sd/config/data", "r"))) { + has_it = fgetc(f) != EOF; + fclose(f); + } + + log_info("has I/O device auto-config data: %d\n", has_it); + + return has_it; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.12/util.h new/linuxrc-7.0.13/util.h --- old/linuxrc-7.0.12/util.h 2020-04-02 10:37:54.000000000 +0200 +++ new/linuxrc-7.0.13/util.h 2020-04-06 16:48:37.000000000 +0200 @@ -163,3 +163,5 @@ void util_reparse_blockdev_url(url_t **url_ptr); void util_reparse_blockdev_urls(void); + +void util_device_auto_config(void);
