Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2018-06-03 12:31:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Sun Jun 3 12:31:00 2018 rev:260 rq:613090 version:5.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2018-04-26 13:33:22.918302886 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2018-06-03 12:31:01.503568533 +0200 @@ -1,0 +2,8 @@ +Wed May 30 14:37:49 UTC 2018 - [email protected] + +- merge gh#openSUSE/linuxrc#169 +- write s390 config values into /boot/zipl/active_devices.txt + (bsc#1095062) +- 5.1.12 + +-------------------------------------------------------------------- Old: ---- linuxrc-5.1.11.tar.xz New: ---- linuxrc-5.1.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.sSSMSv/_old 2018-06-03 12:31:05.019439819 +0200 +++ /var/tmp/diff_new_pack.sSSMSv/_new 2018-06-03 12:31:05.047438794 +0200 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 5.1.11 +Version: 5.1.12 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-5.1.11.tar.xz -> linuxrc-5.1.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.11/VERSION new/linuxrc-5.1.12/VERSION --- old/linuxrc-5.1.11/VERSION 2018-04-20 11:56:38.000000000 +0200 +++ new/linuxrc-5.1.12/VERSION 2018-05-30 16:37:49.000000000 +0200 @@ -1 +1 @@ -5.1.11 +5.1.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.11/changelog new/linuxrc-5.1.12/changelog --- old/linuxrc-5.1.11/changelog 2018-04-20 11:56:38.000000000 +0200 +++ new/linuxrc-5.1.12/changelog 2018-05-30 16:37:49.000000000 +0200 @@ -1,3 +1,8 @@ +2018-05-30: 5.1.12 + - merge gh#openSUSE/linuxrc#169 + - write s390 config values into /boot/zipl/active_devices.txt + (bsc#1095062) + 2018-04-20: 5.1.11 - merge gh#openSUSE/linuxrc#168 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.11/linuxrc.c new/linuxrc-5.1.12/linuxrc.c --- old/linuxrc-5.1.11/linuxrc.c 2018-04-20 11:56:38.000000000 +0200 +++ new/linuxrc-5.1.12/linuxrc.c 2018-05-30 16:37:49.000000000 +0200 @@ -1089,6 +1089,7 @@ if(util_read_and_chop("/sys/firmware/ipl/device", device, sizeof device)) { sprintf(cmd,"/sbin/chzdev -e zfcp-host --no-root-update %s",device); + util_write_active_devices("%s\n", device); if(!config.test) lxrc_run(cmd); if(util_read_and_chop("/sys/firmware/ipl/wwpn", wwpn, sizeof wwpn)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.11/net.c new/linuxrc-5.1.12/net.c --- old/linuxrc-5.1.11/net.c 2018-04-20 11:56:38.000000000 +0200 +++ new/linuxrc-5.1.12/net.c 2018-05-30 16:37:49.000000000 +0200 @@ -1599,11 +1599,13 @@ sprintf(cmd, "/sbin/chzdev -e ctc --no-root-update %s-%s protocol=%d", config.hwp.readchan, config.hwp.writechan, config.hwp.protocol - 1); else sprintf(cmd, "/sbin/chzdev -e ctc --no-root-update %s-%s", config.hwp.readchan, config.hwp.writechan); + util_write_active_devices("%s,%s\n", config.hwp.readchan, config.hwp.writechan); break; case di_390net_hsi: case di_390net_osa: if (config.hwp.interface == di_osa_lcs) { sprintf(cmd, "/sbin/chzdev -e lcs --no-root-update %s-%s", config.hwp.readchan, config.hwp.writechan); + util_write_active_devices("%s,%s\n", config.hwp.readchan, config.hwp.writechan); /* For whatever reason, LCS devices need to be enabled twice before they * actually come online. So, we execute lxrc_run here, and again after the end * of the case statement. */ @@ -1618,6 +1620,7 @@ config.hwp.readchan, config.hwp.writechan, config.hwp.datachan); + util_write_active_devices("%s,%s,%s\n", config.hwp.readchan, config.hwp.writechan, config.hwp.datachan); } break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.11/util.c new/linuxrc-5.1.12/util.c --- old/linuxrc-5.1.11/util.c 2018-04-20 11:56:38.000000000 +0200 +++ new/linuxrc-5.1.12/util.c 2018-05-30 16:37:49.000000000 +0200 @@ -5555,3 +5555,25 @@ config.core_setup = 1; } + +/* + * Write s390 config values into /boot/zipl/active_devices.txt + * (see bsc#1095062). + */ +void util_write_active_devices(char *format, ...) +{ + const char *file_name = "/boot/zipl/active_devices.txt"; + va_list args; + FILE *f; + + f = fopen(file_name, "a"); + if(f) { + va_start(args, format); + vfprintf(f, format, args); + va_end(args); + fclose(f); + } + else { + log_info("failed to open %s\n", file_name); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.11/util.h new/linuxrc-5.1.12/util.h --- old/linuxrc-5.1.11/util.h 2018-04-20 11:56:38.000000000 +0200 +++ new/linuxrc-5.1.12/util.h 2018-05-30 16:37:49.000000000 +0200 @@ -158,3 +158,5 @@ void util_set_hostname(char *hostname); void util_run_debugshell(void); void util_setup_coredumps(void); + +void util_write_active_devices(char *format, ...) __attribute__ ((format (printf, 1, 2)));
