April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56896 - /branches/tmp/coolo/update_yast_repo/last_rev_yast
by coolo＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: coolo Date: Tue Apr 21 16:49:03 2009 New Revision: 56896 URL: http://svn.opensuse.org/viewcvs/yast?rev=56896&view=rev Log: 93 more Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Tue Apr 21 16:49:03 2009 @@ -1 +1 @@ -56803 +56896 -- 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] r56895 - in /trunk/theme: VERSION package/yast2-theme.changes
by coolo＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: coolo Date: Tue Apr 21 16:36:58 2009 New Revision: 56895 URL: http://svn.opensuse.org/viewcvs/yast?rev=56895&view=rev Log: submit Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=56895&r1=56894… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Tue Apr 21 16:36:58 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Tue Apr 21 16:36:58 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 16:36:36 CEST 2009 - coolo(a)suse.de + +- update the logo to say 11.2 (ugly) +- 2.18.2 + +------------------------------------------------------------------- Wed Apr 1 13:47:29 CEST 2009 - locilka(a)suse.cz - New YaST icon based on new YaST Mascot: Aardvark. -- 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] r56894 - /trunk/theme/openSUSE/wizard/logo.png
by coolo＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: coolo Date: Tue Apr 21 16:36:04 2009 New Revision: 56894 URL: http://svn.opensuse.org/viewcvs/yast?rev=56894&view=rev Log: make it 11.2 :) Modified: trunk/theme/openSUSE/wizard/logo.png Modified: trunk/theme/openSUSE/wizard/logo.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/logo.png?r… ============================================================================== Binary files - no diff available. -- 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] r56893 - in /trunk/storage/storage/src/include: ep-all.ycp ep-hd.ycp
by kmachalkova＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: kmachalkova Date: Tue Apr 21 16:03:47 2009 New Revision: 56893 URL: http://svn.opensuse.org/viewcvs/yast?rev=56893&view=rev Log: Moving 'Rescan' button and other module configs menu to the main screen Modified: trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Tue Apr 21 16:03:47 2009 @@ -7,9 +7,25 @@ { textdomain "storage"; + import "Arch"; + import "PackageCallbacks"; + import "PackageSystem"; + void CreateAllPanel(any user_data) { + + boolean IsAvailable ( string client ) + { + //in the installed system, we don't care if the client isn't there + //as the user will be prompted to install the pkg anyway (in CallConfig) + if ( !Stage::initial() ) + return true; + //check if the client is in inst-sys + else + return WFM::ClientExists(client); + } + string short_hostname = Hostname::CurrentHostname(); list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, @@ -21,14 +37,45 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateAll); - term buttons = `HBox(); + term buttons = `HBox( + // push button text + `PushButton(`id(`rescan), `opt(`key_F6), _("Rescan Devices")) + ); if (Mode::installation()) { // push button text buttons = add(buttons, `PushButton(`id(`import), _("Import Mount Points..."))); - buttons = add(buttons, `HStretch()); } + buttons = add(buttons, `HStretch()); + + list<term> configs = []; + + if (IsAvailable("iscsi-client")) { + // menu entry text + configs = add(configs, `item(`id(`iscsi), `icon("yast-iscsi-client"), _("Configure &iSCSI..."))); + } + + if (true) { + // menu entry text + configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); + } + + if (Arch::s390() && IsAvailable("s390")) { + // menu entry text + configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); + // menu entry text + configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); + // menu entry text + configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); + } + + if (size(configs) > 0) { + // menu button text + buttons = add(buttons, `MenuButton(`opt(`key_F7), _("Configure..."), configs)); + } + + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( @@ -66,8 +113,55 @@ void HandleAllPanel(any user_data, map event) { + + boolean CheckAndInstallPackages( list <string> pkgs ) + { + if (Stage::initial()) + return true; + + boolean ret = false; + //switch off pkg-mgmt loading progress dialogs, + //because it just plain sucks + PackageCallbacks::RegisterEmptyProgressCallbacks(); + ret = PackageSystem::CheckAndInstallPackages(pkgs); + PackageCallbacks::RestorePreviousProgressCallbacks(); + + return ret; + } + + void CallConfig(string text, list<string> pkgs, string call) + { + boolean doit = true; + + if (!Storage::EqualBackupStates("expert-partitioner", "", true)) + { + doit = Popup::YesNo(text); + } + + if (doit) + { + if (pkgs == nil || CheckAndInstallPackages(pkgs)) + { + if (call != nil) + WFM::call(call); + RescanDisks(); + Storage::CreateTargetBackup("expert-partitioner"); + + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + } + } + } + switch (Event::IsWidgetActivated(event)) { + case `rescan: + // popup text + CallConfig(_("Rescaning disks cancels all current changes. +Really rescan disks?"), nil, nil); + break; + case `import: ImportMountPoints(); @@ -77,6 +171,45 @@ break; } + switch (Event::IsMenu(event)) + { + case `iscsi: + // popup text + CallConfig(_("Calling iSCSI configuration cancels all current changes. +Really call iSCSI configuration?"), ["yast2-iscsi-client"], "iscsi-client"); + break; + + case `multipath: + if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || + (Mode::normal() && WFM::ClientExists("multipath"))) + // popup text + CallConfig(_("Calling Multipath configuration cancels all current changes. +Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); + else + // popup text + CallConfig(_("Calling Multipath configuration cancels all current changes. +Really call Multipath configuration?"), nil, "multipath-simple"); + break; + + case `dasd: + // popup text + CallConfig(_("Calling DASD configuration cancels all current changes. +Really call DASD configuration?"), ["yast2-s390"], "dasd"); + break; + + case `zfcp: + // popup text + CallConfig(_("Calling zFCP configuration cancels all current changes. +Really call zFCP configuration?"), ["yast2-s390"], "zfcp"); + break; + + case `xpram: + // popup text + CallConfig(_("Calling XPRAM configuration cancels all current changes. +Really call XPRAM configuration?"), ["yast2-s390"], "xpram"); + break; + } + switch (Event::IsWidgetContextMenuActivated(event)) { case `table: Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue Apr 21 16:03:47 2009 @@ -8,8 +8,6 @@ textdomain "storage"; import "Arch"; - import "PackageCallbacks"; - import "PackageSystem"; import "Region"; import "Mode"; import "Stage"; @@ -66,16 +64,7 @@ return StorageFields::PredicateDiskType(disk, partition, [`CT_DMRAID, `CT_DMMULTIPATH, `CT_DISK]); } - boolean IsAvailable ( string client ) - { - //in the installed system, we don't care if the client isn't there - //as the user will be prompted to install the pkg anyway (in CallConfig) - if ( !Stage::initial() ) - return true; - //check if the client is in inst-sys - else - return WFM::ClientExists(client); - } + list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `format, `type, `fs_type, `label, `mount_point, `mount_by, @@ -87,38 +76,9 @@ list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); term buttons = `HBox( - // push button text - `PushButton(`id(`rescan), `opt(`key_F6), _("Rescan Disks")) + `HStretch() ); - buttons = add(buttons, `HStretch()); - - list<term> configs = []; - - if (IsAvailable("iscsi-client")) { - // menu entry text - configs = add(configs, `item(`id(`iscsi), `icon("yast-iscsi-client"), _("Configure &iSCSI..."))); - } - - if (true) { - // menu entry text - configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); - } - - if (Arch::s390() && IsAvailable("s390")) { - // menu entry text - configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); - // menu entry text - configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); - // menu entry text - configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); - } - - if (size(configs) > 0) { - // menu button text - buttons = add(buttons, `MenuButton(`opt(`key_F7), _("Configure..."), configs)); - } - UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( @@ -141,96 +101,6 @@ void HandleHdMainPanel(any user_data, map event) { - boolean CheckAndInstallPackages( list <string> pkgs ) - { - if (Stage::initial()) - return true; - - boolean ret = false; - //switch off pkg-mgmt loading progress dialogs, - //because it just plain sucks - PackageCallbacks::RegisterEmptyProgressCallbacks(); - ret = PackageSystem::CheckAndInstallPackages(pkgs); - PackageCallbacks::RestorePreviousProgressCallbacks(); - - return ret; - } - - void CallConfig(string text, list<string> pkgs, string call) - { - boolean doit = true; - - if (!Storage::EqualBackupStates("expert-partitioner", "", true)) - { - doit = Popup::YesNo(text); - } - - if (doit) - { - if (pkgs == nil || CheckAndInstallPackages(pkgs)) - { - if (call != nil) - WFM::call(call); - RescanDisks(); - Storage::CreateTargetBackup("expert-partitioner"); - - UpdateMainStatus(); - UpdateNavigationTree(nil); - TreePanel::Create(); - } - } - } - - - switch (Event::IsWidgetActivated(event)) - { - case `rescan: - // popup text - CallConfig(_("Rescaning disks cancels all current changes. -Really rescan disks?"), nil, nil); - break; - } - - switch (Event::IsMenu(event)) - { - case `iscsi: - // popup text - CallConfig(_("Calling iSCSI configuration cancels all current changes. -Really call iSCSI configuration?"), ["yast2-iscsi-client"], "iscsi-client"); - break; - - case `multipath: - if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || - (Mode::normal() && WFM::ClientExists("multipath"))) - // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); - else - // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), nil, "multipath-simple"); - break; - - case `dasd: - // popup text - CallConfig(_("Calling DASD configuration cancels all current changes. -Really call DASD configuration?"), ["yast2-s390"], "dasd"); - break; - - case `zfcp: - // popup text - CallConfig(_("Calling zFCP configuration cancels all current changes. -Really call zFCP configuration?"), ["yast2-s390"], "zfcp"); - break; - - case `xpram: - // popup text - CallConfig(_("Calling XPRAM configuration cancels all current changes. -Really call XPRAM configuration?"), ["yast2-s390"], "xpram"); - break; - } - - switch (Event::IsWidgetContextMenuActivated(event)) { case `table: -- 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] r56892 - /tags/branch-SLE-10-SP3-2_14_47/iscsi-client/
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 16:00:41 2009 New Revision: 56892 URL: http://svn.opensuse.org/viewcvs/yast?rev=56892&view=rev Log: Created tag branch-SLE-10-SP3-2_14_47 for iscsi-client Added: tags/branch-SLE-10-SP3-2_14_47/iscsi-client/ - copied from r56891, branches/SuSE-SLE-10-SP3-Branch/iscsi-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] r56891 - /tags/branch-SLE-10-SP3-2_14_47/
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 16:00:35 2009 New Revision: 56891 URL: http://svn.opensuse.org/viewcvs/yast?rev=56891&view=rev Log: Created tag branch-SLE-10-SP3-2_14_47 Added: tags/branch-SLE-10-SP3-2_14_47/ -- 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] r56890 - in /branches/SuSE-SLE-10-SP3-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 16:00:20 2009 New Revision: 56890 URL: http://svn.opensuse.org/viewcvs/yast?rev=56890&view=rev Log: changed dialogs workflow to allow to edit authentication for connection (fate#305306) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION Tue Apr 21 16:00:20 2009 @@ -1 +1 @@ -2.14.46 +2.14.47 Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes Tue Apr 21 16:00:20 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 9 20:46:19 CET 2009 - mzugec(a)suse.de + +- changed dialogs workflow to allow to edit authentication for + connection (fate#305306) +- 2.14.47 + +------------------------------------------------------------------- Tue Mar 10 13:07:53 CET 2009 - mzugec(a)suse.cz - autologin discovery authentication (bnc#392428) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp Tue Apr 21 16:00:20 2009 @@ -31,6 +31,7 @@ global list <string> sessions = []; global list <string> discovered = []; global list <string> targets = []; +global list<string> currentRecord = []; global boolean configured = false; boolean serviceStatus = false; map<string, any> config = $[]; @@ -109,8 +110,8 @@ } -global map<string, any> getNode(list<string> rec){ - map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":rec[1]:"", "IP":rec[0]:""]); +global map<string, any> getNode(){ + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":currentRecord[1]:"", "IP":currentRecord[0]:""]); if (cmd["exit"]:0!=0) return $[]; map<string, any> auth = $[]; foreach(string row, splitstring(cmd["stdout"]:"", "\n"), { @@ -344,11 +345,11 @@ } // delete deiscovered target from database -global boolean deleteRecord(list<string> record){ +global boolean deleteRecord(){ boolean ret = true; - y2milestone("Delete record %1", record); + y2milestone("Delete record %1", currentRecord); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", record[1]:"", record[0]:"")); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return false; readSessions(); @@ -356,10 +357,10 @@ } // get (manual/automatic) status of target connecting -global string getStartupStatus(list<string> record){ +global string getStartupStatus(){ string status = ""; - y2milestone("Getting status of record %1", record); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", record[1]:"", record[0]:"")); + y2milestone("Getting status of record %1", currentRecord); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return ""; foreach(string row, splitstring(retcode["stdout"]:"", "\n"), { if (issubstring(row, "node.conn[0].startup")){ @@ -367,14 +368,14 @@ break; } }); - y2milestone("Startup status for %1 is %2", record, status); + y2milestone("Startup status for %1 is %2", currentRecord, status); return status; } // update authentication value -global boolean setValue(list<string> record, string name, string value){ - y2milestone("set %1 for record %2", name, record); - string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", record[1]:"", record[0]:"", name, value); +global boolean setValue(string name, string value){ + y2milestone("set %1 for record %2", name, currentRecord); + string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", currentRecord[1]:"", currentRecord[0]:"", name, value); y2milestone("execute command - %1", command ); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, command); @@ -387,12 +388,12 @@ } // check if given target is connected -global boolean connected(list<string> rec, boolean check_ip){ -y2internal("check connected status for %1 with IP check:%2", rec, check_ip); +global boolean connected(boolean check_ip){ +y2internal("check connected status for %1 with IP check:%2", currentRecord, check_ip); boolean ret = false; foreach(string row, sessions, { list<string> list_row = splitstring(row, " "); - if (list_row[1]:"" == rec[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(rec[0]:"", ",")[0]:"" : true)){ + if (list_row[1]:"" == currentRecord[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(currentRecord[0]:"", ",")[0]:"" : true)){ ret = true; break; } @@ -401,11 +402,11 @@ } // change startup status (manual/automatic) for target -global boolean setStartupStatus(list<string> record, string status){ - y2milestone("Set startup status for %1 to %2", record, status); +global boolean setStartupStatus(string status){ + y2milestone("Set startup status for %1 to %2", currentRecord, status); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, - sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", record[1]:"", record[0]:"", status)); + sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status)); if (size(retcode["stderr"]:"")>0) return false; return ret; } @@ -417,9 +418,8 @@ if ( b != $[] ){ y2milestone("checking size of %1 and %2", b["iSCSI_TARGET_NAME"]:"", b["iSCSI_TARGET_IPADDR"]:""); if (size(b["iSCSI_TARGET_NAME"]:"")>0 && size(b["iSCSI_TARGET_IPADDR"]:"")>0){ - list <string> curr_rec = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""]; - y2milestone("variable curr_rec %1", curr_rec); - if (connected( curr_rec , false) == false){ + currentRecord = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""]; + if (connected( false) == false){ y2milestone("in case not connected do discovery"); // do discovery saveConfig(b["iSCSI_TARGET_CHAP_NAME_IN"]:"", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); @@ -429,14 +429,14 @@ // do authentication if needed if (size(b["iSCSI_TARGET_CHAP_NAME"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD"]:"")>0){ y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); - setValue(curr_rec, "node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:""); - setValue(curr_rec, "node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); - setValue(curr_rec, "node.session.auth.authmethod", "CHAP"); + setValue("node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:""); + setValue("node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); + setValue("node.session.auth.authmethod", "CHAP"); } if (size(b["iSCSI_TARGET_CHAP_NAME_IN"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"")>0){ y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME_IN"]:"", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:""); - setValue(curr_rec, "node.session.auth.username_in", b["iSCSI_TARGET_CHAP_NAME_IN"]:""); - setValue(curr_rec, "node.session.auth.password_in", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:""); + setValue("node.session.auth.username_in", b["iSCSI_TARGET_CHAP_NAME_IN"]:""); + setValue("node.session.auth.password_in", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:""); } // log on into target @@ -444,7 +444,7 @@ // set startup status to automatic y2milestone("set startup status to automatic"); - setStartupStatus(curr_rec, "automatic"); + setStartupStatus("automatic"); } else y2error("Already connected, no autoLogOn needed"); } else y2error("iSCSI_TARGET_NAME or iSCSI_TARGET_IPADDR are not available. Couldn't do autoLogOn"); } @@ -452,34 +452,35 @@ } global boolean loginIntoTarget(map target){ - list<string> curr_rec = [target["portal"]:"", target["target"]:""]; + currentRecord = [target["portal"]:"", target["target"]:""]; if (target["authmethod"]:"None"!="None"){ string user_in = target["username_in"]:""; string pass_in = target["password_in"]:""; if (size(user_in)>0 && size(pass_in)>0){ - setValue(curr_rec, "node.session.auth.username_in", user_in); - setValue(curr_rec, "node.session.auth.password_in", pass_in); + setValue("node.session.auth.username_in", user_in); + setValue("node.session.auth.password_in", pass_in); } else{ - setValue(curr_rec, "node.session.auth.username_in", ""); - setValue(curr_rec, "node.session.auth.password_in", ""); + setValue("node.session.auth.username_in", ""); + setValue("node.session.auth.password_in", ""); } string user_out = target["username"]:""; string pass_out = target["password"]:""; if (size(user_out)>0 && size(pass_out)>0){ - setValue(curr_rec, "node.session.auth.username", user_out); - setValue(curr_rec, "node.session.auth.password", pass_out); - setValue(curr_rec, "node.session.auth.authmethod", "CHAP"); + setValue("node.session.auth.username", user_out); + setValue("node.session.auth.password", pass_out); + setValue("node.session.auth.authmethod", "CHAP"); } else { - setValue(curr_rec, "node.session.auth.username", ""); - setValue(curr_rec, "node.session.auth.password", ""); - setValue(curr_rec, "node.session.auth.authmethod", ""); + setValue("node.session.auth.username", ""); + setValue("node.session.auth.password", ""); + setValue("node.session.auth.authmethod", ""); } - } else setValue(curr_rec, "node.session.auth.authmethod", "None"); + } else setValue("node.session.auth.authmethod", "None"); map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --login", target["target"]:"", target["portal"]:"")); y2internal("output %1", output); - if (!Mode::autoinst()) setStartupStatus(curr_rec, "automatic"); + currentRecord = [target["portal"]:"", target["target"]:""]; + if (!Mode::autoinst()) setStartupStatus("automatic"); return output["exit"]:-1==0; } @@ -520,11 +521,12 @@ foreach(string sess, sessions, { string target = splitstring(sess, " ")[1]:""; string portal = splitstring(sess, " ")[0]:""; - map<string, any> auth = getNode([portal, target]); + currentRecord = [portal, target]; + map<string, any> auth = getNode(); map new_target = $["target": target, "portal" : portal, - "startup" : getStartupStatus([portal, target]), + "startup" : getStartupStatus(), ]; if (auth["authmethod"]:"None"=="None") new_target["authmethod"]="None"; else new_target = union(new_target, auth); @@ -644,9 +646,10 @@ } }); foreach(map target, ay_settings["targets"]:[], { -y2internal("login into target %1", target); + y2internal("login into target %1", target); + currentRecord = [target["portal"]:"", target["target"]:""]; loginIntoTarget(target); - setStartupStatus([target["portal"]:"", target["target"]:""], target["startup"]:"manual"); + setStartupStatus(target["startup"]:"manual"); }); return true; } Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp Tue Apr 21 16:00:20 2009 @@ -80,8 +80,9 @@ ), `Left(`HBox( `PushButton(`id(`add), _("Add")), - `PushButton(`id(`del), _("Log Out")), - `PushButton(`id(`toggle), _("Toggle Start-Up")) + `PushButton(`id(`edit), _("Edit")), + `PushButton(`id(`del), _("Log Out")) +// `PushButton(`id(`toggle), _("Toggle Start-Up")) )) ), "init" : initConnectedTable, @@ -133,22 +134,24 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none), `opt(`invertAutoEnable), _("No Authentication"), true , + `VBox( + `Left(`Label(_("Incoming Authentication"))), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication"))), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initDiscAuth, - "handle" : handleDiscAuth, - "validate_type" : `function, - "validate_function" : validateDiscAuth, +// "handle" : handleDiscAuth, +// "validate_type" : `function, +// "validate_function" : validateDiscAuth, "help" : HELPS["conn_auth"]:"" ], @@ -157,25 +160,37 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none),`opt(`invertAutoEnable), _("No Authentication"), true, + `VBox( + `Left( `Label(_("Incoming Authentication")) ), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication")) ), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initConnAuth, - "handle" : handleDiscAuth, +// "handle" : handleDiscAuth, "validate_type" : `function, "validate_function" : validateConnAuth, "help" : HELPS["conn_auth"]:"" ], + "startup" : $[ + "widget" : `combobox, + "opt" : [`hstretch, `notify], + "label" : _("Startup"), + "items" : [ + ["manual", "manual"], + ["onboot", "onboot"], + ["automatic", "automatic"] + ] + ], // widget for portal address "server_location" : $[ "widget" : `custom, @@ -361,7 +376,7 @@ any ConnAuthDialog(string return_to){ current_tab = return_to; string caption = _("iSCSI Initiator Discovery"); - list<map <string, any> > w = CWM::CreateWidgets (["conn_auth"], (map <string, map <string, any> >)widgets); + list<map <string, any> > w = CWM::CreateWidgets (["startup", "conn_auth"], (map <string, map <string, any> >)widgets); term contents = `VBox( `VStretch(), @@ -370,6 +385,7 @@ `HSpacing (1), `VBox( w[0, "widget"]:`VSpacing (1), + w[1, "widget"]:`VSpacing (1), `VSpacing (2) ), `HSpacing (1), Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp Tue Apr 21 16:00:20 2009 @@ -3,7 +3,6 @@ import "IP"; boolean stat = false; - list<string> curr_rec = []; boolean bg_finish = false; // string initiatorname=""; // function for run command in background @@ -96,8 +95,8 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClient::sessions, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", IscsiClient::getStartupStatus(row_in_string))); + IscsiClient::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"", IscsiClient::getStartupStatus())); row = row + 1; }); UI::ChangeWidget (`id (`connected), `Items, items); @@ -106,21 +105,20 @@ } // get record identificator from selected row -list<string> getRecord(){ - list<string> record = []; +list<string> setRecord(){ + IscsiClient::currentRecord = []; any sel_item = UI::QueryWidget(`id(`connected), `CurrentItem); if (sel_item != nil){ integer current = tointeger(sel_item); - record = splitstring(IscsiClient::sessions[current]:"", " " ); + IscsiClient::currentRecord = splitstring(IscsiClient::sessions[current]:"", " " ); // record = deletechars(record, "[]"); } - return record; + return IscsiClient::currentRecord; } // handle for table of connected sessions symbol handleConnectedTable (string key, map event){ if (event["EventReason"]:"" == "Activated"){ - list<string> record = []; switch((symbol)event["ID"]:nil){ case(`add): // add a new target, discovery @@ -129,30 +127,35 @@ return `add; case(`del): // delete (logout from) connected target - record = getRecord(); - if (size( record )>0){ + setRecord(); + if (size( IscsiClient::currentRecord )>0){ if (Popup::ContinueCancel(_("Really log out from the selected target?"))) - if ( !(IscsiClient::deleteRecord( record )) ) Popup::Error(_("Error occurred while logging out from the selected target.")); + if ( !(IscsiClient::deleteRecord()) ) Popup::Error(_("Error occurred while logging out from the selected target.")); else { - y2milestone("Delete record %1", record); + y2milestone("Delete record %1", IscsiClient::currentRecord); initConnectedTable(""); } } else Popup::Error(_("No record found.")); break; + case(`edit): + setRecord(); + return `edit; + break; + case(`toggle): // change manual/automatic status of connected target - record = getRecord(); - if (size( record )>0){ - y2milestone("toggle record %1", record); - string startup = IscsiClient::getStartupStatus(record); + setRecord(); + if (size( IscsiClient::currentRecord )>0){ + y2milestone("toggle record %1", IscsiClient::currentRecord); + string startup = IscsiClient::getStartupStatus(); if (size(startup)>0){ if (startup == "manual"){ - y2milestone("Change status for %1 to %2", record, "automatic"); - IscsiClient::setStartupStatus(record, "automatic"); + y2milestone("Change status for %1 to %2", IscsiClient::currentRecord, "automatic"); + IscsiClient::setStartupStatus("automatic"); } else { - y2milestone("Change status for %1 to %2", record, "manual"); - IscsiClient::setStartupStatus(record, "manual"); + y2milestone("Change status for %1 to %2", IscsiClient::currentRecord, "manual"); + IscsiClient::setStartupStatus("manual"); } initConnectedTable(""); } @@ -161,13 +164,13 @@ } } // if nothing selected - disable some buttons, otherwise enable them - if( getRecord() == []){ + if( setRecord() == []){ UI::ChangeWidget (`id (`del), `Enabled, false); - UI::ChangeWidget (`id (`toggle), `Enabled, false); + UI::ChangeWidget (`id (`edit), `Enabled, false); } else { UI::ChangeWidget (`id (`del), `Enabled, true); - UI::ChangeWidget (`id (`toggle), `Enabled, true); + UI::ChangeWidget (`id (`edit), `Enabled, true); } return nil; @@ -303,40 +306,46 @@ // ***************** add table *************************** // set incoming widget status +/* void setAuthIn(boolean status){ UI::ChangeWidget(`id(`user_in),`Enabled, status ); UI::ChangeWidget(`id(`pass_in),`Enabled, status ); UI::ChangeWidget(`id(`auth_in),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // set outgoing widget status +/* void setAuthOut(boolean status){ UI::ChangeWidget(`id(`user_out),`Enabled, status ); UI::ChangeWidget(`id(`pass_out),`Enabled, status ); UI::ChangeWidget(`id(`auth_out),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // disable both incoming and outgoing void initDiscAuth(string key){ - setAuthIn(false); - setAuthOut(false); +// setAuthIn(false); +// setAuthOut(false); } void initConnAuth(string key){ - setAuthIn(false); - setAuthOut(false); - map<string, any> auth = IscsiClient::getNode(curr_rec); +// setAuthIn(false); +// setAuthOut(false); + map<string, any> auth = IscsiClient::getNode(); if (size(auth)>0) { UI::ChangeWidget(`id(`user_in),`Value, auth["username_in"]:"" ); UI::ChangeWidget(`id(`pass_in),`Value, auth["password_in"]:"" ); - if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); +// if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); UI::ChangeWidget(`id(`user_out),`Value, auth["username"]:"" ); UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); - if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); +// if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); } + string startup=IscsiClient::getStartupStatus(); + if(size(startup)>0) UI::ChangeWidget(`id("startup"), `Value, startup); } // handle for enable/disable widgets in authentication dialog symbol handleDiscAuth(string key, map event){ @@ -345,16 +354,16 @@ switch((symbol)event["ID"]:nil){ case(`auth_none): status = (boolean)UI::QueryWidget(`id(`auth_none), `Value); - setAuthIn(!status); - setAuthOut(!status); +// setAuthIn(!status); +// setAuthOut(!status); break; case(`auth_in): status = (boolean)UI::QueryWidget(`id(`auth_in), `Value); - setAuthIn(status); +// setAuthIn(status); break; case(`auth_out): status = (boolean)UI::QueryWidget(`id(`auth_out), `Value); - setAuthOut(status); +// setAuthOut(status); break; } } @@ -398,12 +407,12 @@ IscsiClient::getConfig(); boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); + boolean auth_in = (!auth_none && size(user_in)>0 && size(pass_in)>0); + boolean auth_out = (!auth_none && size(user_out)>0 && size(pass_out)>0); if (auth_none){ user_in = ""; @@ -429,8 +438,8 @@ list<string>trg_list = runInBg( command ); IscsiClient::targets = []; foreach(string row, trg_list, { - list<string> tmp_list=splitstring(row, " "); - if (issubstring(tmp_list[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[0]:"", tmp_list[1]:"")); + IscsiClient::currentRecord=splitstring(row, " "); + if (issubstring(IscsiClient::currentRecord[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"")); }); while(!bg_finish){}; // restore old config @@ -448,7 +457,8 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - if ((params==[])||(IscsiClient::connected( [ splitstring(params[0]:"", ",")[0]:"", params[1]:""], true ))){ + IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:""]; + if ((params==[])||(IscsiClient::connected( true ))){ UI::ChangeWidget (`id (`connect), `Enabled, false); UI::ChangeWidget (`id (`delete), `Enabled, false); } else{ @@ -462,10 +472,10 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClient::getDiscovered(), { - list<string> row_in_string = splitstring(s, " "); + IscsiClient::currentRecord = splitstring(s, " "); // string record = deletechars(row_in_string[0]:"", "[]"); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClient::connected( row_in_string, true ))?_("True"):_("False") )); + items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"", + (IscsiClient::connected( true ))?_("True"):_("False") )); row = row + 1; }); @@ -480,13 +490,12 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; - params = curr_rec; + IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; if ( event["EventReason"]:"" == "Activated" ){ // connect new target if ( event["ID"]:nil == `connect) { // check if not already connected - if ( IscsiClient::connected( curr_rec , false) == true){ + if ( IscsiClient::connected( false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -499,8 +508,8 @@ } // delete connected item if ( event["ID"]:nil == `delete) { - if ((params == [])||(!IscsiClient::connected( curr_rec, true ))){ - SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", params[1]:"", params[0]:""), $[] ); + if ((params == [])||(!IscsiClient::connected( true ))){ + SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", IscsiClient::currentRecord[1]:"", IscsiClient::currentRecord[0]:""), $[] ); IscsiClient::readSessions(); initDiscoveredTable(""); if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); } @@ -519,9 +528,9 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClient::targets, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClient::connected( row_in_string, true ))?_("True"):_("False") )); + IscsiClient::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"", + (IscsiClient::connected( true ))?_("True"):_("False") )); row = row + 1; }); UI::ChangeWidget (`id (`targets), `Items, items); @@ -540,12 +549,13 @@ if ( event["ID"]:nil == `connect) { // check if is not already connected list <string> params = splitstring( IscsiClient::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " ); - if ( IscsiClient::connected( params, true ) == true){ + IscsiClient::currentRecord = params; + if ( IscsiClient::connected( true ) == true){ Popup::Error(_("The target is already connected.")); } else { - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; + IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; // check if not already connected - if ( IscsiClient::connected( curr_rec , false) == true){ + if ( IscsiClient::connected( false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -562,31 +572,23 @@ // login to target with authentication boolean validateConnAuth(string key, map event){ boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); - string user_in = ""; - string pass_in = ""; - string user_out = ""; - string pass_out = ""; - if (auth_in){ - user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); - pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); - } - if (auth_out){ - user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); - pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); - } + string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); + string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); + string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); + string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); map<string, any> target=$[ - "target" : curr_rec[1]:"", - "portal" : curr_rec[0]:"", + "target" : IscsiClient::currentRecord[1]:"", + "portal" : IscsiClient::currentRecord[0]:"", "authmethod" : (auth_none)?"None":"CHAP", "username" : user_out, "password" : pass_out, "username_in" : user_in, "password_in" : pass_in ]; - if (checkAuthEntry() && IscsiClient::loginIntoTarget(target)) { + if (IscsiClient::connected(false) || IscsiClient::loginIntoTarget(target)) { +// IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""]; + IscsiClient::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value)); IscsiClient::readSessions(); return true; } Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp Tue Apr 21 16:00:20 2009 @@ -31,6 +31,7 @@ "targets" : ``( TargetsDialog() ), "conn_auth" : ``( ConnAuthDialog("client") ), "conn_disc" : ``( ConnAuthDialog("discovered") ), + "edit_conn" : ``( ConnAuthDialog("client") ), "disc" : ``( DiscAuthDialog("discovered") ), ]; @@ -41,6 +42,7 @@ `abort : `abort, `next : `next, `add : "disc_auth", + `edit : "edit_conn", `conn : "conn_disc", `disc : "disc" ], @@ -64,6 +66,10 @@ `abort : `abort, `next : "targets" ], + "edit_conn" : $[ + `abort : `abort, + `next : "global" + ], "disc" : $[ `abort : `abort, `back : `back, -- 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] r56889 - /trunk/iscsi-client/src/widgets.ycp
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 15:42:29 2009 New Revision: 56889 URL: http://svn.opensuse.org/viewcvs/yast?rev=56889&view=rev Log: enhanced previous patch: initial target startup status Modified: trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Tue Apr 21 15:42:29 2009 @@ -347,6 +347,8 @@ UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); // if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); } + string startup=IscsiClientLib::getStartupStatus(); + if(size(startup)>0) UI::ChangeWidget(`id("startup"), `Value, startup); } // handle for enable/disable widgets in authentication dialog symbol handleDiscAuth(string key, map event){ -- 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] r56888 - in /trunk/packager: package/yast2-packager.changes src/modules/SlideShowCallbacks.ycp
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 15:37:14 2009 New Revision: 56888 URL: http://svn.opensuse.org/viewcvs/yast?rev=56888&view=rev Log: - Append additional RPM output to the installation log only if it is not empty (bnc#495047) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SlideShowCallbacks.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 21 15:37:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 15:34:48 CEST 2009 - lslezak(a)suse.cz + +- Append additional RPM output to the installation log only if it + is not empty (bnc#495047) + +------------------------------------------------------------------- Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz - Using new function GetCachedFileFromSource from AddOnProduct Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCa… ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Tue Apr 21 15:37:14 2009 @@ -423,7 +423,11 @@ else { // put additional rpm output to the installation log - SlideShow::AppendMessageToInstLog(reason); + if (reason != nil && size(reason) > 0) + { + y2milestone("Additional RPM output: %1", reason); + SlideShow::AppendMessageToInstLog(reason); + } } if (size (ret) == 0 || tolower (substring (ret, 0, 1)) != "r") -- 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] r56887 - /tags/branch-Code-11-2_17_59/bootloader/
by juhliarik＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: juhliarik Date: Tue Apr 21 15:36:04 2009 New Revision: 56887 URL: http://svn.opensuse.org/viewcvs/yast?rev=56887&view=rev Log: Created tag branch-Code-11-2_17_59 for bootloader Added: tags/branch-Code-11-2_17_59/bootloader/ - copied from r56886, branches/SuSE-Code-11-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0