March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67639 - in /trunk/control-center: package/yast2-control-center.changes src/yqsavelogs.cpp
by aschnell＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: aschnell Date: Thu Mar 15 18:30:53 2012 New Revision: 67639 URL: http://svn.opensuse.org/viewcvs/yast?rev=67639&view=rev Log: - added missing include for gcc 4.7 Modified: trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/yqsavelogs.cpp Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Thu Mar 15 18:30:53 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 15 18:29:56 CET 2012 - aschnell(a)suse.de + +- added missing include for gcc 4.7 + +------------------------------------------------------------------- Mon Jan 30 16:46:38 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc#742748: selected groups with keyboard Modified: trunk/control-center/src/yqsavelogs.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqsavelogs.cp… ============================================================================== --- trunk/control-center/src/yqsavelogs.cpp (original) +++ trunk/control-center/src/yqsavelogs.cpp Thu Mar 15 18:30:53 2012 @@ -31,6 +31,8 @@ #include "yqsavelogs.h" +#include <unistd.h> + #include <QFileDialog> #include <QMessageBox> -- 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] r67638 - /tags/branch-Code-11-SP2-2_17_7/ldap/
by jsuchome＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: jsuchome Date: Thu Mar 15 15:26:50 2012 New Revision: 67638 URL: http://svn.opensuse.org/viewcvs/yast?rev=67638&view=rev Log: Created tag branch-Code-11-SP2-2_17_7 for ldap Added: tags/branch-Code-11-SP2-2_17_7/ldap/ (props changed) - copied from r67637, branches/SuSE-Code-11-SP2-Branch/ldap/ -- 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] r67637 - in /branches/SuSE-Code-11-SP2-Branch/ldap: VERSION package/yast2-ldap.changes src/LdapAgent.cc
by jsuchome＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: jsuchome Date: Thu Mar 15 15:26:17 2012 New Revision: 67637 URL: http://svn.opensuse.org/viewcvs/yast?rev=67637&view=rev Log: - added option to disable certificate checks (bnc#745877) - 2.17.7 Modified: branches/SuSE-Code-11-SP2-Branch/ldap/VERSION branches/SuSE-Code-11-SP2-Branch/ldap/package/yast2-ldap.changes branches/SuSE-Code-11-SP2-Branch/ldap/src/LdapAgent.cc Modified: branches/SuSE-Code-11-SP2-Branch/ldap/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap/VERSION Thu Mar 15 15:26:17 2012 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: branches/SuSE-Code-11-SP2-Branch/ldap/package/yast2-ldap.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap/package/yast2-ldap.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap/package/yast2-ldap.changes Thu Mar 15 15:26:17 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 16 15:50:48 CET 2012 - jsuchome(a)suse.cz + +- added option to disable certificate checks (bnc#745877) +- 2.17.7 + +------------------------------------------------------------------- Wed Aug 31 15:55:42 CEST 2011 - jsuchome(a)suse.cz - properly initialize value of ldap_initialized (bnc#715240) Modified: branches/SuSE-Code-11-SP2-Branch/ldap/src/LdapAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap/src/LdapAgent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap/src/LdapAgent.cc Thu Mar 15 15:26:17 2012 @@ -508,6 +508,7 @@ { string cacertfile = getValue (args, "cacertfile"); string cacertdir = getValue (args, "cacertdir"); + string require = getValue (args, "require_cert"); TlsOptions tls; if (cacertfile != "") { @@ -518,7 +519,12 @@ } if (set_tls == "yes") { - tls.setOption (TlsOptions::REQUIRE_CERT, TlsOptions::DEMAND); + if (require == "never") { + tls.setOption (TlsOptions::REQUIRE_CERT, TlsOptions::NEVER); + } + else { + tls.setOption (TlsOptions::REQUIRE_CERT, TlsOptions::DEMAND); + } } if (set_tls == "try") { tls.setOption (TlsOptions::REQUIRE_CERT, TlsOptions::TRY); -- 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] r67636 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: gs Date: Thu Mar 15 15:24:16 2012 New Revision: 67636 URL: http://svn.opensuse.org/viewcvs/yast?rev=67636&view=rev Log: reduce number of retries for 'fipvlan', add button "Retry Detection" Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/dialogs.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Thu Mar 15 15:24:16 2012 @@ -53,15 +53,28 @@ global boolean Modified(); /** - * Data was modified? + * Data + */ + +/** + * data modified? */ boolean modified = false; /** + * proposal valid? */ boolean proposal_valid = false; /** + * Number of retries for fipvlan (default is 20). + * The number is reduced to 10 to make detection faster. 10 seconds (10 retries * + * 1000 ms) should be enough time for most interfaces. If not there is the + * possibility to retry interface dedection using 'Retry'. + */ +string number_of_retries = "10"; + +/** * Write only, used during autoinstallation. * Don't run services and SuSEconfig, it's all done at one place. */ @@ -292,7 +305,10 @@ // to be able to detect DCB state afterwards (see bnc #737683) string vlan_cmd = "LANG=POSIX fipvlan -u"; map vlan_info = $[]; - + + if ( !Mode::autoinst() ) + vlan_cmd = vlan_cmd + " -l " + FcoeClient::number_of_retries; // reduce number of retries + foreach ( string dev, (list<string>)net_devices, { vlan_cmd = vlan_cmd + " " + dev; } ); Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Thu Mar 15 15:24:16 2012 @@ -178,9 +178,8 @@ } } - -void InitInterfacesDialog (string id) { - y2milestone( "Init interfaces dialog" ); +void ShowInterfaces() +{ string vlan_interface = ""; integer row = 0; @@ -200,9 +199,17 @@ UI::ChangeWidget( `id(`interfaces), `Items, table_items ); // set current item UI::ChangeWidget( `id(`interfaces), `CurrentItem, `id(0) ); + FcoeClient::current_card = 0; +} + +void InitInterfacesDialog (string id) { + y2milestone( "Init interfaces dialog" ); + + ShowInterfaces(); AdjustButtons(); + } // @@ -276,6 +283,12 @@ FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); AdjustButtons(); } + else if ( action == `retry ) + { + FcoeClient::ResetNetworkCards(); + FcoeClient::DetectNetworkCards(); + ShowInterfaces(); + } else if ( action == `create ) { // haendel:~/:[0]# fipvlan -c -s eth3 Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Thu Mar 15 15:24:16 2012 @@ -140,8 +140,9 @@ [] ), // button labels - `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings")), - `PushButton(`id(`create), _("Create FCoE &VLAN Interface")), + `Left(`HBox( `PushButton(`id(`retry), _("Retry &Detection")), + `PushButton(`id(`edit), _("Change &Settings")), + `PushButton(`id(`create), _("Create &FCoE 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] r67635 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: gs Date: Thu Mar 15 10:32:55 2012 New Revision: 67635 URL: http://svn.opensuse.org/viewcvs/yast?rev=67635&view=rev Log: improve lists: only add new line at the very end Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Mar 15 10:32:55 2012 @@ -965,8 +965,8 @@ PadChangeLevel( endtag, leveltag ); PadBOL(); // add new line after end of the list - - if ( endtag ) + // (only at the very end) + if ( endtag && !cindent ) PadNL(); break; -- 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] r67634 - /trunk/ycp-ui-bindings/examples/RichText6.ycp
by gs＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: gs Date: Thu Mar 15 10:31:54 2012 New Revision: 67634 URL: http://svn.opensuse.org/viewcvs/yast?rev=67634&view=rev Log: examples for orderd/unorderd lists, headline Added: trunk/ycp-ui-bindings/examples/RichText6.ycp Added: trunk/ycp-ui-bindings/examples/RichText6.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText6.ycp (added) +++ trunk/ycp-ui-bindings/examples/RichText6.ycp Thu Mar 15 10:31:54 2012 @@ -0,0 +1,46 @@ +// Example for a RichText widget +{ + UI::OpenDialog( `opt(`defaultsize), + `VBox( + `RichText( "<h1>The big headline (level 1)</h1>" + + "<p>This is a <i>RichText</i> widget.</p>" + + "<p>It's very much like <i>HTML</i>, but not quite as powerful.</p>" + + "<p><b>bold</b> and <i>italic</i> you can rely on.</p>" + + "<p>" + + "<h2>An ordered list (headline level 2)</h2>" + + "<ol>" + + "<li>First list entry</li>" + + "<li>Second one </li>" + + "<ol>" + + "<li>and more info</li>" + + "<li>and more and more</li>" + + "</ol>" + + "<li>And so on</li>" + + "<li>and even more</li>" + + "</ol>" + + "<h2>An unordered list</h2>" + + "<ul>" + + "<li>An unordered list entry </li>" + + "<li>and another...</li>" + + "<ul>" + + "<li>Argumets are these:</li>" + + "<ol>" + + "<li>first point is...</li>" + + "<li>second point is that</li>" + + "</ol>" + + "<li>and another argument</li>" + + "</ul>" + + "<li>and last entry</li>" + + "</ul>" + + "<h2>Text mode ignores:</h2>" + + "<pre>" + + "<big> <small> <font>\n" + + " <big>big</big> <small>small</small> <font>font</font>" + + "</pre>" + ), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); +} -- 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] r67633 - in /trunk/installation: package/yast2-installation.changes startup/Second-Stage/S08-start startup/YaST2.call startup/YaST2.ssh startup/common/network.sh
by aschnell＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: aschnell Date: Thu Mar 15 10:30:21 2012 New Revision: 67633 URL: http://svn.opensuse.org/viewcvs/yast?rev=67633&view=rev Log: - renamed link Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/Second-Stage/S08-start trunk/installation/startup/YaST2.call trunk/installation/startup/YaST2.ssh trunk/installation/startup/common/network.sh 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 Thu Mar 15 10:30:21 2012 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Mar 14 15:42:19 CET 2012 - aschnell(a)suse.de -- create link yast2.ssh for 2nd stage ssh installation (bnc#745340) +- create link yast.ssh for 2nd stage ssh installation (bnc#745340) ------------------------------------------------------------------- Wed Feb 15 11:46:45 CET 2012 - gs(a)suse.de Modified: trunk/installation/startup/Second-Stage/S08-start URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stag… ============================================================================== --- trunk/installation/startup/Second-Stage/S08-start (original) +++ trunk/installation/startup/Second-Stage/S08-start Thu Mar 15 10:30:21 2012 @@ -31,12 +31,12 @@ #================================================== # We are going to start a SSH based remote session #-------------------------------------------------- - ln -sf /usr/lib/YaST2/startup/YaST2.ssh /sbin/yast2.ssh + ln -sf /usr/lib/YaST2/startup/YaST2.ssh /sbin/yast.ssh ssh_message while [ -f /var/lib/YaST2/runme_at_boot ]; do sleep 3 done - rm /sbin/yast2.ssh + rm /sbin/yast.ssh fi #============================================= Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Thu Mar 15 10:30:21 2012 @@ -274,7 +274,7 @@ if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then echo "*** Preparing SSH installation for reboot ***" - echo "*** NOTE: after reboot, you have to reconnect and call yast2.ssh ***" + echo "*** NOTE: after reboot, you have to reconnect and call yast.ssh ***" log "\tPreparing SSH installation for reboot" fi } Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Thu Mar 15 10:30:21 2012 @@ -38,7 +38,7 @@ Your system has been updated and needs to reboot ... Reconnect to the system after it reboots and call - yast2.ssh again to continue the installation ... + yast.ssh again to continue the installation ... EOF } Modified: trunk/installation/startup/common/network.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/common/netw… ============================================================================== --- trunk/installation/startup/common/network.sh (original) +++ trunk/installation/startup/common/network.sh Thu Mar 15 10:30:21 2012 @@ -72,7 +72,7 @@ *** sshd has been started *** you can login now and proceed with the installation - run the command 'yast2.ssh' + run the command 'yast.ssh' active interfaces: -- 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] r67632 - /trunk/bootloader/src/clients/bootloader_finish.ycp
by aschnell＠svn2.opensuse.org 15 Mar '12

