Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2018-12-03 10:05:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Mon Dec 3 10:05:59 2018 rev:265 rq:652465 version:6.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2018-11-14 14:29:54.455528761 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new.19453/linuxrc.changes 2018-12-03 10:06:14.571938020 +0100 @@ -1,0 +2,14 @@ +Wed Nov 28 15:45:17 UTC 2018 - [email protected] + +- merge gh#openSUSE/linuxrc#183 +- Added parameter norepo (fate#325482) +- 6.0.5 + +-------------------------------------------------------------------- +Tue Nov 27 14:55:44 UTC 2018 - [email protected] + +- merge gh#openSUSE/linuxrc#182 +- Added new BuildRequires to devel doc +- 6.0.4 + +-------------------------------------------------------------------- Old: ---- linuxrc-6.0.3.tar.xz New: ---- linuxrc-6.0.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.FOzPMZ/_old 2018-12-03 10:06:18.195934698 +0100 +++ /var/tmp/diff_new_pack.FOzPMZ/_new 2018-12-03 10:06:18.195934698 +0100 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 6.0.3 +Version: 6.0.5 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-6.0.3.tar.xz -> linuxrc-6.0.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/README.md new/linuxrc-6.0.5/README.md --- old/linuxrc-6.0.3/README.md 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/README.md 2018-11-28 16:45:17.000000000 +0100 @@ -55,7 +55,7 @@ For example on openSUSE/SUSE distributions run: ```sh -zypper install e2fsprogs-devel hwinfo-devel libblkid-devel libcurl-devel readline-devel +zypper install e2fsprogs-devel hwinfo-devel libblkid-devel libcurl-devel readline-devel libmediacheck-devel ``` ## Debugging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/VERSION new/linuxrc-6.0.5/VERSION --- old/linuxrc-6.0.3/VERSION 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/VERSION 2018-11-28 16:45:17.000000000 +0100 @@ -1 +1 @@ -6.0.3 +6.0.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/changelog new/linuxrc-6.0.5/changelog --- old/linuxrc-6.0.3/changelog 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/changelog 2018-11-28 16:45:17.000000000 +0100 @@ -1,3 +1,11 @@ +2018-11-28: 6.0.5 + - merge gh#openSUSE/linuxrc#183 + - Added parameter norepo (fate#325482) + +2018-11-27: 6.0.4 + - merge gh#openSUSE/linuxrc#182 + - Added new BuildRequires to devel doc + 2018-11-14: 6.0.3 - merge gh#openSUSE/linuxrc#181 - setctsid is dead, long live setsid (bsc#1109290) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/file.c new/linuxrc-6.0.5/file.c --- old/linuxrc-6.0.3/file.c 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/file.c 2018-11-28 16:45:17.000000000 +0100 @@ -311,6 +311,7 @@ { key_self_update, "SelfUpdate", kf_cfg + kf_cmd }, { key_ibft_devices, "IBFTDevices", kf_cfg + kf_cmd }, { key_linuxrc_core, "LinuxrcCore", kf_cfg + kf_cmd_early }, + { key_norepo, "NoRepo", kf_cfg + kf_cmd }, }; static struct { @@ -1766,6 +1767,10 @@ str_copy(&config.core, *f->value ? f->value : NULL); break; + case key_norepo: + if(f->is.numeric) config.norepo = f->nvalue; + break; + default: break; } @@ -1883,7 +1888,7 @@ file_write_num(f, key_sourcemounted, url->mount ? 1 : 0); fprintf(f, "RepoURL: %s\n", url_print(url, 3)); - fprintf(f, "ZyppRepoURL: %s\n", url_print(url, 4)); + if(!config.norepo) fprintf(f, "ZyppRepoURL: %s\n", url_print(url, 4)); if(!config.sslcerts) fprintf(f, "ssl_verify: no\n"); if(url->used.device && !url->is.network) fprintf(f, "Device: %s\n", short_dev(url->used.device)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/file.h new/linuxrc-6.0.5/file.h --- old/linuxrc-6.0.3/file.h 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/file.h 2018-11-28 16:45:17.000000000 +0100 @@ -56,7 +56,7 @@ key_withipoib, key_upgrade, key_media_upgrade, key_ifcfg, key_defaultinstall, key_nanny, key_vlanid, key_sshkey, key_systemboot, key_sethostname, key_debugshell, key_self_update, - key_ibft_devices, key_linuxrc_core + key_ibft_devices, key_linuxrc_core, key_norepo } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/global.h new/linuxrc-6.0.5/global.h --- old/linuxrc-6.0.3/global.h 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/global.h 2018-11-28 16:45:17.000000000 +0100 @@ -446,6 +446,7 @@ unsigned systemboot:1; /**< boot installed system */ unsigned extend_running:1; /**< currently running an 'extend' job */ unsigned repomd:1; /**< install repo is repo-md */ + unsigned norepo:1; /**< disable repo location check, expect YaST */ struct { unsigned check:1; /**< check for braille displays and start brld if found */ char *dev; /**< braille device */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/url.c new/linuxrc-6.0.5/url.c --- old/linuxrc-6.0.3/url.c 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/url.c 2018-11-28 16:45:17.000000000 +0100 @@ -374,7 +374,7 @@ if(url->scheme) { s0 = s1; - + if(s0[0] == '/' && s0[1] == '/') { i = strcspn(s0 + 2, "/?"); if(i) { @@ -466,7 +466,7 @@ *s1++ = 0; url->path = strdup(s1); } - } + } /* unescape strings */ { @@ -1190,7 +1190,7 @@ * 2: ok, but continue search * * url->used.device must be set - * + * * return: * 0: failed * 1: ok @@ -1276,7 +1276,7 @@ log_debug("[server = %s]\n", url->server ?: ""); err = url_mount_really(url, buf, url->tmp_mount); - + if(err) { log_info("nfs: %s: mount failed\n", url->used.device); str_copy(&url->tmp_mount, NULL); @@ -2000,7 +2000,7 @@ tc_dst = dst; tc_flags = flags; tc_label = label; - + if(!dst || !url->scheme) return 1; if(!(flags & URL_FLAG_NOUNLINK)) unlink(dst); @@ -2139,7 +2139,7 @@ } LXRC_WAIT - + return found ? 0 : 1; } @@ -2192,24 +2192,28 @@ ) { if(config.zen) return 0; - // no content file -> download repomd.xml - int read_failed = url_read_file( - url, NULL, "/repodata/repomd.xml", "/repomd.xml", NULL, - URL_FLAG_NODIGEST + (config.secure ? URL_FLAG_CHECK_SIG : 0) - ); + config.repomd = 1; - if(read_failed) return 0; + if(!config.norepo) { + // no content file -> download repomd.xml + int read_failed = url_read_file( + url, NULL, "/repodata/repomd.xml", "/repomd.xml", NULL, + URL_FLAG_NODIGEST + (config.secure ? URL_FLAG_CHECK_SIG : 0) + ); - config.repomd = 1; + if(read_failed) return 0; - file_parse_repomd("/repomd.xml"); + file_parse_repomd("/repomd.xml"); + } // download CHECKSUMS ... - read_failed = url_read_file( + int read_failed = url_read_file( url, NULL, "/CHECKSUMS", "/CHECKSUMS", NULL, URL_FLAG_NODIGEST + (config.secure ? URL_FLAG_CHECK_SIG : 0) ); + if(read_failed && config.norepo) return 0; + // ... and parse it if(!read_failed) file_parse_checksums("/CHECKSUMS"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.3/util.c new/linuxrc-6.0.5/util.c --- old/linuxrc-6.0.3/util.c 2018-11-14 10:27:23.000000000 +0100 +++ new/linuxrc-6.0.5/util.c 2018-11-28 16:45:17.000000000 +0100 @@ -1204,6 +1204,7 @@ add_flag(&sl0, buf, config.net.sethostname, "hostname"); add_flag(&sl0, buf, config.self_update, "self_update"); add_flag(&sl0, buf, config.repomd, "repomd"); + add_flag(&sl0, buf, config.norepo, "norepo"); if(*buf) slist_append_str(&sl0, buf); if(config.self_update_url) {
