Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2018-01-13 21:35:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Sat Jan 13 21:35:27 2018 rev:253 rq:563619 version:5.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2017-12-19 10:45:38.574554074 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2018-01-13 21:35:33.751866596 +0100 @@ -1,0 +2,16 @@ +Thu Jan 11 14:32:57 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/linuxrc#163 +- extend 'kexec' option to allow updating kernel/initrd only if + necessary (bsc#990374) +- 5.1.4 + +-------------------------------------------------------------------- +Wed Jan 10 12:06:12 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/linuxrc#162 +- allow kexec to work with secure boot (bsc#1075051) +- adjust copyright notice +- 5.1.3 + +-------------------------------------------------------------------- Old: ---- linuxrc-5.1.2.tar.xz New: ---- linuxrc-5.1.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.3WZzbg/_old 2018-01-13 21:35:34.443834361 +0100 +++ /var/tmp/diff_new_pack.3WZzbg/_new 2018-01-13 21:35:34.447834174 +0100 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 5.1.2 +Version: 5.1.4 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-5.1.2.tar.xz -> linuxrc-5.1.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/VERSION new/linuxrc-5.1.4/VERSION --- old/linuxrc-5.1.2/VERSION 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/VERSION 2018-01-11 15:32:57.000000000 +0100 @@ -1 +1 @@ -5.1.2 +5.1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/auto2.c new/linuxrc-5.1.4/auto2.c --- old/linuxrc-5.1.2/auto2.c 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/auto2.c 2018-01-11 15:32:57.000000000 +0100 @@ -39,7 +39,6 @@ static void auto2_read_repo_files(url_t *url); static void auto2_read_repomd_files(url_t *url); static char *auto2_splash_name(void); -static void auto2_kexec(url_t *url); static int test_and_add_dud(url_t *url); @@ -595,7 +594,7 @@ /* now go and look for repo */ err = url_find_repo(config.url.install, config.mountpoint.instdata); - if(!err && config.kexec) { + if(!err && config.kexec == 1) { auto2_kexec(config.url.install); log_info("kexec failed\n"); return 0; @@ -1037,10 +1036,11 @@ sync(); - strprintf(&buf, "kexec -l %s --initrd=%s --append='%s kexec=0'", kernel, initrd, cmdline); + strprintf(&buf, "kexec -s -l %s --initrd=%s --append='%s kexec=0'", kernel, initrd, cmdline); if(!config.test) { lxrc_run(buf); + LXRC_WAIT util_umount_all(); sync(); lxrc_run("kexec -e"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/auto2.h new/linuxrc-5.1.4/auto2.h --- old/linuxrc-5.1.2/auto2.h 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/auto2.h 2018-01-11 15:32:57.000000000 +0100 @@ -10,3 +10,4 @@ void load_drivers(hd_data_t *hd_data, hd_hw_item_t hw_item); void auto2_user_netconfig(void); void auto2_user_netconfig(void); +void auto2_kexec(url_t *url); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/changelog new/linuxrc-5.1.4/changelog --- old/linuxrc-5.1.2/changelog 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/changelog 2018-01-11 15:32:57.000000000 +0100 @@ -1,3 +1,13 @@ +2018-01-11: 5.1.4 + - merge gh#openSUSE/linuxrc#163 + - extend 'kexec' option to allow updating kernel/initrd only if + necessary (bsc#990374) + +2018-01-10: 5.1.3 + - merge gh#openSUSE/linuxrc#162 + - allow kexec to work with secure boot (bsc#1075051) + - adjust copyright notice + 2017-12-14: 5.1.2 - merge gh#openSUSE/linuxrc#161 - fix network interface handling (bnc#1068336) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/global.h new/linuxrc-5.1.4/global.h --- old/linuxrc-5.1.2/global.h 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/global.h 2018-01-11 15:32:57.000000000 +0100 @@ -419,7 +419,6 @@ unsigned secure_always_fail:1; /**< in secure mode: never ask the user but always fail directly */ unsigned sslcerts:1; /**< whether to check ssl certificates */ unsigned sig_failed:2; /**< signature check failed (1: not signed, 2: wrong signature) */ - unsigned kexec:1; /**< kexec to kernel & initrd from repo */ unsigned kexec_reboot:1; /**< kexec to installed system (just passed to yast) */ unsigned nomodprobe:1; /**< disable modprobe */ unsigned y2gdb:1; /**< pass to yast */ @@ -521,6 +520,12 @@ char *core; /**< linuxrc code dump destination (core dumps disabled if unset) */ unsigned core_setup:1; /**< linuxrc core dumps have been configured */ slist_t *repomd_data; /**< parsed repomd.xml info */ + unsigned kexec; /**< kexec to kernel & initrd from repo (if inst-sys does not match) + * 0: never + * 1: always + * 2: if necessary, with user dialog (default) + * 3: if necessary, no user dialog + */ struct { unsigned md5:1; /**< support md5 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/install.c new/linuxrc-5.1.4/install.c --- old/linuxrc-5.1.2/install.c 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/install.c 2018-01-11 15:32:57.000000000 +0100 @@ -1209,10 +1209,35 @@ int win; if(!(win = config.win)) util_disp_init(); + + /* + * config.kexec settings: + * 2: ask user whether to load kernel + * 3: load kernel without user confirmation + * + * Note: config.kexec == 1 is handled in auto2_find_repo(); we never get + * here in this case. + */ + if( + config.kexec == 3 || + ( + config.kexec == 2 && + YES == dia_yesno( + "To use the selected repository a matching boot image is needed.\n" + "\n" + "Download it now and restart?", + YES + ) + ) + ) { + auto2_kexec(config.url.install); + log_info("kexec failed\n"); + } + if(config.instsys_complain == 1) { dia_message( "Installation system does not match your boot medium.\n\n" - "It may make your bugreports worthless.", + "This may cause problems and make your bugreports worthless.", MSGTYPE_ERROR ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/linuxrc.c new/linuxrc-5.1.4/linuxrc.c --- old/linuxrc-5.1.2/linuxrc.c 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/linuxrc.c 2018-01-11 15:32:57.000000000 +0100 @@ -799,6 +799,7 @@ config.efi = -1; config.udev_mods = 1; config.devtmpfs = 1; + config.kexec = 2; /* kexec if necessary, with user dialog */ // defaults for self-update feature config.self_update_url = NULL; @@ -894,7 +895,7 @@ if (config.linemode) putchar('\n'); printf( - "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2017 SUSE LLC <<<\n", + "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2018 SUSE LLC <<<\n", config.product ); if (config.linemode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/url.c new/linuxrc-5.1.4/url.c --- old/linuxrc-5.1.2/url.c 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/url.c 2018-01-11 15:32:57.000000000 +0100 @@ -2227,7 +2227,7 @@ str_copy(&buf2, NULL); } - if(config.url.instsys->scheme != inst_rel || config.kexec) return 1; + if(config.url.instsys->scheme != inst_rel || config.kexec == 1) return 1; if(!config.keepinstsysconfig) { instsys_config = url_instsys_config(config.url.instsys->path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.1.2/util.c new/linuxrc-5.1.4/util.c --- old/linuxrc-5.1.2/util.c 2017-12-14 14:35:13.000000000 +0100 +++ new/linuxrc-5.1.4/util.c 2018-01-11 15:32:57.000000000 +0100 @@ -5203,7 +5203,7 @@ } strprintf(&buf, - "kexec -l '/mnt/%s' --initrd='/mnt/%s' --append='%s'", + "kexec -s -l '/mnt/%s' --initrd='/mnt/%s' --append='%s'", kernel_name, initrd_name, kernel_options );