Author: jreidinger Date: Mon Jun 27 14:20:15 2011 New Revision: 64602 URL: http://svn.opensuse.org/viewcvs/yast?rev=64602&view=rev Log: merge SP2 fix for autoyast nfs4 enablement (bnc#684859) Modified: trunk/nfs-client/ (props changed) trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=64602&r1=64601&r2=64602&view=diff ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Mon Jun 27 14:20:15 2011 @@ -72,7 +72,7 @@ */ global list<map> non_nfs_entries = []; - global boolean nfs4_enabled = false; + global boolean nfs4_enabled = nil; global string idmapd_domain = ""; @@ -144,6 +144,11 @@ if ( !haskey(s, "vfstype") ) { s["vfstype"] = "nfs"; + } else { + if (s["vfstype"]:"nfs" == "nfs4") + { + nfs4_enabled = true; + } } return s; @@ -383,16 +388,15 @@ Service::Enable("nfsboot"); } - if(nfs4_enabled) + if(nfs4_enabled == true) { SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"yes"); SCR::Write(.etc.idmapd_conf, ["Domain", idmapd_domain] ); } - else + else if (nfs4_enabled == false) { SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"no"); } - boolean progress_orig = Progress::set (false); SuSEFirewall::WriteOnly (); Progress::set (progress_orig); @@ -544,7 +548,7 @@ { if (Service::Start( portmapper ) == false) { - y2warning( sformat("%1 cannot be started", portmapper) ); + y2warning("%1 cannot be started", portmapper); return nil; } } Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=64602&r1=64601&r2=64602&view=diff ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Mon Jun 27 14:20:15 2011 @@ -570,8 +570,8 @@ void InitSettings( ) { CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); - UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled); - UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled); + UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled != false); + UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false); UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org