July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64943 - in /trunk/vm: package/yast2-vm.changes src/relocation-server.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:22:55 2011 New Revision: 64943 URL: http://svn.opensuse.org/viewcvs/yast?rev=64943&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/vm/package/yast2-vm.changes trunk/vm/src/relocation-server.desktop Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Fri Jul 22 15:22:55 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:21:54 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Wed Jun 29 13:55:52 CST 2011 - lidongyang(a)novell.com - bnc#702106 - Remove 32-bit "Install Hypervisor and Tools" from Modified: trunk/vm/src/relocation-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/relocation-server.desktop… ============================================================================== --- trunk/vm/src/relocation-server.desktop (original) +++ trunk/vm/src/relocation-server.desktop Fri Jul 22 15:22:55 2011 @@ -21,5 +21,4 @@ Name=Relocation Server Configuration GenericName=relocation-server -X-KDE-SubstituteUID=true 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

[yast-commit] r64942 - in /trunk/ipsec: package/yast2-ipsec.changes src/ipsec.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:12:41 2011 New Revision: 64942 URL: http://svn.opensuse.org/viewcvs/yast?rev=64942&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/ipsec/package/yast2-ipsec.changes trunk/ipsec/src/ipsec.desktop Modified: trunk/ipsec/package/yast2-ipsec.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ipsec/package/yast2-ipsec.change… ============================================================================== --- trunk/ipsec/package/yast2-ipsec.changes (original) +++ trunk/ipsec/package/yast2-ipsec.changes Fri Jul 22 15:12:41 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:11:57 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: trunk/ipsec/src/ipsec.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ipsec/src/ipsec.desktop?rev=6494… ============================================================================== --- trunk/ipsec/src/ipsec.desktop (original) +++ trunk/ipsec/src/ipsec.desktop Fri Jul 22 15:12:41 2011 @@ -21,5 +21,4 @@ Name=VPN GenericName=Configure IPsec virtual private networks (VPNs) -X-KDE-SubstituteUID=true 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

[yast-commit] r64941 - in /trunk/packager: package/yast2-packager.changes src/config/checkmedia.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:10:31 2011 New Revision: 64941 URL: http://svn.opensuse.org/viewcvs/yast?rev=64941&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/config/checkmedia.desktop 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 Fri Jul 22 15:10:31 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:09:22 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri Jul 1 07:19:15 UTC 2011 - lslezak(a)suse.cz - fixed a typo in help text (bnc#703199) Modified: trunk/packager/src/config/checkmedia.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/checkmedia.d… ============================================================================== --- trunk/packager/src/config/checkmedia.desktop (original) +++ trunk/packager/src/config/checkmedia.desktop Fri Jul 22 15:10:31 2011 @@ -21,5 +21,4 @@ Name=Media Check GenericName=Verify CD and DVD media integrity -X-KDE-SubstituteUID=true 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

[yast-commit] r64940 - in /trunk/ldap-client: package/yast2-ldap-client.changes src/ldap_browser.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:08:25 2011 New Revision: 64940 URL: http://svn.opensuse.org/viewcvs/yast?rev=64940&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ldap_browser.desktop Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jul 22 15:08:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:07:22 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri Jul 15 11:56:55 CEST 2011 - jsuchome(a)suse.cz - correctly realize that SSSD was selected (bnc#705118) Modified: trunk/ldap-client/src/ldap_browser.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.des… ============================================================================== --- trunk/ldap-client/src/ldap_browser.desktop (original) +++ trunk/ldap-client/src/ldap_browser.desktop Fri Jul 22 15:08:25 2011 @@ -21,5 +21,4 @@ Name=LDAP Browser GenericName=Browse the LDAP repository -X-KDE-SubstituteUID=true 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

[yast-commit] r64939 - in /trunk/firstboot: package/yast2-firstboot.changes src/data/firstboot.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:06:34 2011 New Revision: 64939 URL: http://svn.opensuse.org/viewcvs/yast?rev=64939&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/data/firstboot.desktop Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Fri Jul 22 15:06:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:05:22 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri Feb 18 11:28:57 CET 2011 - jsuchome(a)suse.cz - call stop_unicode before kbd restart (bnc#665504) Modified: trunk/firstboot/src/data/firstboot.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/firstboot.des… ============================================================================== --- trunk/firstboot/src/data/firstboot.desktop (original) +++ trunk/firstboot/src/data/firstboot.desktop Fri Jul 22 15:06:34 2011 @@ -22,5 +22,4 @@ Name=Firstboot Configuration GenericName=Enable or disable starting Firstboot sequence -X-KDE-SubstituteUID=true 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

[yast-commit] r64938 - in /trunk/installation: package/yast2-installation.changes src/config/deploy_image.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:04:09 2011 New Revision: 64938 URL: http://svn.opensuse.org/viewcvs/yast?rev=64938&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from deploy_image.desktop (bnc#540627) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/config/deploy_image.desktop Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jul 22 15:04:09 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:00:30 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from deploy_image.desktop + (bnc#540627) + +------------------------------------------------------------------- Tue Jul 12 15:34:38 CEST 2011 - jsuchome(a)suse.cz - Show Xen Virtualization Host Server Installation scenario Modified: trunk/installation/src/config/deploy_image.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/deploy_i… ============================================================================== --- trunk/installation/src/config/deploy_image.desktop (original) +++ trunk/installation/src/config/deploy_image.desktop Fri Jul 22 15:04:09 2011 @@ -24,5 +24,5 @@ Name=Image deployment GenericName=Configure image deployment -X-KDE-SubstituteUID=true + 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

