Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2021-03-15 10:53:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Mon Mar 15 10:53:48 2021 rev:294 rq:878315 version:7.0.30 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2021-03-08 15:17:46.805961664 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new.2401/linuxrc.changes 2021-03-15 10:53:50.749120650 +0100 @@ -1,0 +2,7 @@ +Thu Mar 11 11:13:15 UTC 2021 - wfe...@opensuse.org + +- merge gh#openSUSE/linuxrc#250 +- add 'extend' option (bsc#1183368) +- 7.0.30 + +-------------------------------------------------------------------- @@ -22 +29 @@ -- support using zram device as root file system (jsc#PM-2253) +- support using zram device as root file system (jsc#SLE-17630) Old: ---- linuxrc-7.0.29.tar.xz New: ---- linuxrc-7.0.30.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.B7LjzL/_old 2021-03-15 10:53:51.473121761 +0100 +++ /var/tmp/diff_new_pack.B7LjzL/_new 2021-03-15 10:53:51.477121767 +0100 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 7.0.29 +Version: 7.0.30 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-7.0.29.tar.xz -> linuxrc-7.0.30.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.29/VERSION new/linuxrc-7.0.30/VERSION --- old/linuxrc-7.0.29/VERSION 2021-03-05 13:11:42.000000000 +0100 +++ new/linuxrc-7.0.30/VERSION 2021-03-11 12:13:15.000000000 +0100 @@ -1 +1 @@ -7.0.29 +7.0.30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.29/changelog new/linuxrc-7.0.30/changelog --- old/linuxrc-7.0.29/changelog 2021-03-05 13:11:42.000000000 +0100 +++ new/linuxrc-7.0.30/changelog 2021-03-11 12:13:15.000000000 +0100 @@ -1,3 +1,7 @@ +2021-03-11: 7.0.30 + - merge gh#openSUSE/linuxrc#250 + - add 'extend' option + 2021-03-05: 7.0.29 - merge gh#openSUSE/linuxrc#249 - Revert "default to using zram" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.29/file.c new/linuxrc-7.0.30/file.c --- old/linuxrc-7.0.29/file.c 2021-03-05 13:11:42.000000000 +0100 +++ new/linuxrc-7.0.30/file.c 2021-03-11 12:13:15.000000000 +0100 @@ -323,6 +323,7 @@ { key_zram, "zram", kf_cmd_early }, { key_zram_root, "zram_root", kf_cmd_early }, { key_zram_swap, "zram_swap", kf_cmd_early }, + { key_extend, "Extend", kf_cfg + kf_cmd }, }; static struct { @@ -1878,6 +1879,10 @@ str_copy(&config.zram.swap_size, *f->value ? f->value : NULL); break; + case key_extend: + slist_assign_values(&config.extend_option, f->value); + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.29/file.h new/linuxrc-7.0.30/file.h --- old/linuxrc-7.0.29/file.h 2021-03-05 13:11:42.000000000 +0100 +++ new/linuxrc-7.0.30/file.h 2021-03-11 12:13:15.000000000 +0100 @@ -58,7 +58,7 @@ 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_device_auto_config, key_autoyast_passurl, key_rd_zdev, key_insmod_pre, - key_zram, key_zram_root, key_zram_swap + key_zram, key_zram_root, key_zram_swap, key_extend } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.29/global.h new/linuxrc-7.0.30/global.h --- old/linuxrc-7.0.29/global.h 2021-03-05 13:11:42.000000000 +0100 +++ new/linuxrc-7.0.30/global.h 2021-03-11 12:13:15.000000000 +0100 @@ -544,6 +544,7 @@ * 3: if necessary, no user dialog */ char *platform_name; /* Human-readable name of the hardware */ + slist_t *extend_option; /**< list of instsys extensions given via 'extend' boot option */ struct { unsigned failed:1; /**< digest check failed */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.29/url.c new/linuxrc-7.0.30/url.c --- old/linuxrc-7.0.29/url.c 2021-03-05 13:11:42.000000000 +0100 +++ new/linuxrc-7.0.30/url.c 2021-03-11 12:13:15.000000000 +0100 @@ -3269,6 +3269,11 @@ } } + // if user specified extra parts to add via 'extend' option, add them here + for(sl = config.extend_option; sl; sl = sl->next) { + slist_append_str(&config.url.instsys_list, sl->key); + } + for(sl = config.url.instsys_list; sl; sl = sl->next) { s = sl->key; if(*s == '?') s++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.29/util.c new/linuxrc-7.0.30/util.c --- old/linuxrc-7.0.29/util.c 2021-03-05 13:11:42.000000000 +0100 +++ new/linuxrc-7.0.30/util.c 2021-03-11 12:13:15.000000000 +0100 @@ -1520,6 +1520,16 @@ sprintf(buf, "rescueimage = \"%s\"", config.rescueimage); slist_append_str(&sl0, buf); + if(config.extend_option) { + strcpy(buf, "extend option:"); + slist_append_str(&sl0, buf); + for(sl = config.extend_option; sl; sl = sl->next) { + if(!sl->key) continue; + sprintf(buf, " %s", sl->key); + slist_append_str(&sl0, buf); + } + } + sprintf(buf, "setup command = \"%s\"", config.setupcmd); slist_append_str(&sl0, buf);