Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2022-10-10 18:44:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Mon Oct 10 18:44:19 2022 rev:310 rq:1008253 version:8.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2022-08-19
17:54:50.875895322 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.2275/linuxrc.changes
2022-10-10 18:44:48.990901453 +0200
@@ -1,0 +2,10 @@
+Wed Oct 5 15:53:27 UTC 2022 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#299
+- add 'repo' URL scheme to linuxrc (jsc#SLE-22578, jsc#SLE-24584)
+- ensure the device is passed to hd and disk Zypp schemes
+ (jsc#SLE-22578, jsc#SLE-24584)
+- add relative flag to url struct
+- 8.14
+
+--------------------------------------------------------------------
Old:
----
linuxrc-8.13.tar.xz
New:
----
linuxrc-8.14.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.v2OVrm/_old 2022-10-10 18:44:49.514902581 +0200
+++ /var/tmp/diff_new_pack.v2OVrm/_new 2022-10-10 18:44:49.522902599 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 8.13
+Version: 8.14
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-8.13.tar.xz -> linuxrc-8.14.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.13/VERSION new/linuxrc-8.14/VERSION
--- old/linuxrc-8.13/VERSION 2022-08-18 17:48:08.000000000 +0200
+++ new/linuxrc-8.14/VERSION 2022-10-05 17:53:27.000000000 +0200
@@ -1 +1 @@
-8.13
+8.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.13/auto2.c new/linuxrc-8.14/auto2.c
--- old/linuxrc-8.13/auto2.c 2022-08-18 17:48:08.000000000 +0200
+++ new/linuxrc-8.14/auto2.c 2022-10-05 17:53:27.000000000 +0200
@@ -888,7 +888,7 @@
if(config.url.autoyast) {
if(
- config.url.autoyast->scheme == inst_rel &&
+ config.url.autoyast->is.relative &&
config.autoyast_parse
) {
log_show_maybe(!config.url.autoyast->quiet, "AutoYaST file in repo:
%s\n", url_print(config.url.autoyast, 5));
@@ -908,9 +908,12 @@
if(util_check_exist("/tmp/autoinst.xml")) rename("/tmp/autoinst.xml",
"/autoinst.xml");
if(util_check_exist("/autoinst.xml")) {
- log_info("setting AutoYaST option to file:/autoinst.xml\n");
- url_free(config.url.autoyast);
- config.url.autoyast = url_set("file:/autoinst.xml");
+ // with repo scheme, pass the the original URL to yast
+ if(config.url.autoyast->scheme != inst_repo) {
+ log_info("setting AutoYaST option to file:/autoinst.xml\n");
+ url_free(config.url.autoyast);
+ config.url.autoyast = url_set("file:/autoinst.xml");
+ }
// parse for embedded linuxrc options in <info_file> element
log_info("parsing AutoYaST file\n");
file_read_info_file("file:/autoinst.xml", kf_cfg);
@@ -1095,7 +1098,7 @@
err = 1;
}
- if(config.url.instsys->scheme == inst_rel && !config.url.install) {
+ if(config.url.instsys->is.relative && !config.url.install) {
log_info("no repo\n");
err = 2;
}
@@ -1107,7 +1110,7 @@
strprintf(&config.url.instsys->path, "%s/%s", s, extension);
- if(config.url.instsys->scheme == inst_rel) {
+ if(config.url.instsys->is.relative) {
err = url_find_repo(config.url.install, config.mountpoint.instdata);
}
@@ -1227,7 +1230,7 @@
if(!url) return;
// rel url is taken care of in auto2_read_repo_files()
- if(url->scheme == inst_rel) return;
+ if(url->is.relative) return;
/*
* If the AutoYaST url is a directory we have to verify its existence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.13/changelog new/linuxrc-8.14/changelog
--- old/linuxrc-8.13/changelog 2022-08-18 17:48:08.000000000 +0200
+++ new/linuxrc-8.14/changelog 2022-10-05 17:53:27.000000000 +0200
@@ -1,3 +1,10 @@
+2022-10-05: 8.14
+ - merge gh#openSUSE/linuxrc#299
+ - add 'repo' URL scheme to linuxrc (jsc#SLE-22578, jsc#SLE-24584)
+ - ensure the device is passed to hd and disk Zypp schemes
+ (jsc#SLE-22578, jsc#SLE-24584)
+ - add relative flag to url struct
+
2022-08-18: 8.13
- merge gh#openSUSE/linuxrc#302
- pass edid firmware option via sysfs if drm is compiled into the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.13/global.h new/linuxrc-8.14/global.h
--- old/linuxrc-8.13/global.h 2022-08-18 17:48:08.000000000 +0200
+++ new/linuxrc-8.14/global.h 2022-10-05 17:53:27.000000000 +0200
@@ -185,7 +185,7 @@
inst_none = 0, inst_file, inst_nfs, inst_ftp, inst_smb,
inst_http, inst_https, inst_tftp, inst_cdrom, inst_floppy, inst_hd,
inst_dvd, inst_cdwithnet, inst_net, inst_slp, inst_exec,
- inst_rel, inst_disk, inst_usb, inst_label,
+ inst_rel, inst_disk, inst_usb, inst_label, inst_repo,
inst_extern ///< must be last
} instmode_t;
@@ -291,6 +291,7 @@
unsigned wlan:1; /**< wlan interface */
unsigned blockdev:1; /**< needs block device */
unsigned nodevneeded:1; /**< does not need any device */
+ unsigned relative:1; /**< url is relative (to some other url) */
} is;
struct {
char *device;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.13/url.c new/linuxrc-8.14/url.c
--- old/linuxrc-8.13/url.c 2022-08-18 17:48:08.000000000 +0200
+++ new/linuxrc-8.14/url.c 2022-10-05 17:53:27.000000000 +0200
@@ -122,6 +122,7 @@
{ "disk", inst_disk },
{ "usb", inst_usb },
{ "label", inst_label },
+ { "repo", inst_repo },
/* add new inst modes _here_! (before "extern") */
{ "extern", inst_extern },
/* the following are just aliases */
@@ -661,6 +662,8 @@
}
}
+ if(url->scheme == inst_rel || url->scheme == inst_repo) url->is.relative = 1;
+
url_replace_vars_with_backup(&url->server, &url->orig.server);
url_replace_vars_with_backup(&url->share, &url->orig.share);
url_replace_vars_with_backup(&url->path, &url->orig.path);
@@ -715,9 +718,9 @@
}
log_debug(
- " network = %u, blockdev = %u, mountable = %u, file = %u, dir = %u, all =
%u, quiet = %u\n",
+ " network = %u, blockdev = %u, mountable = %u, file = %u, dir = %u,
relative = %u, all = %u, quiet = %u\n",
url->is.network, url->is.blockdev, url->is.mountable, url->is.file,
url->is.dir,
- url->search_all, url->quiet
+ url->is.relative, url->search_all, url->quiet
);
if(url->instsys) log_debug(" instsys = %s\n", url->instsys);
@@ -1095,18 +1098,18 @@
if(path) {
strprintf(&buf, "%s/%s%s",
buf,
- url->scheme == inst_ftp && *path == '/' ? "%2F" : "",
+ scheme == inst_ftp && *path == '/' ? "%2F" : "",
*path == '/' ? path + 1 : path
);
}
- if(url->scheme == inst_hd) {
+ if(scheme == inst_hd) {
if((s = url->used.device) || (s = url->device)) {
strprintf(&buf, "%s%cdevice=%s", buf, q++ ? '&' : '?', long_dev(s));
}
}
- if(url->scheme == inst_cdrom) {
+ if(scheme == inst_cdrom) {
if((s = url->used.device) || (s = url->device)) {
strprintf(&buf, "%s%cdevices=%s", buf, q++ ? '&' : '?', long_dev(s));
}
@@ -1115,10 +1118,10 @@
if(
config.url.proxy &&
config.url.proxy->server && (
- url->scheme == inst_http ||
- url->scheme == inst_https ||
- url->scheme == inst_ftp ||
- url->scheme == inst_tftp
+ scheme == inst_http ||
+ scheme == inst_https ||
+ scheme == inst_ftp ||
+ scheme == inst_tftp
)
) {
strprintf(&buf, "%s%cproxy=%s", buf, q++ ? '&' : '?',
config.url.proxy->server);
@@ -2675,7 +2678,10 @@
str_copy(&buf2, NULL);
}
- if(config.url.instsys->scheme != inst_rel || config.kexec == 1) return 1;
+ if(
+ !config.url.instsys->is.relative ||
+ config.kexec == 1
+ ) return 1;
if(!config.keepinstsysconfig) {
instsys_config = url_instsys_config(config.url.instsys->path);
@@ -2874,7 +2880,7 @@
if(
!url ||
!url->scheme ||
- url->scheme == inst_rel ||
+ url->is.relative ||
!url->path
) return 1;