15 Mar '12

Author: aschnell Date: Thu Mar 15 10:29:51 2012 New Revision: 67632 URL: http://svn.opensuse.org/viewcvs/yast?rev=67632&view=rev Log: - renamed link Modified: trunk/bootloader/src/clients/bootloader_finish.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Thu Mar 15 10:29:51 2012 @@ -130,7 +130,7 @@ // (message ID#SSH) usessh_msg = sformat(_("Then reconnect and run the following: %1 -"), "yast2.ssh"); +"), "yast.ssh"); } // TRANSLATORS: reboot message -- 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] r67631 - in /trunk/vm: VERSION package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: charlesa Date: Thu Mar 15 00:10:52 2012 New Revision: 67631 URL: http://svn.opensuse.org/viewcvs/yast?rev=67631&view=rev Log: - bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 re-adds "x0..respawn..xterm" to inittab Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/vm_finish.ycp Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=67631&r1=67630&r2… ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Thu Mar 15 00:10:52 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 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 Thu Mar 15 00:10:52 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 14 17:00:46 MDT 2012 - carnold(a)novell.com + +- bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 + re-adds "x0..respawn..xterm" to inittab + +------------------------------------------------------------------- Mon Jan 16 14:54:33 UTC 2012 - coolo(a)suse.com - confirm license Modified: trunk/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/vm_finish.ycp?rev=67631&r… ============================================================================== --- trunk/vm/src/vm_finish.ycp (original) +++ trunk/vm/src/vm_finish.ycp Thu Mar 15 00:10:52 2012 @@ -97,14 +97,20 @@ y2milestone("check for xvc0 in inittab and securetty"); if ( !contains(SCR::Dir(.etc.inittab), "x0") ) { - y2milestone("Adding the x0 entry in the inittab file"); - SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); - SCR::Write (.etc.inittab, nil); - string dev_xvc0 = "/dev/xvc0"; - if ( ! FileUtils::Exists(dev_xvc0) ) + // On an upgrade, don't add new entry if existing one is commented out - bnc#720929 + if ( 0 != SCR::Execute(.target.bash,"/usr/bin/grep -q '^#x0:' /etc/inittab") ) { - y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); - SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + y2milestone("Adding the x0 entry in the inittab file"); + SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); + SCR::Write (.etc.inittab, nil); + string dev_xvc0 = "/dev/xvc0"; + if ( ! FileUtils::Exists(dev_xvc0) ) + { + y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); + SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + } + } else { + y2milestone("The x0 entry in the inittab is there but commented out"); } } SCR::Execute(.target.bash,"/usr/bin/grep -q xvc0 /etc/securetty || echo xvc0 >> /etc/securetty"); -- 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] r67630 - in /branches/SuSE-Code-11-SP2-Branch/vm: VERSION package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: charlesa Date: Thu Mar 15 00:08:14 2012 New Revision: 67630 URL: http://svn.opensuse.org/viewcvs/yast?rev=67630&view=rev Log: - bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 re-adds "x0..respawn..xterm" to inittab Modified: branches/SuSE-Code-11-SP2-Branch/vm/VERSION branches/SuSE-Code-11-SP2-Branch/vm/package/yast2-vm.changes branches/SuSE-Code-11-SP2-Branch/vm/src/vm_finish.ycp Modified: branches/SuSE-Code-11-SP2-Branch/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/vm/VE… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/vm/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/vm/VERSION Thu Mar 15 00:08:14 2012 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP2-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/vm/pa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/vm/package/yast2-vm.changes Thu Mar 15 00:08:14 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 14 17:00:46 MDT 2012 - carnold(a)novell.com + +- bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 + re-adds "x0..respawn..xterm" to inittab + +------------------------------------------------------------------- Tue Jan 3 10:53:10 MST 2012 - carnold(a)novell.com - bnc#733715 - SLES11_SP2_LOC : EN: Typo in relocation-server.pot - Modified: branches/SuSE-Code-11-SP2-Branch/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/vm/sr… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/vm/src/vm_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/vm/src/vm_finish.ycp Thu Mar 15 00:08:14 2012 @@ -97,14 +97,20 @@ y2milestone("check for xvc0 in inittab and securetty"); if ( !contains(SCR::Dir(.etc.inittab), "x0") ) { - y2milestone("Adding the x0 entry in the inittab file"); - SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); - SCR::Write (.etc.inittab, nil); - string dev_xvc0 = "/dev/xvc0"; - if ( ! FileUtils::Exists(dev_xvc0) ) + // On an upgrade, don't add new entry if existing one is commented out - bnc#720929 + if ( 0 != SCR::Execute(.target.bash,"/usr/bin/grep -q '^#x0:' /etc/inittab") ) { - y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); - SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + y2milestone("Adding the x0 entry in the inittab file"); + SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); + SCR::Write (.etc.inittab, nil); + string dev_xvc0 = "/dev/xvc0"; + if ( ! FileUtils::Exists(dev_xvc0) ) + { + y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); + SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + } + } else { + y2milestone("The x0 entry in the inittab is there but commented out"); } } SCR::Execute(.target.bash,"/usr/bin/grep -q xvc0 /etc/securetty || echo xvc0 >> /etc/securetty"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0