[yast-commit] r64937 - in /trunk/metapackage: package/yast2-metapackage-handler.changes src/kdeymp.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 14:52:22 2011 New Revision: 64937 URL: http://svn.opensuse.org/viewcvs/yast?rev=64937&view=rev Log: - removed X-KDE-SubstituteUID from the desktop file and replaced with X-SuSE-YaST-RootOnly (bnc#540627) Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/kdeymp.desktop Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Fri Jul 22 14:52:22 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 14:48:20 CEST 2011 - locilka(a)suse.cz + +- removed X-KDE-SubstituteUID from the desktop file and replaced + with X-SuSE-YaST-RootOnly (bnc#540627) + +------------------------------------------------------------------- Fri Oct 15 11:34:00 UTC 2010 - lslezak(a)suse.cz - added missing slidshow initialization after manual conflict Modified: trunk/metapackage/src/kdeymp.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/kdeymp.desktop?r… ============================================================================== --- trunk/metapackage/src/kdeymp.desktop (original) +++ trunk/metapackage/src/kdeymp.desktop Fri Jul 22 14:52:22 2011 @@ -1,4 +1,5 @@ [Desktop Entry] +X-SuSE-YaST-RootOnly=false X-SuSE-translate=false Exec=/sbin/yast2 MetaPackageHandler %U InitialPreference=2 @@ -7,6 +8,4 @@ StartupNotify=false Terminal=false Type=Application -X-KDE-SubstituteUID=false X-KDE-StartupNotify=false - -- 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] r64936 - in /trunk/s390: VERSION package/yast2-s390.changes src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: aschnell Date: Fri Jul 22 14:47:36 2011 New Revision: 64936 URL: http://svn.opensuse.org/viewcvs/yast?rev=64936&view=rev Log: - fixed diag mode setting (bnc #591037) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=64936&r1=64935&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Fri Jul 22 14:47:36 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Fri Jul 22 14:47:36 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 14:41:14 CEST 2011 - aschnell(a)suse.de + +- fixed diag mode setting (bnc #591037) +- 2.17.19 + +------------------------------------------------------------------- Tue Jun 21 12:29:58 EDT 2011 - aschnell(a)suse.de - use ButtonBox for correct button order (bnc #701269) Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=64… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Jul 22 14:47:36 2011 @@ -311,7 +311,8 @@ * Run the dialog for DASD disks configuration * @return symbol for wizard sequencer */ -define symbol DASDDialog() { +symbol DASDDialog() +{ DisplayDASDDialog (); ReloadDASDDialog (); any ret = nil; @@ -320,8 +321,7 @@ { ret = UI::UserInput(); - integer selected = (integer) - UI::QueryWidget (`id (`table), `CurrentItem); + integer selected = (integer) UI::QueryWidget(`id(`table), `CurrentItem); if (ret == `filter) { ReloadDASDDialog (); @@ -391,17 +391,21 @@ } else if (ret == `diag_on) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = true; + if (active) + DASDController::ActivateDisk(channel, true); }); ReloadDASDDialog (); @@ -411,17 +415,21 @@ } else if (ret == `diag_off) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = false; + if (active) + DASDController::ActivateDisk(channel, false); }); ReloadDASDDialog (); -- 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] r64935 - in /branches/SuSE-Code-11-SP2-Branch/s390: VERSION package/yast2-s390.changes src/dasd/dialogs.ycp yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: aschnell Date: Fri Jul 22 14:46:26 2011 New Revision: 64935 URL: http://svn.opensuse.org/viewcvs/yast?rev=64935&view=rev Log: - fixed diag mode setting (bnc #591037) Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Fri Jul 22 14:46:26 2011 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Fri Jul 22 14:46:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 14:41:14 CEST 2011 - aschnell(a)suse.de + +- fixed diag mode setting (bnc #591037) +- 2.17.19 + +------------------------------------------------------------------- Mon Jul 18 10:30:40 CEST 2011 - aschnell(a)suse.de - include fix for bnc #591603 Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp Fri Jul 22 14:46:26 2011 @@ -311,7 +311,8 @@ * Run the dialog for DASD disks configuration * @return symbol for wizard sequencer */ -define symbol DASDDialog() { +symbol DASDDialog() +{ DisplayDASDDialog (); ReloadDASDDialog (); any ret = nil; @@ -320,8 +321,7 @@ { ret = UI::UserInput(); - integer selected = (integer) - UI::QueryWidget (`id (`table), `CurrentItem); + integer selected = (integer) UI::QueryWidget(`id(`table), `CurrentItem); if (ret == `filter) { ReloadDASDDialog (); @@ -391,17 +391,21 @@ } else if (ret == `diag_on) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = true; + if (active) + DASDController::ActivateDisk(channel, true); }); ReloadDASDDialog (); @@ -411,17 +415,21 @@ } else if (ret == `diag_off) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = false; + if (active) + DASDController::ActivateDisk(channel, false); }); ReloadDASDDialog (); Modified: branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in Fri Jul 22 14:46:26 2011 @@ -2,7 +2,7 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 +Requires: yast2 yast2-core >= 2.17.37 %ifarch s390 s390x Requires: s390-tools %endif -- 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] r64934 - in /trunk/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: ug Date: Fri Jul 22 09:59:36 2011 New Revision: 64934 URL: http://svn.opensuse.org/viewcvs/yast?rev=64934&view=rev Log: passing a boolean to an ask-script did not work Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/ask.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Jul 22 09:59:36 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 22 09:58:54 CEST 2011 - ug(a)suse.de + +- passing a type=boolean to an ask-script via $VAL did not work + +------------------------------------------------------------------- Mon Jul 18 08:36:53 CEST 2011 - jsrain(a)suse.cz - fixed typo (bnc#702662) Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask… ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Fri Jul 22 09:59:36 2011 @@ -266,11 +266,15 @@ SCR::Execute (.target.mkdir, current_logdir); } string executionString = ""; - if( script["environment"]:false ) + if( script["environment"]:false ) { + if( ask["type"]:"string" == "boolean" ) { + val = sformat("%1", ( (boolean)val ? "true" : "false" )); + } executionString = sformat("VAL=\"%5\" /bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName, AutoinstConfig::ShellEscape((string)val)); - else + } else { executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName ); + } y2milestone("Script Execution command: %1", executionString ); runAgain = runAgain + (integer)SCR::Execute (.target.bash, executionString); if( script["rerun_on_error"]:false == false ) -- 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] r64933 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: ug Date: Fri Jul 22 09:56:36 2011 New Revision: 64933 URL: http://svn.opensuse.org/viewcvs/yast?rev=64933&view=rev Log: passing a boolean to an ask-script did not work Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Fri Jul 22 09:56:36 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 22 09:54:01 CEST 2011 - ug(a)suse.de + +- passing a type=boolean to an ask-script via $VAL did not work + +------------------------------------------------------------------- Tue Jul 19 14:35:45 CEST 2011 - ug(a)suse.de - fixed logging for modules that use a list as data structure Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp Fri Jul 22 09:56:36 2011 @@ -266,11 +266,15 @@ SCR::Execute (.target.mkdir, current_logdir); } string executionString = ""; - if( script["environment"]:false ) + if( script["environment"]:false ) { + if( ask["type"]:"string" == "boolean" ) { + val = sformat("%1", ( (boolean)val ? "true" : "false" )); + } executionString = sformat("VAL=\"%5\" /bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName, AutoinstConfig::ShellEscape((string)val)); - else + } else { executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName ); + } y2milestone("Script Execution command: %1", executionString ); runAgain = runAgain + (integer)SCR::Execute (.target.bash, executionString); if( script["rerun_on_error"]:false == false ) -- 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] r64932 - /tags/stable-2_21_5/yast2/
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 16:29:40 2011 New Revision: 64932 URL: http://svn.opensuse.org/viewcvs/yast?rev=64932&view=rev Log: Created tag stable-2_21_5 for yast2 Added: tags/stable-2_21_5/yast2/ (props changed) - copied from r64931, trunk/yast2/ -- 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] r64931 - in /trunk/yast2: VERSION library/network/src/CWMFirewallInterfaces.ycp library/network/src/SuSEFirewall.ycp package/yast2.changes
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 15:24:21 2011 New Revision: 64931 URL: http://svn.opensuse.org/viewcvs/yast?rev=64931&view=rev Log: - Fixed SuSEfirewall2 config library: By default any unassigned network interface is automatically assigned to the external firewall zone (bnc#547309). - Fixed CWM library for opening ports in firewall not to list any empty strings returned by network module, just interface names (bnc#547309). - 2.21.5 Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp trunk/yast2/library/network/src/SuSEFirewall.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=64931&r1=64930… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Jul 21 15:24:21 2011 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/CWMFir… ============================================================================== --- trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp (original) +++ trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp Thu Jul 21 15:24:21 2011 @@ -33,6 +33,7 @@ import "SuSEFirewall"; import "Report"; import "Stage"; +import "String"; // used only for (Mode::installation() || Mode::update()) import "SuSEFirewallProposal"; @@ -139,7 +140,7 @@ y2milestone("Reading NetworkInterfaces..."); NetworkInterfaces::Read (); } - all_interfaces = NetworkInterfaces::List (""); + all_interfaces = String::NonEmpty (NetworkInterfaces::List ("")); all_interfaces = filter (string i, all_interfaces, { return i != "lo"; }); @@ -238,7 +239,7 @@ groups = add (groups, SuSEFirewall::special_all_interface_zone); } - groups = toset (groups); + groups = String::NonEmpty (toset (groups)); groups = filter (string g, groups, { return g != nil; }); @@ -491,7 +492,6 @@ } } - // list<string> firewall_ifaces = toset (Selected2Opened (ifaces, nm_ifaces_have_to_be_supported)); list<string> firewall_ifaces = toset (Selected2Opened (ifaces, false)); y2milestone("firewall_ifaces: %1", firewall_ifaces); Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewall.ycp Thu Jul 21 15:24:21 2011 @@ -240,11 +240,14 @@ /** * Function returns whether the feature 'any' network interface is supported in the * firewall configuration. The string 'any' must be in the 'EXT' zone. + * Updated: Currently returns only 'true' as every unasigned interface is + * automatically assigned to the EXT zone by SuSEfirewall2. * * @return boolean is_supported whether the feature is supported or not */ global boolean IsAnyNetworkInterfaceSupported () { - return contains(GetSpecialInterfacesInZone(special_all_interface_zone), special_all_interface_string); + // Currently unasigned interfaces belong to the EXT zone by dafault + return true; } /** Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jul 21 15:24:21 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Jul 21 15:15:51 CEST 2011 - locilka(a)suse.cz + +- Fixed SuSEfirewall2 config library: By default any unassigned + network interface is automatically assigned to the external + firewall zone (bnc#547309). +- Fixed CWM library for opening ports in firewall not to list any + empty strings returned by network module, just interface names + (bnc#547309). +- 2.21.5 + +------------------------------------------------------------------- Mon Jul 18 08:26:12 CEST 2011 - jsrain(a)suse.cz - fixed typo (bnc#702662) -- 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] r64930 - /tags/branch-Code-11-SP2-2_17_6/fcoe-client/
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 14:40:20 2011 New Revision: 64930 URL: http://svn.opensuse.org/viewcvs/yast?rev=64930&view=rev Log: Created tag branch-Code-11-SP2-2_17_6 for fcoe-client Added: tags/branch-Code-11-SP2-2_17_6/fcoe-client/ - copied from r64929, branches/SuSE-Code-11-SP2-Branch/fcoe-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] r64929 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 14:35:05 2011 New Revision: 64929 URL: http://svn.opensuse.org/viewcvs/yast?rev=64929&view=rev Log: check return value from removing interface and add error popup Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Thu Jul 21 14:35:05 2011 @@ -377,8 +377,8 @@ y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - // store command to be able to revert the creation of FCoE VLAN interface in case of abort - // TODO: is this also OK if only 'fipvlan -s <interface>' is called? + // store command to be able to revert the creation of FCoE VLAN interface in case of 'Abort' + // (also if only 'fipvlan -s <interface>' is called) FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); if ( create_ifcfg ) { @@ -416,41 +416,50 @@ { map card = FcoeClient::GetCurrentNetworkCard(); map output = $[]; + string command = ""; // headline of a popup boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN device"), // question to the user: really remove FCoE VLAN interface sformat( _("Do you really want to remove the VLAN device %1? -Please note: The device is not enabled again on 'Abort'."), card["fcoe_vlan"]:"" ) ); +Please note: The device won't be restored on 'Abort'."), card["fcoe_vlan"]:"" ) ); if ( ret == true ) { y2milestone( "Removing %1", card["fcoe_vlan"]:"" ); - string rm_interface = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; - y2milestone( "Calling %1", rm_interface ); - output = (map)SCR::Execute( .target.bash_output, rm_interface ); - y2milestone( "Output: %1", output ); - - string rm_cfg = sformat( "rm %1", card["cfg_file"]:"" ); - y2milestone( "Calling %1", rm_cfg ); - output = (map)SCR::Execute( .target.bash_output, rm_cfg ); + command = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); - // set new values in global map network_interfaces - card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; - card["fcoe_enable"] = ""; - card["dcb_required"] = ""; - card["cfg_file"] = ""; - FcoeClient::SetModified( true ); + if ( output["exit"]:255 == 0 ) + { + command = sformat( "rm %1", card["cfg_file"]:"" ); + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + + // set new values in global map network_interfaces + card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; + card["fcoe_enable"] = ""; + card["dcb_required"] = ""; + card["cfg_file"] = ""; + FcoeClient::SetModified( true ); - FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); - y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); - // replace values in table - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); - AdjustButtons(); + // replace values in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); + AdjustButtons(); + } + else + { + Popup::Error( sformat( _("Removing of interface %1 failed"), card["fcoe_vlan"]:"") ); + y2error( "Removing of interface %1 failed", card["fcoe_vlan"]:"" ); + } } } -- 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] r64928 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: VERSION package/yast2-fcoe-client.changes
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 14:11:56 2011 New Revision: 64928 URL: http://svn.opensuse.org/viewcvs/yast?rev=64928&view=rev Log: 2.17.6 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION Thu Jul 21 14:11:56 2011 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Thu Jul 21 14:11:56 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jul 21 14:09:17 CEST 2011 - gs(a)suse.de + +- Write configuration for FCoE interfaces to /etc/sysconfig/network + (effective for installed system), bug-fix for starting services + at boot, add possibility to remove devices +- V 2.17.6 + +------------------------------------------------------------------- Wed Jul 13 14:13:18 CEST 2011 - gs(a)suse.de - Bug-fix for AutoYaST support (start FCoE on all capable -- 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] r64927 - /tags/stable-2_20_13/network/
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 14:05:30 2011 New Revision: 64927 URL: http://svn.opensuse.org/viewcvs/yast?rev=64927&view=rev Log: Created tag stable-2_20_13 for network Added: tags/stable-2_20_13/network/ (props changed) - copied from r64926, trunk/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] r64926 - /trunk/devtools/devtools/data/YaST2.dict.txt
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 14:05:08 2011 New Revision: 64926 URL: http://svn.opensuse.org/viewcvs/yast?rev=64926&view=rev Log: Added some more known words to the spellcheck whitelist. Modified: trunk/devtools/devtools/data/YaST2.dict.txt Modified: trunk/devtools/devtools/data/YaST2.dict.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/data/YaST2.dic… ============================================================================== --- trunk/devtools/devtools/data/YaST2.dict.txt (original) +++ trunk/devtools/devtools/data/YaST2.dict.txt Thu Jul 21 14:05:08 2011 @@ -2,12 +2,17 @@ ACLs ADSL AMAVIS +AOL +AP +AVM AutoYaST BIOS BOOTP Bacula Belarus Bluetooth +BusID +CAPI CDs CGI CNAME @@ -23,11 +28,16 @@ DVB DVD DVDs +EAP +ESCON +ESSID +FICON FireWire Firefox GDM GNOME GPG +GTC Georgia GnuPG HTTPS @@ -35,6 +45,7 @@ IMAP IMAPS IP +IPA IPP IPs IPsec @@ -44,6 +55,7 @@ ISA ISDN ISP +IUCV IrDA JFS KDE @@ -52,11 +64,14 @@ Kb Kerberos Konqueror +LCS LDAP LDAPS LVM Linuxrc MBR +MSCHAPv1 +MSCHAPv2 MSN MTU MX @@ -64,16 +79,26 @@ Mozilla MySQL NFS +NFSroot +NIC NIS NS NetBIOS +NetControl +Netelligent NetworkManager Novell +OSA OpenGL OpenLDAP +PBX PCI +PEAP PHP PPC +PPPoATM +PPPoE +PPTP PTR Perl RSA @@ -96,6 +121,7 @@ SuSE SuSEconfig SuSEfirewall +SyncPPP TLS TSIG TSL @@ -109,24 +135,36 @@ Uninstall Uninstalled Uzbekistan +VCI VESA VLAN VMWare VNC +VPI +VPN WAP WEP WLAN +WPA +WPA-EAP +WPA-PSK WebDAV +Wi-Fi XFS XFree +Xen YaST ZENworks ZFCP ZMD +addlink +applet autodetect autodetected autodetection autoinstallation +blah +bmac bootable chipset chroot @@ -134,24 +172,45 @@ cron cyrus defragmentation +dhcp +dhcpcd +dmesg +drdsl +eth0 +eth1 ethernet fetchmail firewalled +foo framebuffer fstab +hipster hotplug hotpluggable hotplugging +hwinfo +iBFT iSCSI +iSeries +ifconfig +ifdown +ifup init initrd +ipppd +iscsi +isdnctrl +knetworkmanager +lan lighttpd loopback masqueraded +modprobe multiboot ncurses netconfig netmask +nfs openSUSE passphrase passwd @@ -162,11 +221,13 @@ preshared procmail pureftpd +rcnetwork reinstall reinstallation runlevel runlevels smb +smpppd ssh sshd strace @@ -176,6 +237,8 @@ subdomains sysconfig syslog +ttyS0 +ttyS1 udev umount uncheck @@ -190,3 +253,4 @@ xntp yast2 ypbind +zeroconf -- 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] r64925 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 13:58:46 2011 New Revision: 64925 URL: http://svn.opensuse.org/viewcvs/yast?rev=64925&view=rev Log: Remove button and functionality to remove interfaces added Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Thu Jul 21 13:58:46 2011 @@ -52,6 +52,8 @@ * @return true if users aborts installation */ boolean ReallyAbort() { + y2milestone( "Aborting FCoE configuration" ); + // revert start of 'fcoe' or 'lldpad' if ( FcoeClient::fcoe_started ) { @@ -113,14 +115,12 @@ return ret ? `next : `abort; } -// TODO - check whether a 'validate' is required - /** * Init **/ void InitServicesDialog (string id) { y2milestone( "Init services dialog" ); - y2milestone( "Modified: %1", FcoeClient::Modified() ); + y2milestone( "Data modified: %1", FcoeClient::Modified() ); map status_map = FcoeClient::GetStartStatus(); if ( status_map["fcoe"]:false == true ) @@ -158,16 +158,19 @@ { UI::ChangeWidget( `id(`edit), `Enabled, false ); UI::ChangeWidget( `id(`create), `Enabled, true ); + UI::ChangeWidget( `id(`remove), `Enabled, false ); } else if ( card["fcoe_vlan"]:"" == FcoeClient::NOT_AVAILABLE ) { UI::ChangeWidget( `id(`edit), `Enabled, false ); - UI::ChangeWidget( `id(`create), `Enabled, false ); + UI::ChangeWidget( `id(`create), `Enabled, false ); + UI::ChangeWidget( `id(`remove), `Enabled, false ); } else { UI::ChangeWidget( `id(`edit), `Enabled, true ); UI::ChangeWidget( `id(`create), `Enabled, false ); + UI::ChangeWidget( `id(`remove), `Enabled, true ); } } @@ -409,6 +412,47 @@ UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["DCB_REQUIRED"]:"" ); AdjustButtons(); } + else if ( action == `remove ) + { + map card = FcoeClient::GetCurrentNetworkCard(); + map output = $[]; + + // headline of a popup + boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN device"), + // question to the user: really remove FCoE VLAN interface + sformat( _("Do you really want to remove the VLAN device %1? +Please note: The device is not enabled again on 'Abort'."), card["fcoe_vlan"]:"" ) ); + if ( ret == true ) + { + y2milestone( "Removing %1", card["fcoe_vlan"]:"" ); + + string rm_interface = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; + y2milestone( "Calling %1", rm_interface ); + output = (map)SCR::Execute( .target.bash_output, rm_interface ); + y2milestone( "Output: %1", output ); + + string rm_cfg = sformat( "rm %1", card["cfg_file"]:"" ); + y2milestone( "Calling %1", rm_cfg ); + output = (map)SCR::Execute( .target.bash_output, rm_cfg ); + y2milestone( "Output: %1", output ); + + // set new values in global map network_interfaces + card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; + card["fcoe_enable"] = ""; + card["dcb_required"] = ""; + card["cfg_file"] = ""; + FcoeClient::SetModified( true ); + + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + + // replace values in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); + AdjustButtons(); + } + } return nil; } @@ -436,12 +480,12 @@ boolean fcoe_auto = (boolean)UI::QueryWidget( `id ("fcoe_startup_auto"), `Value ); FcoeClient::SetStartStatus( "fcoe", fcoe_auto ); - y2milestone ("Setting auto start of service 'fcoe' to: %1", (fcoe_auto?"true":"false") ); + y2milestone ("Setting auto start of service 'fcoe' to: %1", fcoe_auto ); boolean lldpad_auto = (boolean)UI::QueryWidget( `id ("lldpad_startup_auto"), `Value ); FcoeClient::SetStartStatus( "lldpad", lldpad_auto ); - y2milestone( "Setting auto start of service 'lldpad' to: %1", (lldpad_auto?"true":"false")); + y2milestone( "Setting auto start of service 'lldpad' to: %1", lldpad_auto ); } void StoreInterfacesDialog (string id, map event) Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Thu Jul 21 13:58:46 2011 @@ -126,8 +126,9 @@ _("FCoE Enable"), _("DCB Required"), _("DCB capable") ), [] ), - `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings") ), - `PushButton(`id(`create), _("Create FCoE &VLAN Interface")) ) + `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings")), + `PushButton(`id(`create), _("Create FCoE &VLAN Interface")), + `PushButton(`id(`remove), _("&Remove Interface")) ) ) ) ); -- 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] r64924 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 13:58:05 2011 New Revision: 64924 URL: http://svn.opensuse.org/viewcvs/yast?rev=64924&view=rev Log: logging improved Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Thu Jul 21 13:58:05 2011 @@ -635,7 +635,7 @@ global boolean ReadFcoeConfig() { list <string> options = (list<string>) SCR::Dir(.fcoe); - y2milestone( "List of options: %1", options ); + y2milestone( "List of options in /etc/fcoe/config: %1", options ); if ( options == [] || options == nil ) return false; -- 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] r64923 - in /trunk/network: VERSION package/yast2-network.changes src/clients/firewall_stage1_finish.ycp src/clients/firewall_stage1_proposal.ycp
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 13:48:48 2011 New Revision: 64923 URL: http://svn.opensuse.org/viewcvs/yast?rev=64923&view=rev Log: - Fixed Firewall and SSH proposal to be still able to adjust SSH independently on the firewall status (bnc#537980). - 2.20.13 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/firewall_stage1_finish.ycp trunk/network/src/clients/firewall_stage1_proposal.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=64923&r1=649… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Jul 21 13:48:48 2011 @@ -1 +1 @@ -2.20.12 +2.20.13 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jul 21 13:48:48 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 21 13:44:24 CEST 2011 - locilka(a)suse.cz + +- Fixed Firewall and SSH proposal to be still able to adjust SSH + independently on the firewall status (bnc#537980). +- 2.20.13 + +------------------------------------------------------------------- Fri Jul 1 13:42:16 CEST 2011 - mvidner(a)suse.cz - Proofread texts for translation (by A.Turrini, bnc#703190). Modified: trunk/network/src/clients/firewall_stage1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_sta… ============================================================================== --- trunk/network/src/clients/firewall_stage1_finish.ycp (original) +++ trunk/network/src/clients/firewall_stage1_finish.ycp Thu Jul 21 13:48:48 2011 @@ -28,20 +28,21 @@ y2debug("func=%1", func); y2debug("param=%1", param); +//we have those from the proposal +boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); +boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); + if (func == "Info") { return (any)$[ "steps" : 1, // progress step title "title" : _("Writing Firewall Configuration..."), - "when" : SuSEFirewallProposal::GetChangedByUser() ? [ `installation, `autoinst ] : [], + "when" : (SuSEFirewallProposal::GetChangedByUser() || ssh_enabled) ? [ `installation, `autoinst ] : [], ]; } else if (func == "Write") { - //we have those from the proposal - boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); - boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); y2milestone("After installation, firewall will be %1", fw_enabled ? sformat("enabled, ssh port will be %1", ssh_enabled ? "open" : "closed") : "disabled"); Modified: trunk/network/src/clients/firewall_stage1_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_sta… ============================================================================== --- trunk/network/src/clients/firewall_stage1_proposal.ycp (original) +++ trunk/network/src/clients/firewall_stage1_proposal.ycp Thu Jul 21 13:48:48 2011 @@ -127,8 +127,6 @@ SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); } - SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); - SuSEFirewallProposal::SetProposalInitialized(true); } @@ -147,27 +145,23 @@ _("Firewall will be disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)") ) + "</li>\n"; - if (SuSEFirewall4Network::Enabled1stStage()) - { - output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? - _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") - : - _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") - ) + "</li>\n"; + output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? + _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") + : + _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") + ) + "</li>\n"; - } output = output + "</ul>\n"; ret = $[ - "preformatted_proposal" : output, - "warning_level" : `warning, - //"warning" : proposal["warning"]:nil, - "links" : [ - "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", - "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", - ] - ]; - + "preformatted_proposal" : output, + "warning_level" : `warning, + //"warning" : proposal["warning"]:nil, + "links" : [ + "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", + "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", + ] + ]; } else if ( func == "AskUser" ) { any chosen_link = param["chosen_id"]: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] r64922 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:52:31 2011 New Revision: 64922 URL: http://svn.opensuse.org/viewcvs/yast?rev=64922&view=rev Log: correct upper case Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Wed Jul 20 14:52:31 2011 @@ -123,8 +123,8 @@ should be created and if DCB is required." ) + /* Edit dialog help 3/3 */ _( "The values are: - FCoE enable: yes or no Enable or disable creation of FCoE. - DCB required: yes or no The default is yes, DCB is usually + FCoE Enable: yes or no Enable or disable creation of FCoE. + DCB Required: yes or no The default is yes, DCB is usually required." ), ]; -- 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] r64921 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:47:30 2011 New Revision: 64921 URL: http://svn.opensuse.org/viewcvs/yast?rev=64921&view=rev Log: improve layout of edit dialog Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Wed Jul 20 14:47:30 2011 @@ -233,6 +233,7 @@ // set values for 'FCoE Enabled' and 'DCB Required' UI::ChangeWidget( `id(`fcoe), `Value, card["fcoe_enable"]:"" ); UI::ChangeWidget( `id(`dcb), `Value, card["dcb_required"]:"" ); + // headline of the edit dialog - configuration of values for a certain network interface UI::ChangeWidget( `id(`heading), `Value, sformat( _("Configuration of Interface %1"), card["fcoe_vlan"]:"" ) ); } Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Wed Jul 20 14:47:30 2011 @@ -64,23 +64,26 @@ return `VBox( `VStretch(), // heading is replaced later (InitEditDialog) - `Label( `id(`heading), ("Configuration of Interface ................................") ), + `Label( `id(`heading), ("Configuration of Interface .......................") ), + `VSpacing(2), `HBox ( `HStretch(), `Frame( (""), - `VBox( - `VSpacing(2), - `ComboBox( `id(`fcoe), _("FCoE Enable"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2), - `ComboBox( `id(`dcb), _("DCB Required"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2) - ) + `MarginBox( 10, 2, + `VBox( + `VSpacing(2), + `ComboBox( `id(`fcoe), _("FCoE Enable"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2), + `ComboBox( `id(`dcb), _("DCB Required"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2) + ) + ) ), `HStretch() ), -- 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] r64920 - /branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 14:13:56 2011 New Revision: 64920 URL: http://svn.opensuse.org/viewcvs/yast?rev=64920&view=rev Log: removed duplicated *.changes entry Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Jul 20 14:13:56 2011 @@ -8,7 +8,6 @@ - added a new client for checking registration status before starting migration (fate#309594) - implemented download in advance mode support (fate#308951) -- do not allow to continue without package lock (BNC #616982) - 2.17.17.1 ------------------------------------------------------------------- -- 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] r64919 - in /branches/SuSE-Code-11-SP1-Branch/wagon: ./ package/ src/clients/ src/config/ src/include/ src/modules/ testsuite/tests/
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 14:05:51 2011 New Revision: 64919 URL: http://svn.opensuse.org/viewcvs/yast?rev=64919&view=rev Log: backport from SP2 branch: - added new core/full migration selection dialog (fate#311994) - if the system is managed by SUSE Manager display a message and exit (fate#311994) - added a new client for selecting DUP repositories (fate#311994) - added a new client for checking registration status before starting migration (fate#309594) - implemented download in advance mode support (fate#308951) - 2.17.17.1 Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_dup_repositories.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_check.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/include/wagon_helpers.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/include/wagon_helpers.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/RegistrationStatus.pm - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/RegistrationStatus.pm branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.err - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.err branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.out - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.out branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/ (props changed) branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Wed Jul 20 14:05:51 2011 @@ -1 +1 @@ -2.17.18 +2.17.17.1 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Jul 20 14:05:51 2011 @@ -1,8 +1,20 @@ ------------------------------------------------------------------- +Wed Jul 20 11:45:47 UTC 2011 - lslezak(a)suse.cz + +- added new core/full migration selection dialog (fate#311994) +- if the system is managed by SUSE Manager display a message + and exit (fate#311994) +- added a new client for selecting DUP repositories (fate#311994) +- added a new client for checking registration status before + starting migration (fate#309594) +- implemented download in advance mode support (fate#308951) +- do not allow to continue without package lock (BNC #616982) +- 2.17.17.1 + +------------------------------------------------------------------- Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz - Do not allow to continue without package lock (BNC #616982) -- 2.17.18 ------------------------------------------------------------------- Mon Mar 15 13:28:41 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp Wed Jul 20 14:05:51 2011 @@ -57,6 +57,16 @@ return sort (ret); } + list<string> AddedRepos(list<string> prev, list<string> curr) + { + list<string> ret = []; + + // added repos = all current which were not in the previous state + ret = filter(string curr_repo, curr, {return !contains(prev, curr_repo);}); + + return ret; + } + // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); y2milestone ("Currently registered repositories: %1", all_repos); @@ -91,7 +101,13 @@ list <string> current_repos = GetCurrentlyEnabledReposByAlias(); if (all_repos != current_repos) { Wagon::repos_already_registered = true; + + // remember the added repositories + list<string> added = AddedRepos(all_repos, current_repos); + Wagon::SetRegistrationRepos(added); + y2milestone ("List of repositories has changed: %1", current_repos); + y2milestone("Added repositories: %1", added); break; } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp Wed Jul 20 14:05:51 2011 @@ -41,7 +41,7 @@ // Mode::SetMode ("normal"); y2milestone ("Running repositories..."); ret = (symbol) WFM::call ("repositories"); - y2milestone ("Script inst_suse_register returned: %1", ret); + y2milestone ("Script repositories returned: %1", ret); // Mode::SetMode ("update"); if (ret == `cancel || ret == `abort) { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp Wed Jul 20 14:05:51 2011 @@ -20,6 +20,7 @@ import "Wagon"; import "Report"; + import "PackageInstallation"; string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -40,11 +41,23 @@ } Wagon::ProposeDUP(); + Wagon::ProposeDownloadMode(); ret = Wagon::ProposalSummary(); } else if (func == "AskUser") { - Report::Message (_("There is nothing to set.")); + string chosen_id = param["chosen_id"]:""; + + // toggle the download mode status + if (chosen_id == Wagon::GetDownloadModeLink()) + { + PackageInstallation::SetDownloadInAdvance(!PackageInstallation::DownloadInAdvance()); + } + else + { + Report::Message (_("There is nothing to set.")); + } + ret = $[ "workflow_sequence" : `next ]; } else if (func == "Description") { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp Wed Jul 20 14:05:51 2011 @@ -21,6 +21,7 @@ import "Popup"; import "Wagon"; import "Report"; + import "FileUtils"; textdomain "wagon"; @@ -41,6 +42,18 @@ GetInstArgs::enable_back(), GetInstArgs::enable_next()); Wizard::EnableAbortButton (); + // file /etc/sysconfig/rhn/systemid means the system is managed by SUSE Manager + if (FileUtils::Exists("/etc/sysconfig/rhn/systemid")) + { + y2milestone("File /etc/sysconfig/rhn/systemid found, aborting wagon"); + + // warning message, system managed by SUSE Manager cannot be migrated by wagon + // display this message and exit + Popup::Message(_("This system is managed by SUSE Manager,\nYaST wagon module cannot migrate systems managed by SUSE Manager.\n\nPress OK to exit.")); + + return (any)`back; + } + any ret = nil; while (true) { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Wed Jul 20 14:05:51 2011 @@ -28,10 +28,13 @@ <name>running_by_applet</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>update_online_mechanism</module> <module>install_migration_products</module> <module>suse_register_workflow</module> + <module>wagon_dup_repositories</module> <module>wagon_modify_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -55,14 +58,17 @@ <name>manual</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>update_online_mechanism</module> <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_manual_url_repositories</module> + <module>wagon_dup_repositories</module> <module>wagon_modify_repositories</module> <module>wagon_check_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -84,8 +90,11 @@ <name>PatchCD</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_dup_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -162,6 +171,12 @@ <enable_back>no</enable_back> </module> + <module> + <label>Registration Check</label> + <name>registration_check</name> + <execute>wagon_registration_check</execute> + </module> +  <module> <label>Renew Update Stack</label> @@ -244,6 +259,12 @@ </module> <module> + <label>Migration Configuration</label> + <name>wagon_dup_repositories</name> + <execute>wagon_dup_repositories</execute> + </module> + + <module> <heading>yes</heading> <label>Migration</label> </module> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am Wed Jul 20 14:05:51 2011 @@ -2,8 +2,16 @@ # Makefile.am for wagon/src/modules # -module_DATA = $(wildcard *.ycp) +module_DATA = Wagon.ycp RegistrationStatus.pm EXTRA_DIST = $(module_DATA) +YCPCFLAGS = -I . + +ycpchook = wagon + +wagon: + ln -s ../include wagon + + include $(top_srcdir)/Makefile.am.common Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Wed Jul 20 14:05:51 2011 @@ -31,6 +31,11 @@ import "Update"; import "FileUtils"; import "String"; + import "Packages"; + import "PackageInstallation"; + import "RegistrationStatus"; + + include "wagon/wagon_helpers.ycp"; boolean running_by_applet = false; @@ -75,6 +80,13 @@ return update_workflow_type; } + const string download_mode_link = "wagon-download_in_advance"; + + global define string GetDownloadModeLink() + { + return download_mode_link; + } + string migration_method = nil; global string migration_method_file = sformat ("%1/wagon_migration_method", Directory::vardir); @@ -98,6 +110,35 @@ return migration_method; } + // do the distribution upgrade from selected repositories + list<integer> dup_repos = []; + + global list<integer> DupRepos() + { + return dup_repos; + } + + global void SetDupRepos(list<integer> repos) + { + dup_repos = repos; + } + + // list of repositories (aliases) added by suse_register + list<string> new_registration_repos = []; + + // returns list of repositories (aliases) added by suse_register + global list<string> RegistrationRepos() + { + return new_registration_repos; + } + + // set list of repositories (aliases) added by suse_register + global void SetRegistrationRepos(list<string> repos) + { + y2milestone("Repositories added by registration: %1", new_registration_repos); + new_registration_repos = repos; + } + void ResetWorkflowSteps () { ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); } @@ -369,16 +410,100 @@ return true; } - map <string, any> update_conf = GetUpdateConf(); + // reset upgrade repo config + y2milestone("Resetting upgrade repos config"); + list<integer> repos = Pkg::GetUpgradeRepos(); + foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); + + // all repositories selected for upgrade? + if (sort(Pkg::SourceGetCurrent(true)) == sort(dup_repos)) + { + // reset solver flags (needed when switching from full DUP to partial DUP + Pkg::SetSolverFlags($["reset" : true]); + + // do full distribution upgrade + map <string, any> update_conf = GetUpdateConf(); + map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); + y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + } + else + { + // do partial DUP + // add upgrade repositories + y2milestone("Adding upgrade repos: %1", dup_repos); + foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);}); + + // be compatible with "zypper dup --from" + Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); + } - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); - y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + Pkg::PkgSolve(true); already_proposed = true; return true; } + map<string, any> CheckDownloadSpace() + { + // display a warning if estimated free size after migration is below 100MB + integer min_free_space = 100 << 20; + + map<string, list> du = Pkg::TargetGetDU(); + list<string> mounts = maplist(string dir, list info, du, {return dir;}); + + map<string,any> zconfig = Pkg::ZConfig(); + string pkg_path = zconfig["repo_packages_path"]:""; + + string packages_mount = FindMountPoint(pkg_path, mounts); + y2milestone("Packages will we downloaded to %1 (mountpoint %2)", pkg_path, packages_mount); + + // download size in bytes + integer download_size = Packages::CountSizeToBeDownloaded(); + y2milestone("Size of packages to download: %1MB", download_size >> 20); + + // du contains maps: $[ "dir" : [ total, used, pkgusage, readonly ], .... ] + integer after_install = du[packages_mount, 2]:0; + integer total = du[packages_mount, 0]:0; + y2milestone("Size after installation: %1MB (of %2MB)", after_install >> 20, total >> 20); + + symbol result = `ok; + string message = ""; + + if (after_install + download_size < total) + { + result = `error; + message = sformat(_("There is not enough free space to migrate the system using download in advance mode. Partition %1 needs at least %2MB more free disk space. (The needed size is estimated, it is recommended to add slightly more free space.) Add more disk space or disable download in advance mode."), + packages_mount, (after_install + download_size - total) >> 20); + y2error("Not enough free space for download in advance upgrade: " + + "estimated size after installation: %1MB, download size: %2MB, " + + "total size: %3MB, estimated free space: %4MB", after_install >> 20, + download_size >> 20, total >> 20, (total - after_install - download_size) >> 20); + } + else if (after_install + download_size + min_free_space < total) + { + result = `warning; + message = sformat(_("There might not be enough free space for download in advance mode migration. The estimated free space after migration is %2MB, it is recommended to increase the free space in case the estimation is inaccurate to avoid installation errors."), + (total - after_install - download_size) >> 20); + y2warning("Low free space: estimated size after installation: %1MB, " + + "download size: %2MB, total size: %3MB, estimated free space: %4MB", + after_install >> 20, download_size >> 20, total >> 20, (total - after_install - download_size) >> 20); + } + + return $[ "result" : result, "message" : message ]; + } + + global void ProposeDownloadMode() + { + if (PackageInstallation::DownloadInAdvance() == nil) + { + map<string, any> dwspace = CheckDownloadSpace(); + + PackageInstallation::SetDownloadInAdvance(dwspace["result"]:nil == `ok); + y2milestone("Proposed download in advance mode: %1", PackageInstallation::DownloadInAdvance()); + } + } + global map <string,any> MinimizeProductMap (map <string,any> product) { if (haskey (product, "license")) product["license"] = "..."; if (haskey (product, "description")) product["description"] = "..."; @@ -510,9 +635,14 @@ ret = "<ul>\n" + ret + "</ul>\n"; + ret = ret + "<ul><li>\n" + _("Download all packages before upgrade: ") + + sformat("<a href=\"%1\">%2</a>", download_mode_link, (PackageInstallation::DownloadInAdvance() ? _("Enabled") : _("Disabled"))) + + "</li></ul>\n"; + map <string, any> summary = $[ "preformatted_proposal" : ret, - // help text + "links" : [ download_mode_link ], + // help text, TODO FIXME: replace the inner by "help" : _("To change the update settings, go to Packages Proposal section."), ]; @@ -630,5 +760,131 @@ return true; } + + /* + * Read registration status and sort products according their status + * @param file Read this registration status file + * @return map<string,any> result: $[ + * + "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system + "registered" : (list<string>) - registered products + "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) + "rma" : (list<string>) - refunded subscriptions, not active anymore + "expired" : (list<string>) - expired subscriptions + "no_subscription" : (list<string>) - products which do not need a subscription (e.g. SLES-SDK) + "failed" : (list<string>) - registration failed (e.g. invalid registration code) + * ] + */ + global define map<string,any> RegistrationStatusFromFile(string file) + { + boolean registered_system = true; + integer timestamp = -1; + + list<string> failed = []; + list<string> no_subscription = []; + list<string> expired = []; + list<string> rma = []; + list<string> provisional = []; + list<string> registered = []; + + // 0 = empty file, -1 = missing + if (FileUtils::GetSize(file) <= 0) + { + y2milestone("File %1 does not exist", file); + registered_system = false; + } + else + { + // read the registration status + // see https://wiki.innerweb.novell.com/index.php/Registration#Add_Registration_St… + // for more datils about the file format + map status = RegistrationStatus::ReadFile(file); + + timestamp = tointeger(status["generated"]:"-1"); + list<map> products = status["productstatus"]:[]; + + // check each product + foreach(map product, products, + { + string product_name = product["product"]:""; + + // not registered (error present, but not "expired") + if (product["result"]:"" == "error" && product["errorcode"]:"" != "ERR_SUB_EXP") + { + failed = add(failed, product_name); + } + else + { + // registered, but subscription is not needed (e.g. SLES-SDK) + if (product["subscription"]:$[] == $[]) + { + no_subscription = add(no_subscription, product_name); + } + else + { + string status = product["subscription", "status"]:""; + string expiration = product["subscription", "expiration"]:""; + + // expired subscription (status == EXPIRED or the timestamp is in the past) + if (status == "EXPIRED" || (expiration != "" && tointeger(expiration) < time())) + { + expired = add(expired, product_name); + } + else if (status == "RMA") + { + rma = add(rma, product_name); + } + else + { + string type = product["subscription", "type"]:""; + + // provisional subscription + if (type == "PROVISIONAL") + { + provisional = add(provisional, product_name); + } + else + { + registered = add(registered, product_name); + } + } + } + } + } + ); + } + + return $[ + "registered_system" : registered_system, + "timestamp" : timestamp, + "registered" : registered, + "provisional" : provisional, + "rma" : rma, + "expired" : expired, + "no_subscription" : no_subscription, + "failed" : failed + ]; + + } + + /* + * Read registration status from /var/lib/suseRegister/registration-status.xml and sort products according their status + * @return map<string,any> result: $[ + * + "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system + "registered" : (list<string>) - registered products + "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) + "rma" : (list<string>) - refunded subscriptions, not active anymore + "expired" : (list<string>) - expired subscriptions + "no_subscription" : (list<string>) - products which do not need a subscription (e.g. SLES-SDK) + "failed" : (list<string>) - registration failed (e.g. invalid registration code) + * ] + */ + global define map<string,any> RegistrationStatus() + { + return RegistrationStatusFromFile(RegistrationStatus::RegFile()); + } /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Wed Jul 20 14:05:51 2011 @@ -4,11 +4,17 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 -# <upgrades> section from product file -Requires: yast2-pkg-bindings >= 2.17.44 +# Pkg::AddUpgradeRepo() +Requires: yast2-pkg-bindings >= 2.17.45.1 +# Pkg::AddUpgradeRepo() +BuildRequires: yast2-pkg-bindings >= 2.17.45.1 + +BuildRequires: perl-XML-Simple +Requires: perl-XML-Simple # Called in proposal and in code -Requires: yast2-packager yast2-add-on +Requires: yast2-packager >= 2.17.78.1 +Requires: yast2-add-on # Counting packages directly in packages proposal (BNC #573482) Requires: yast2-update >= 2.17.19 @@ -47,6 +53,7 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +@moduledir@/*.pm %dir @yncludedir@/wagon @yncludedir@/wagon/*.ycp %dir /usr/share/YaST2/control -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0