Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2017-01-24 10:30:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2017-01-19 10:39:00.374078010 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2017-01-24 10:30:41.449458812 +0100 @@ -1,0 +2,11 @@ +Thu Jan 19 15:48:48 UTC 2017 - [email protected] + +- allow reading of config files from instsys location, part 2 +- 5.0.98 + +------------------------------------------------------------------- +Thu Jan 19 11:25:09 CET 2017 - [email protected] + +- include all doc files in package + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.97.tar.xz New: ---- linuxrc-5.0.98.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.FAudrz/_old 2017-01-24 10:30:41.837403797 +0100 +++ /var/tmp/diff_new_pack.FAudrz/_new 2017-01-24 10:30:41.837403797 +0100 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 5.0.97 +Version: 5.0.98 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ @@ -49,6 +49,6 @@ %{_sbindir}/linuxrc %{_bindir}/mkpsfu %{_datadir}/linuxrc -%doc linuxrc.html +%doc COPYING *.html *.md *.txt %changelog ++++++ linuxrc-5.0.97.tar.xz -> linuxrc-5.0.98.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.97/VERSION new/linuxrc-5.0.98/VERSION --- old/linuxrc-5.0.97/VERSION 2017-01-18 15:19:23.000000000 +0100 +++ new/linuxrc-5.0.98/VERSION 2017-01-19 16:35:56.000000000 +0100 @@ -1 +1 @@ -5.0.97 +5.0.98 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.97/changelog new/linuxrc-5.0.98/changelog --- old/linuxrc-5.0.97/changelog 2017-01-18 15:19:23.000000000 +0100 +++ new/linuxrc-5.0.98/changelog 2017-01-19 16:35:56.000000000 +0100 @@ -1,3 +1,6 @@ +2017-01-19: 5.0.98 + - allow reading of config files from instsys location, part 2 + 2017-01-18: 5.0.97 - avoid passing uninitialized value - make md parser happy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.97/url.c new/linuxrc-5.0.98/url.c --- old/linuxrc-5.0.97/url.c 2017-01-18 15:19:23.000000000 +0100 +++ new/linuxrc-5.0.98/url.c 2017-01-19 16:35:56.000000000 +0100 @@ -2385,7 +2385,7 @@ */ int url_find_instsys(url_t *url, char *dir) { - int opt, part, parts, ok, i; + int opt, copy, part, parts, ok, i; char *s, *t; char *file_name = NULL, *buf = NULL, *buf2 = NULL, *url_path = NULL; slist_t *sl, *file_list, *old_file_list; @@ -2459,6 +2459,7 @@ for(part = 1, sl = config.url.instsys_list; ok && sl; sl = sl->next, part++) { opt = *(s = sl->key) == '?' && s++; + copy = strstr(s, "?copy=1") ? 1 : 0; t = url_config_get_path(s); file_list = url_config_get_file_list(s); @@ -2477,7 +2478,7 @@ if( url->is.mountable && - (util_is_mountable(buf) || !util_check_exist(buf)) && + (copy || util_is_mountable(buf) || !util_check_exist(buf)) && !config.rescue && (!config.download.instsys || util_check_exist(buf) == 'd') ) { @@ -2485,11 +2486,19 @@ log_info("mount %s -> %s failed (ignored)\n", buf, sl->value); } else { - log_info("mount %s -> %s\n", buf, sl->value); - - i = util_mount_ro(buf, sl->value, url->file_list) ? 0 : 1; - ok &= i; - if(!i) log_info("instsys mount failed: %s\n", sl->value); + if(copy) { + char *dst = strrchr(t, '/') ?: t; + log_info("copy %s -> %s\n", buf, dst); + i = !util_cp_main(3, (char *[]) {0, buf, dst}); + ok &= i; + if(!i) log_info("adding %s to instsys failed\n", dst); + } + else { + log_info("mount %s -> %s\n", buf, sl->value); + i = util_mount_ro(buf, sl->value, url->file_list) ? 0 : 1; + ok &= i; + if(!i) log_info("instsys mount failed: %s\n", sl->value); + } } } else { @@ -2509,11 +2518,19 @@ buf2, URL_FLAG_PROGRESS + URL_FLAG_UNZIP + opt * URL_FLAG_OPTIONAL )) { - log_info("mount %s -> %s\n", file_name, sl->value); - - i = util_mount_ro(file_name, sl->value, url->file_list) ? 0 : 1; - ok &= i; - if(!i) log_info("instsys mount failed: %s\n", sl->value); + if(copy) { + char *dst = strrchr(t, '/') ?: t; + log_info("mv %s -> %s\n", file_name, dst); + i = !rename(file_name, dst); + ok &= i; + if(!i) log_info("adding %s to instsys failed\n", dst); + } + else { + log_info("mount %s -> %s\n", file_name, sl->value); + i = util_mount_ro(file_name, sl->value, url->file_list) ? 0 : 1; + ok &= i; + if(!i) log_info("instsys mount failed: %s\n", sl->value); + } } else { log_info("download failed: %s%s\n", sl->value, opt ? " (ignored)" : "");
