February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67470 - /tags/stable-2_21_5/nfs-client/
by mfilka＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: mfilka Date: Fri Feb 17 14:19:27 2012 New Revision: 67470 URL: http://svn.opensuse.org/viewcvs/yast?rev=67470&view=rev Log: Created tag stable-2_21_5 for nfs-client Added: tags/stable-2_21_5/nfs-client/ (props changed) - copied from r67469, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67469 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/routines.ycp testsuite/tests/r-check.out testsuite/tests/r-check.ycp testsuite/tests/r-spec.out testsuite/tests/r-spec.ycp
by mfilka＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: mfilka Date: Fri Feb 17 14:18:54 2012 New Revision: 67469 URL: http://svn.opensuse.org/viewcvs/yast?rev=67469&view=rev Log: IPv6 addresses supported - bnc#719538 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/routines.ycp trunk/nfs-client/testsuite/tests/r-check.out trunk/nfs-client/testsuite/tests/r-check.ycp trunk/nfs-client/testsuite/tests/r-spec.out trunk/nfs-client/testsuite/tests/r-spec.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67469&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Fri Feb 17 14:18:54 2012 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Fri Feb 17 14:18:54 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 17 13:14:44 UTC 2012 - mfilka(a)suse.com + +- IPv6 addresses supported - bnc#719538 +- updated testsuite +- 2.21.5 + +------------------------------------------------------------------- Thu Feb 16 13:16:18 UTC 2012 - mfilka(a)suse.com - removed some dead code, whitespaces Modified: trunk/nfs-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/routines.ycp?rev=… ============================================================================== --- trunk/nfs-client/src/routines.ycp (original) +++ trunk/nfs-client/src/routines.ycp Fri Feb 17 14:18:54 2012 @@ -23,17 +23,29 @@ import "Package"; import "Report"; + import "IP"; + import "String"; /** * @param spec "server:/path/specification" * @return `couple("server", "/path/specification") */ define term SpecToServPath(string spec) ``{ - integer colonpos = findfirstof(spec, ":"); + // split using ":/" (because of IPv6) + integer path_begin = search( spec, ":/"); string serv = ""; - if (colonpos != nil) { - serv = substring(spec, 0, colonpos); - spec = substring(spec, colonpos+1); + + // no :/ inside => <server>: or [/]<path> + if( path_begin == nil ) + { + if(spec == filterchars(spec, "-_." + String::CAlnum() ) + ":") + // matches [a-zA-Z0-1.-_] and ends with colon? => <server>: + path_begin = size( spec) -1; + } + + if (path_begin != nil) { + serv = substring(spec, 0, path_begin); + spec = substring(spec, path_begin+1); } return `couple(serv, spec); } @@ -68,16 +80,22 @@ * @return whether valid */ define boolean CheckHostName(string name) ``{ + string dirname_forbidden = ":"; + if (size(name) > 0 && size(name) < 50 && - name == filterchars(name, - "-_.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")) { + name == filterchars(name, "-_.:" + String::CAlnum() )) { + if( IP::Check( name)) + return true; + if( "" != filterchars( name, dirname_forbidden)) + return false; + return true; } else // error popup message Report::Error (sformat(_("The hostname entered is invalid. It must be shorter than 50 characters and only use -0-9, A-Z, a-z, dots, -, and _."))); +0-9, A-Z, a-z, dots, -, and _.:"))); return false; }; Modified: trunk/nfs-client/testsuite/tests/r-check.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-che… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-check.out (original) +++ trunk/nfs-client/testsuite/tests/r-check.out Fri Feb 17 14:18:54 2012 @@ -14,3 +14,6 @@ Return false Return false Return false +Return true +Return false +Return true Modified: trunk/nfs-client/testsuite/tests/r-check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-che… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-check.ycp (original) +++ trunk/nfs-client/testsuite/tests/r-check.ycp Fri Feb 17 14:18:54 2012 @@ -19,6 +19,9 @@ string OK_Name = "foo.bar.com.tw"; string TooLongName = "123456789012345678901234567890123456789012345678901234567890"; string IllegalName = "Something:wrong"; + string IPv4 = "192.168.10.1"; + string IPv4_invalid= "192.168.10:1"; + string IPv6 = "fe80::219:d1ff:feac:fd10"; DUMP ("check_options"); TEST (``(check_options ("")), [], nil); @@ -37,5 +40,9 @@ TEST (``(CheckHostName (TooLongName)), [], nil); TEST (``(CheckHostName (IllegalName)), [], nil); // Too long & illegal char - TEST (``(CheckHostName (TooLongName + ":")), [], nil); + TEST (``(CheckHostName (TooLongName + "!")), [], nil); + // check IPv? adresses + TEST (``(CheckHostName (IPv4)), [], nil); + TEST (``(CheckHostName (IPv4_invalid)), [], nil); + TEST (``(CheckHostName (IPv6)), [], nil); } Modified: trunk/nfs-client/testsuite/tests/r-spec.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-spe… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-spec.out (original) +++ trunk/nfs-client/testsuite/tests/r-spec.out Fri Feb 17 14:18:54 2012 @@ -4,5 +4,5 @@ Return `couple ("", "nocolon.only.server.com") Return `couple ("", "/only/path") Return `couple ("", "/nocolon/only/path") -Return `couple ("two", "colons:used") +Return `couple ("fe80::219:d1ff:feac:fd10", "/path") Return `couple ("", "") Modified: trunk/nfs-client/testsuite/tests/r-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-spe… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-spec.ycp (original) +++ trunk/nfs-client/testsuite/tests/r-spec.ycp Fri Feb 17 14:18:54 2012 @@ -22,6 +22,6 @@ TEST (``(SpecToServPath ("nocolon.only.server.com")), [], nil); TEST (``(SpecToServPath (":/only/path")), [], nil); TEST (``(SpecToServPath ("/nocolon/only/path")), [], nil); - TEST (``(SpecToServPath ("two:colons:used")), [], nil); + TEST (``(SpecToServPath ("fe80::219:d1ff:feac:fd10:/path")), [], nil); TEST (``(SpecToServPath ("")), [], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67468 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 11:39:27 2012 New Revision: 67468 URL: http://svn.opensuse.org/viewcvs/yast?rev=67468&view=rev Log: - improved logging - tiny optimization Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 17 11:39:27 2012 @@ -99,11 +99,10 @@ string GetDeviceName(string channel) { - string cmd = sformat("ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'", channel); - map<string, any> disk = (map<string, any>) SCR::Execute(.target.bash_output, cmd); - if (disk["exit"]:-1 == 0 && !isempty(disk["stdout"]:"")) - return sformat("/dev/%1", disk["stdout"]:""); - + string dir = sformat("/sys/bus/ccw/devices/%1/block/", channel); + list<string> files = (list<string>) SCR::Read(.target.dir, dir); + if (size(files) == 1) + return "/dev/" + files[0]:""; return nil; } @@ -480,20 +479,17 @@ /** - * Activate selected Disks + * Activate disk * @param channel string Name of the disk to activate * @param diag boolean Activate DIAG or not */ global void ActivateDisk(string channel, boolean diag) { - string command = sformat ( - "/sbin/dasd_configure '%1' '%2' '%3'", - channel, - 1, - diag ? 1 : 0 - ); - integer ret = (integer)SCR::Execute (.target.bash, command); - y2milestone ("Running command %1 with exit code %2", command, ret); + string command = sformat("/sbin/dasd_configure '%1' %2 %3", channel, 1, diag ? 1 : 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + if (ret == 8) { string popup = sformat (_("Device %1 is not formatted. Format device now? @@ -518,32 +514,33 @@ DeactivateDisk(channel, diag); } else { - ReportActivationError (channel, ret); + ReportActivationError(channel, ret); } + disk_configured = true; } + /** - * Activate selected Disks + * Deactivate disk * @param channel string Name of the disk to deactivate * @param diag boolean Activate DIAG or not */ global void DeactivateDisk(string channel, boolean diag) { - string command = sformat ( - "/sbin/dasd_configure '%1' '%2' '%3'", - channel, - 0, - diag ? 1 : 0 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/dasd_configure '%1' %2 %3", channel, 0, diag ? 1 : 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + /** - * Activate selected Disks + * Format disks * @param disks_list list<string> List of disks to be formated * @param par integer Number of disks that can be formated in parallel * @param write_vl boolean Write a Volume label Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 17 11:39:27 2012 @@ -471,16 +471,14 @@ { if (! activated_controllers[channel]:false) { - string command = sformat ( - "/sbin/zfcp_host_configure '%1' '%2'", - channel, - 1 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); + string command = sformat("/sbin/zfcp_host_configure '%1' %2", channel, 1); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + if (ret != 0) { - ReportControllerActivationError (channel, ret); + ReportControllerActivationError(channel, ret); } else { @@ -488,20 +486,18 @@ } } - string command = sformat ( - "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", - channel, - // bugzilla #205503 - HexNumSize (wwpn, 16), - HexNumSize (lun, 16), - 1 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, + HexNumSize(wwpn, 16), HexNumSize(lun, 16), 1); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + /** * Activate a disk * @param channel string channel id @@ -510,20 +506,18 @@ */ global void DeactivateDisk(string channel, string wwpn, string lun) { - string command = sformat ( - "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", - channel, - // bugzilla #205503 - HexNumSize (wwpn, 16), - HexNumSize (lun, 16), - 0 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, + HexNumSize(wwpn, 16), HexNumSize(lun, 16), 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + list<string> runCommand(string cmd){ list<string> ret = []; map<string, any> cmd_output = (map<string, any>)SCR::Execute(.target.bash_output, cmd); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67467 - in /trunk/s390/src: dasd/dialogs.ycp dasd/helps.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 16:32:06 2012 New Revision: 67467 URL: http://svn.opensuse.org/viewcvs/yast?rev=67467&view=rev Log: - cleanup Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/helps.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Thu Feb 16 16:32:06 2012 @@ -9,7 +9,6 @@ { textdomain "s390"; -import "Arch"; import "DASDController"; import "Label"; import "Mode"; Modified: trunk/s390/src/dasd/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/helps.ycp?rev=6746… ============================================================================== --- trunk/s390/src/dasd/helps.ycp (original) +++ trunk/s390/src/dasd/helps.ycp Thu Feb 16 16:32:06 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; /** @@ -73,22 +71,17 @@ /* Disk add help 1/3 */ "disk_add_config" : _("<big>Add New DASD Disk</big> To add a disk, enter the Channel Number of the DASD disk as -identifier.") +identifier.") + -+ /* Disk add help 1/3 */ _("If the disk should be formatted, use Format the Disk. -") +") + -+ -(Arch::s390_32 () - /* Disk add help 3/3, optional */ - ? _("To use DIAG mode, select Use DIAG. + /* Disk add help 3/3 */ + _("To use DIAG mode, select Use DIAG. ") - : ""), ]; -/* EOF */ } Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Feb 16 16:32:06 2012 @@ -15,7 +15,6 @@ import "Mode"; import "Report"; -import "Arch"; import "FileUtils"; import "Popup"; import "String"; @@ -487,7 +486,6 @@ */ global void ActivateDisk(string channel, boolean diag) { -// if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", channel, @@ -532,7 +530,6 @@ */ global void DeactivateDisk(string channel, boolean diag) { - // if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", channel, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67466 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 15:18:01 2012 New Revision: 67466 URL: http://svn.opensuse.org/viewcvs/yast?rev=67466&view=rev Log: - moved functionality to module Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Thu Feb 16 15:18:01 2012 @@ -543,10 +543,7 @@ "diag" : diag, ]; - integer index = 0; - while (haskey (DASDController::devices, index)) - index = index + 1; - DASDController::devices[index] = d; + DASDController::AddDevice(d); } return ret; @@ -566,10 +563,15 @@ } list<integer> selected = ListSelectedDASD(); - - DASDController::devices = filter(integer index, map<string, any> d, DASDController::devices, { - return !contains(selected, index); - }); + if (isempty(selected)) + { + // error popup message + Popup::Message (_("No disk selected.")); + } + else + { + foreach(integer index, selected, { DASDController::RemoveDevice(index); }); + } return `next; } Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Feb 16 15:18:01 2012 @@ -275,6 +275,23 @@ } + global void + AddDevice(map<string, any> d) + { + integer index = 0; + while (haskey(devices, index)) + index = index + 1; + devices[index] = d; + } + + + global void + RemoveDevice(integer index) + { + devices = remove(devices, index); + } + + global integer GetDeviceIndex(string channel) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67465 - in /trunk/nfs-client: package/yast2-nfs-client.changes src/Nfs.ycp src/ui.ycp
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 14:22:19 2012 New Revision: 67465 URL: http://svn.opensuse.org/viewcvs/yast?rev=67465&view=rev Log: removed some dead code, whitespaces Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 14:22:19 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 16 13:16:18 UTC 2012 - mfilka(a)suse.com + +- removed some dead code, whitespaces + +------------------------------------------------------------------- Thu Feb 16 12:44:04 UTC 2012 - mfilka(a)suse.com - autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67465… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 14:22:19 2012 @@ -82,7 +82,7 @@ list<string> created_dirs = []; boolean ReadNfs4 () { - return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); + return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); } string ReadIdmapd() { @@ -375,11 +375,6 @@ return false; } -/* if (size (nfs_entries) == 0) - { - // Service::Adjust ("nfs", "disable"); // what if autofs needs it? - }*/ - portmapper = FindPortmapper(); if (size (nfs_entries) != 0) { @@ -636,8 +631,8 @@ return true; } - /** - * Return required packages for auto-installation + /** + * Return required packages for auto-installation * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67465&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Feb 16 14:22:19 2012 @@ -129,7 +129,7 @@ /* Return convenient hostname (FaTE #302863) to be proposed * i.e. nfs + current domain (nfs. + suse.cz) - * @return string proposed hostname + * @return string proposed hostname */ define string ProposeHostname() { string ret = ""; @@ -586,7 +586,7 @@ EnableDisableButtons(); } - + void InitSettings( ) { CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); @@ -594,16 +594,16 @@ UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false); UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain); } - + void SaveFstabEntries( ) { Nfs::nfs_entries = nfs_entries; } - + void SaveSettings( map event ) { CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); - Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value); } @@ -613,9 +613,6 @@ // handle the events, enable/disable the button, show the popup if button clicked if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) ) CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", $[ "ID" : widget ]); - /*changed = - true || // TODO: fw changed, #44106 - true; // TODO: nfs changed*/ if ( UI::WidgetExists(`id(`fstable)) ) entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); @@ -719,7 +716,7 @@ do { - event = UI::WaitForEvent (); + event = UI::WaitForEvent (); ret = event["ID"]:nil; if (ret == `ok) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67464 - /tags/stable-2_21_4/nfs-client/
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:49:24 2012 New Revision: 67464 URL: http://svn.opensuse.org/viewcvs/yast?rev=67464&view=rev Log: Created tag stable-2_21_4 for nfs-client Added: tags/stable-2_21_4/nfs-client/ (props changed) - copied from r67463, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67463 - in /trunk/nfs-client: package/yast2-nfs-client.changes src/Nfs.ycp
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:47:25 2012 New Revision: 67463 URL: http://svn.opensuse.org/viewcvs/yast?rev=67463&view=rev Log: autoinstallation fails to enable rpcbind / portmapper - bnc#744357 Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 13:47:25 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 16 12:44:04 UTC 2012 - mfilka(a)suse.com + +- autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 +- 2.21.4 + +------------------------------------------------------------------- Thu Feb 16 12:23:00 UTC 2012 - mfilka(a)suse.com - accepted comments from earlier review. Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67463… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 13:47:25 2012 @@ -380,6 +380,7 @@ // Service::Adjust ("nfs", "disable"); // what if autofs needs it? }*/ + portmapper = FindPortmapper(); if (size (nfs_entries) != 0) { Service::Enable( portmapper ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67462 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/Nfs.ycp src/ui.ycp yast2-nfs-client.spec.in
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:43:13 2012 New Revision: 67462 URL: http://svn.opensuse.org/viewcvs/yast?rev=67462&view=rev Log: Accepted comments from 2.21.3 review Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp trunk/nfs-client/yast2-nfs-client.spec.in Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67462&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Thu Feb 16 13:43:13 2012 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 13:43:13 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 16 12:23:00 UTC 2012 - mfilka(a)suse.com + +- accepted comments from earlier review. +- some formatting +- 2.21.4 + +------------------------------------------------------------------- Wed Feb 8 12:00:10 UTC 2012 - mfilka(a)suse.com - Base server hostname combobox on existing values - bnc#547983 Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67462… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 13:43:13 2012 @@ -137,22 +137,23 @@ } }); - //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts - //thus we need to keep info on nfs version (v3 vs. v4) - //But older AY profiles might not contain this element - //so let's assume nfsv3 in that case (#395850) - if ( !haskey(s, "vfstype") ) - { - s["vfstype"] = "nfs"; - } else { - if (s["vfstype"]:"nfs" == "nfs4") - { - nfs4_enabled = true; - } - } + //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts + //thus we need to keep info on nfs version (v3 vs. v4) + //But older AY profiles might not contain this element + //so let's assume nfsv3 in that case (#395850) + if ( !haskey(s, "vfstype") ) + { + s["vfstype"] = "nfs"; + } else { + if (s["vfstype"]:"nfs" == "nfs4") + { + nfs4_enabled = true; + } + } return s; }); + if (missing) { return false; @@ -305,10 +306,10 @@ Progress::set(progress_orig); portmapper = FindPortmapper(); - //There is neither rpcbind nor portmap + //There is neither rpcbind nor portmap if ( portmapper == "" ) { - //so let's install rpcbind (default since #423026) + //so let's install rpcbind (default since #423026) required_packages = add( required_packages, "rpcbind" ); portmapper = "rpcbind"; } Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67462&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Feb 16 13:43:13 2012 @@ -223,9 +223,7 @@ foreach( map nfs_entry, nfs_entries, { term couple = SpecToServPath( nfs_entry[ "spec"]:""); - string known_server = ""; - - known_server = couple[0]:""; + string known_server = couple[0]:""; if( !contains( servers, known_server)) servers = add( servers, known_server); Modified: trunk/nfs-client/yast2-nfs-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/yast2-nfs-client.spec… ============================================================================== --- trunk/nfs-client/yast2-nfs-client.spec.in (original) +++ trunk/nfs-client/yast2-nfs-client.spec.in Thu Feb 16 13:43:13 2012 @@ -21,6 +21,7 @@ BuildArch: noarch Summary: YaST2 - NFS Configuration +Url: http://en.opensuse.org/Portal:YaST %description The YaST2 component for configuration of NFS. NFS stands for network -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67461 - in /trunk/s390/src/clients: dasd.desktop zfcp.desktop
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 12:36:37 2012 New Revision: 67461 URL: http://svn.opensuse.org/viewcvs/yast?rev=67461&view=rev Log: - unified desktop files Modified: trunk/s390/src/clients/dasd.desktop trunk/s390/src/clients/zfcp.desktop Modified: trunk/s390/src/clients/dasd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd.desktop?re… ============================================================================== --- trunk/s390/src/clients/dasd.desktop (original) +++ trunk/s390/src/clients/dasd.desktop Thu Feb 16 12:36:37 2012 @@ -21,5 +21,5 @@ Exec=xdg-su -c "/sbin/yast2 dasd" Name=DASD -GenericName=Configure dasd +GenericName=Configure DASD StartupNotify=true Modified: trunk/s390/src/clients/zfcp.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp.desktop?re… ============================================================================== --- trunk/s390/src/clients/zfcp.desktop (original) +++ trunk/s390/src/clients/zfcp.desktop Thu Feb 16 12:36:37 2012 @@ -20,6 +20,6 @@ Icon=yast-zfcp Exec=xdg-su -c "/sbin/yast2 zfcp" -Name=Zfcp -GenericName=Configure zfcp +Name=ZFCP +GenericName=Configure ZFCP StartupNotify=true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0