Hello community, here is the log from the commit of package yast2-nfs-server for openSUSE:Factory checked in at 2014-06-02 06:59:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-server (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-server/yast2-nfs-server.changes 2014-05-06 13:40:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-server.new/yast2-nfs-server.changes 2014-06-02 07:00:03.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 21 14:21:22 UTC 2014 - [email protected] + +- Avoid "Unable to start idmapd" (bnc#878878). +- Removed dead code dealing with the user space nfs-server.rpm. +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-nfs-server-3.1.6.tar.bz2 New: ---- yast2-nfs-server-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-server.spec ++++++ --- /var/tmp/diff_new_pack.MTLU3X/_old 2014-06-02 07:00:04.000000000 +0200 +++ /var/tmp/diff_new_pack.MTLU3X/_new 2014-06-02 07:00:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-server -Version: 3.1.6 +Version: 3.1.7 Release: 0 Url: https://github.com/yast/yast-nfs-server ++++++ yast2-nfs-server-3.1.6.tar.bz2 -> yast2-nfs-server-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/package/yast2-nfs-server.changes new/yast2-nfs-server-3.1.7/package/yast2-nfs-server.changes --- old/yast2-nfs-server-3.1.6/package/yast2-nfs-server.changes 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/package/yast2-nfs-server.changes 2014-05-22 10:59:43.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 21 14:21:22 UTC 2014 - [email protected] + +- Avoid "Unable to start idmapd" (bnc#878878). +- Removed dead code dealing with the user space nfs-server.rpm. +- 3.1.7 + +------------------------------------------------------------------- Mon May 5 15:54:01 CEST 2014 - [email protected] - Obsolete Service.Status calls replaced with Service.active? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/package/yast2-nfs-server.spec new/yast2-nfs-server-3.1.7/package/yast2-nfs-server.spec --- old/yast2-nfs-server-3.1.6/package/yast2-nfs-server.spec 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/package/yast2-nfs-server.spec 2014-05-22 10:59:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-server -Version: 3.1.6 +Version: 3.1.7 Release: 0 URL: https://github.com/yast/yast-nfs-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/src/clients/nfs_server.rb new/yast2-nfs-server-3.1.7/src/clients/nfs_server.rb --- old/yast2-nfs-server-3.1.6/src/clients/nfs_server.rb 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/src/clients/nfs_server.rb 2014-05-22 10:59:43.000000000 +0200 @@ -165,13 +165,7 @@ "exports" => { :next => :ws_finish, :abort => :abort } } - # If nfs-kernel-server nor nfs-server is not installed, install nfs-kernel-server. - # TODO: require installation of alternate packages - if !Package.Installed("nfs-server") - @use_star_for_anonymous = true - @spaces_allowed = true - return nil if !Package.InstallAll(NfsServer.required_packages) - end + Package.InstallAll(NfsServer.required_packages) or return nil if !NfsServer.Read Builtins.y2error("read error, bye") @@ -267,7 +261,7 @@ return false end host = Ops.get_string(options, "hosts", "") - host = @use_star_for_anonymous ? "*" : "" if host == "" + host = "*" if host == "" opts = Ops.get_string(options, "options", "") opts = @default_options if opts == "" default_allowed = [Builtins.sformat("%1(%2)", host, opts)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/src/include/nfs_server/ui.rb new/yast2-nfs-server-3.1.7/src/include/nfs_server/ui.rb --- old/yast2-nfs-server-3.1.6/src/include/nfs_server/ui.rb 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/src/include/nfs_server/ui.rb 2014-05-22 10:59:43.000000000 +0200 @@ -33,16 +33,6 @@ Yast.import "Sequencer" Yast.import "Wizard" Yast.include include_target, "nfs_server/routines.rb" - - # The kernel-based server can handle spaces in paths, - # the user-mode server cannot. - @spaces_allowed = false - - # The kernel based server complains about an empty host specification - # and wants us to use "*". But the user mode server would match it - # only with an unqualified name. We must not use "*" there - # to mean an anonymous client. - @use_star_for_anonymous = false end # Ask user for a directory to export. Allow browsing. @@ -105,21 +95,6 @@ _("The exports table already contains this directory.") ) ret = nil - elsif !@spaces_allowed && - Builtins.findfirstof(mountpoint, " \t") != nil - Popup.Message( - Builtins.sformat( - # message popup; %1, %2 are package names - _( - "The user mode NFS server (%1) cannot export directories\n" + - "with spaces in their names.\n" + - "Use the kernel-based server (%2) to do that." - ), - "nfs-server", - "nfs-kernel-server" - ) - ) - ret = nil elsif Ops.less_than(SCR.Read(path(".target.size"), mountpoint), 0) && !Mode.config # the dir does not exist @@ -219,12 +194,9 @@ end hosts = Convert.to_string(UI.QueryWidget(Id(:hostsent), :Value)) - if @use_star_for_anonymous && hosts == "" + if hosts == "" hosts = "*" UI.ChangeWidget(Id(:hostsent), :Value, hosts) - elsif !@use_star_for_anonymous && hosts == "*" # #91175 - hosts = "" - UI.ChangeWidget(Id(:hostsent), :Value, hosts) end if ret == :optsent @@ -519,37 +491,22 @@ ) # Help, part 2 of 4 - help_text = Ops.add( - help_text, + help_text += _( "<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n" + "It can be a single host, groups, wild cards, or\n" + "IP networks.</P>\n" ) - ) - # #91175 - if @use_star_for_anonymous - # Help, part 3 of 4, variant for kernel space server - help_text = Ops.add( - help_text, + # Help, part 3 of 4 + help_text += _( "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>" ) - ) - else - # Help, part 3 of 4, variant for user space server - help_text = Ops.add( - help_text, - _("<p>Leave the field empty to specify all hosts.</p>") - ) - end # Help, part 4 of 4 - help_text = Ops.add( - help_text, + help_text += _("<P>Refer to <tt>man exports</tt> for more information.</P>\n") - ) exports = deep_copy(NfsServer.exports) @@ -666,13 +623,7 @@ mountpoint2 = GetDirectory(nil, exports) if mountpoint2 != nil - default_allowed = [ - Builtins.sformat( - "%1(%2)", - @use_star_for_anonymous ? "*" : "", - GetDefaultOpts(exports, "*") - ) - ] + default_allowed = [ "*(%s)" % GetDefaultOpts(exports, "*") ] exports = Builtins.add( exports, { "mountpoint" => mountpoint2, "allowed" => default_allowed } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/src/modules/NfsServer.rb new/yast2-nfs-server-3.1.7/src/modules/NfsServer.rb --- old/yast2-nfs-server-3.1.6/src/modules/NfsServer.rb 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/src/modules/NfsServer.rb 2014-05-22 10:59:43.000000000 +0200 @@ -28,7 +28,6 @@ Yast.import "SuSEFirewall" Yast.import "Wizard" - # default value of settings modified @modified = false @@ -36,27 +35,21 @@ # @required_packages = ["nfs-kernel-server"] - # Write only, used during autoinstallation. # Don't run services and SuSEconfig, it's all done at one place. @write_only = false - # Enable nfsv4 @enable_nfsv4 = true - # GSS Security ? @nfs_security = false - # Domain name to be used for nfsv4 (idmapd.conf) @domain = "" - - # Should the server be started? - # New since 9.0: Exports are independent of this setting. + # Exports are independent of this setting. @start = false # @example @@ -71,11 +64,6 @@ # @exports = [] - # Do we have nfslock? (nfs-utils: yes, nfs-server: no) - # FIXME: check nfs-kernel-server - @have_nfslock = true - - # Since SLE 11, there's no portmapper, but rpcbind @portmapper = "rpcbind" end @@ -102,15 +90,6 @@ # @see #exports def Import(settings) settings = deep_copy(settings) - # if (size (settings) == 0) - # { - # // Reset - just continue with Set (#24544). - # } - - # To avoid enabling nfslock if it does not exist during autoinstall - @have_nfslock = Convert.to_boolean( - SCR.Read(path(".init.scripts.exists"), "nfslock") - ) Set(settings) true end @@ -148,9 +127,6 @@ :from => "any", :to => "list <map <string, any>>" ) - @have_nfslock = Convert.to_boolean( - SCR.Read(path(".init.scripts.exists"), "nfslock") - ) @enable_nfsv4 = SCR.Read(path(".sysconfig.nfs.NFS4_SUPPORT")) == "yes" @nfs_security = SCR.Read(path(".sysconfig.nfs.NFS_SECURITY_GSS")) == "yes" @@ -272,52 +248,16 @@ Report.Error(Service.Error) ok = false end - if @have_nfslock - Service.Stop("nfslock") if !@write_only - if !Service.Disable("nfslock") - Report.Error(Service.Error) - ok = false - end - end else if !Service.Enable(@portmapper) Report.Error(Service.Error) ok = false end - if @have_nfslock - if !Service.Enable("nfslock") - Report.Error(Service.Error) - ok = false - end - end if !Service.Enable("nfsserver") Report.Error(Service.Error) ok = false end - if @enable_nfsv4 - if !Service.active?("idmapd") - unless Service.Start("idmapd") - Report.Error( - _("Unable to start idmapd. Check your domain setting.") - ) - ok = false - end - else - unless Service.Restart("idmapd") - Report.Error(_("Unable to restart idmapd.")) - ok = false - end - end - else - unless Service.active?("idmapd") - unless Service.Stop("idmapd") - Report.Error(_("Unable to stop idmapd.")) - ok = false - end - end - end - if @nfs_security if !Service.active?("svcgssd") unless Service.Start("svcgssd") @@ -351,9 +291,7 @@ Service.Start(@portmapper) end - Service.Stop("nfsserver") - Service.Restart("nfslock") if @have_nfslock - Service.Start("nfsserver") + Service.Restart("nfsserver") unless Service.active?("nfsserver") # error popup message @@ -417,7 +355,6 @@ summary end - # Return required packages for auto-installation # @return [Hash] of packages to be installed and to be removed def AutoPackages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite-unfsd.out new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite-unfsd.out --- old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite-unfsd.out 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite-unfsd.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -Dump Read -Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] -Read .init.scripts.exists "nfslock" false -Read .sysconfig.nfs.NFS4_SUPPORT nil -Read .sysconfig.nfs.NFS_SECURITY_GSS nil -Return true -Dump Write OK -Read .target.dir "/projects" nil -Execute .target.mkdir "/projects" true -Read .target.dir "/usr" nil -Execute .target.mkdir "/usr" true -Read .target.dir "/pub" nil -Execute .target.mkdir "/pub" true -Write .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] true -Write .sysconfig.nfs.NFS4_SUPPORT "no" true -Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true -Write .sysconfig.nfs nil true -Return true -Dump Write KO -Read .target.dir "/projects" nil -Execute .target.mkdir "/projects" true -Read .target.dir "/usr" nil -Execute .target.mkdir "/usr" true -Read .target.dir "/pub" nil -Execute .target.mkdir "/pub" true -Write .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] false -Log Unable to write to /etc/exports. -Return false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite-unfsd.rb new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite-unfsd.rb --- old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite-unfsd.rb 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite-unfsd.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -# encoding: utf-8 - -# Module: -# NFS server configuration -# -# Summary: -# Testsuite -# -# Authors: -# Martin Vidner <[email protected]> -# -# $Id$ -module Yast - class ReadwriteUnfsdClient < Client - def main - # testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp - - Yast.include self, "testsuite.rb" - - @I_READ = { "target" => { "size" => 0 } } - @I_WRITE = {} - @I_EXEC = { "target" => { "bash_output" => {} } } - TESTSUITE_INIT([@I_READ, @I_WRITE, @I_EXEC], nil) - - Yast.import "NfsServer" - Yast.import "Report" - - Report.DisplayErrors(false, 0) - - @service_on = { "start" => ["3", "5"], "stop" => ["3", "5"] } - @service_off = { "start" => [], "stop" => [] } - @exports = [ - { "allowed" => ["proj*.local.domain(rw)"], "mountpoint" => "/projects" }, - { - "allowed" => ["*.local.domain(ro)", "@trusted(rw)"], - "mountpoint" => "/usr" - }, - { "allowed" => ["(ro,insecure,all_squash)"], "mountpoint" => "/pub" } - ] - @READ = { - # Runlevel: - "init" => { - "scripts" => { - "exists" => true, - "runlevel" => { - "rpcbind" => @service_on, - "nfsserver" => @service_on, - "network" => @service_on, - "networkmanager" => @service_off - }, - # their contents is not important for ServiceAdjust - "comment" => { - "rpcbind" => {}, - "nfsserver" => {} - } - } - }, - # // targetpkg: - # "targetpkg": $[ - # // autofs - # "installed": true, - # ], - # NfsServer itself: - "etc" => { - "exports" => @exports, - "sysconfig" => {} - }, - "target" => { - "dir" => nil, - # pretend none exist - "stat" => { "dummy" => true } - } - } - - # pretend nfslock does not exist - @READ2 = deep_copy(@READ) # copy on write works - Ops.set(@READ2, ["init", "scripts", "exists"], false) - - @WRITE = {} - - @WRITE_KO = { "etc" => { "exports" => false } } - - @EXECUTE = { - "target" => { - "bash_output" => { "exit" => 0, "stdout" => "", "stderr" => "" }, - "mkdir" => true - } - } - - NfsServer.write_only = false - - DUMP("Read") - TEST(lambda { NfsServer.Read }, [[@READ, @READ2], @WRITE, @EXECUTE], nil) - DUMP("Write OK") - TEST(lambda { NfsServer.Write }, [@READ, @WRITE, @EXECUTE], nil) - DUMP("Write KO") - TEST(lambda { NfsServer.Write }, [@READ, @WRITE_KO, @EXECUTE], nil) - - nil - end - end -end - -Yast::ReadwriteUnfsdClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite.out new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite.out --- old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite.out 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite.out 2014-05-22 10:59:43.000000000 +0200 @@ -1,6 +1,5 @@ Dump Read Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] -Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite.rb new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite.rb --- old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite.rb 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite.rb 2014-05-22 10:59:43.000000000 +0200 @@ -44,14 +44,12 @@ "exists" => true, "runlevel" => { "rpcbind" => @service_on, - "nfsserver" => @service_on, - "nfslock" => @service_on + "nfsserver" => @service_on }, # their contents is not important for ServiceAdjust "comment" => { "rpcbind" => {}, - "nfsserver" => {}, - "nfslock" => {} + "nfsserver" => {} } } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.out new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite2.out --- old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.out 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite2.out 2014-05-22 10:59:43.000000000 +0200 @@ -2,7 +2,6 @@ Dump Read - services are running Dump Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] -Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Return true @@ -24,7 +23,6 @@ Dump Read - services are running Dump Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] -Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Return true @@ -47,7 +45,6 @@ Dump Read - services are stopped Dump Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] -Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Return true @@ -69,7 +66,6 @@ Dump Read - services are stopped Dump Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] -Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.rb new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite2.rb --- old/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.rb 2014-05-05 16:39:50.000000000 +0200 +++ new/yast2-nfs-server-3.1.7/testsuite/tests/readwrite2.rb 2014-05-22 10:59:43.000000000 +0200 @@ -71,8 +71,6 @@ } } - # pretend nfslock does not exist - # not used @READ2 = deep_copy(@READ) Ops.set(@READ2, ["init", "scripts", "exists"], false) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
