Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2018-03-16 10:35:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Fri Mar 16 10:35:43 2018 rev:256 rq:587526 version:5.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2018-02-28 20:01:32.774537742 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2018-03-16 10:35:44.736900011 +0100 @@ -1,0 +2,7 @@ +Thu Mar 15 13:49:25 UTC 2018 - [email protected] + +- merge gh#openSUSE/linuxrc#165 +- be carefull with 'kexec -s', it's not always available (bsc#1076839) +- 5.1.7 + +-------------------------------------------------------------------- Old: ---- linuxrc-5.1.6.tar.xz New: ---- linuxrc-5.1.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.iiDBb1/_old 2018-03-16 10:35:45.572869912 +0100 +++ /var/tmp/diff_new_pack.iiDBb1/_new 2018-03-16 10:35:45.580869623 +0100 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 5.1.6 +Version: 5.1.7 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-5.1.6.tar.xz -> linuxrc-5.1.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.6/VERSION new/linuxrc-5.1.7/VERSION --- old/linuxrc-5.1.6/VERSION 2018-02-26 12:00:42.000000000 +0100 +++ new/linuxrc-5.1.7/VERSION 2018-03-15 14:49:25.000000000 +0100 @@ -1 +1 @@ -5.1.6 +5.1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.6/auto2.c new/linuxrc-5.1.7/auto2.c --- old/linuxrc-5.1.6/auto2.c 2018-02-26 12:00:42.000000000 +0100 +++ new/linuxrc-5.1.7/auto2.c 2018-03-15 14:49:25.000000000 +0100 @@ -1036,7 +1036,14 @@ sync(); - strprintf(&buf, "kexec -s -l %s --initrd=%s --append='%s kexec=0'", kernel, initrd, cmdline); + // sometimes you need it, sometimes not - see bsc#1076839 + #if defined(__x86_64__) + #define KEXEC_OPT " -s" + #else + #define KEXEC_OPT "" + #endif + + strprintf(&buf, "kexec" KEXEC_OPT " -l %s --initrd=%s --append='%s kexec=0'", kernel, initrd, cmdline); if(!config.test) { lxrc_run(buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.6/changelog new/linuxrc-5.1.7/changelog --- old/linuxrc-5.1.6/changelog 2018-02-26 12:00:42.000000000 +0100 +++ new/linuxrc-5.1.7/changelog 2018-03-15 14:49:25.000000000 +0100 @@ -1,3 +1,7 @@ +2018-03-15: 5.1.7 + - merge gh#openSUSE/linuxrc#165 + - be carefull with 'kexec -s', it's not always available (bsc#1076839) + 2018-02-26: 5.1.6 - merge gh#openSUSE/linuxrc#164 - fix code flow (bsc#1082468) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.6/util.c new/linuxrc-5.1.7/util.c --- old/linuxrc-5.1.6/util.c 2018-02-26 12:00:42.000000000 +0100 +++ new/linuxrc-5.1.7/util.c 2018-03-15 14:49:25.000000000 +0100 @@ -5202,8 +5202,15 @@ return; } + // sometimes you need it, sometimes not - see bsc#1076839 + #if defined(__x86_64__) + #define KEXEC_OPT " -s" + #else + #define KEXEC_OPT "" + #endif + strprintf(&buf, - "kexec -s -l '/mnt/%s' --initrd='/mnt/%s' --append='%s'", + "kexec" KEXEC_OPT " -l '/mnt/%s' --initrd='/mnt/%s' --append='%s'", kernel_name, initrd_name, kernel_options );
