commit linuxrc for openSUSE:Factory
Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at Wed Mar 31 18:48:50 CEST 2010. -------- --- linuxrc/linuxrc.changes 2010-02-26 15:25:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2010-03-30 15:31:09.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 30 15:31:01 CEST 2010 - snwint@suse.de + +- add 'type' option to url syntax (bnc #590811) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxrc-3.4.11.tar.bz2 New: ---- linuxrc-3.4.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.85Gh0W/_old 2010-03-31 18:11:16.000000000 +0200 +++ /var/tmp/diff_new_pack.85Gh0W/_new 2010-03-31 18:11:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.4.11) +# spec file for package linuxrc (Version 3.4.12) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.4.11 +Version: 3.4.12 Release: 1 -Source: linuxrc-3.4.11.tar.bz2 +Source: linuxrc-3.4.12.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-3.4.11.tar.bz2 -> linuxrc-3.4.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.11/VERSION new/linuxrc-3.4.12/VERSION --- old/linuxrc-3.4.11/VERSION 2010-02-26 15:25:23.000000000 +0100 +++ new/linuxrc-3.4.12/VERSION 2010-03-30 15:30:57.000000000 +0200 @@ -1 +1 @@ -3.4.11 +3.4.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.11/changelog new/linuxrc-3.4.12/changelog --- old/linuxrc-3.4.11/changelog 2010-02-26 15:25:24.000000000 +0100 +++ new/linuxrc-3.4.12/changelog 2010-03-30 15:30:59.000000000 +0200 @@ -1,4 +1,7 @@ -2010-02-26: HEAD +2010-03-30: HEAD + - add 'type' option to url syntax (bnc #590811) + +2010-02-26: 3.4.11 - added 'namescheme' option to linuxrc to select alternative device name schemes (by-id, by-path, by-label); default is 'by-id' (bnc #582717) - fix make deps for VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.11/url.c new/linuxrc-3.4.12/url.c --- old/linuxrc-3.4.11/url.c 2010-02-26 15:25:20.000000000 +0100 +++ new/linuxrc-3.4.12/url.c 2010-03-30 15:13:12.000000000 +0200 @@ -544,6 +544,10 @@ url->file_list = slist_split(',', sl->value); } + if((sl = slist_getentry(url->query, "type"))) { + url->is.file = strcmp(sl->value, "file") ? 0 : 1; + } + if( url->scheme == inst_file || url->scheme == inst_nfs || @@ -612,7 +616,10 @@ fprintf(stderr, "\n"); } - fprintf(stderr, " network = %u, mountable = %u\n", url->is.network, url->is.mountable); + fprintf(stderr, + " network = %u, mountable = %u, file = %u\n", + url->is.network, url->is.mountable, url->is.file + ); if(url->instsys) fprintf(stderr, " instsys = %s\n", url->instsys); @@ -1161,10 +1168,15 @@ if(config.debug) fprintf(stderr, "[server = %s]\n", inet2print(&url->used.server)); - err = net_mount_nfs(url->mount, &url->used.server, url->path, url->port); - fprintf(stderr, "nfs: %s -> %s (%d)\n", url->path, url->mount, err); + if(!url->is.file) { + err = net_mount_nfs(url->mount, &url->used.server, url->path, url->port); + fprintf(stderr, "nfs: %s -> %s (%d)\n", url->path, url->mount, err); + } + else { + fprintf(stderr, "nfs: %s: is file, mounting one level up\n", url->path); + } - if(err == ENOTDIR || err == ENOENT) { + if(err == ENOTDIR || err == ENOENT || url->is.file) { str_copy(&url->mount, NULL); str_copy(&buf, url->path); @@ -1237,7 +1249,7 @@ if(url->is.mountable) { file_type = util_check_exist(path); - if(file_type == 'r') url->is.file = 1; + url->is.file = file_type == 'r' ? 1 : 0; if(file_type) { if( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de