February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63445 - in /trunk/firstboot: VERSION doc/firstboot-section_mod.xml package/yast2-firstboot.changes scripts/Firstboot-Stage/S09-cleanup
by jsuchome＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: jsuchome Date: Fri Feb 18 11:31:20 2011 New Revision: 63445 URL: http://svn.opensuse.org/viewcvs/yast?rev=63445&view=rev Log: - call stop_unicode before kbd restart (bnc#665504) - docu update - 2.20.2 Modified: trunk/firstboot/VERSION trunk/firstboot/doc/firstboot-section_mod.xml trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=63445&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Fri Feb 18 11:31:20 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_… ============================================================================== --- trunk/firstboot/doc/firstboot-section_mod.xml (original) +++ trunk/firstboot/doc/firstboot-section_mod.xml Fri Feb 18 11:31:20 2011 @@ -148,7 +148,7 @@ <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_congratulate. The content of the given file would be shown as the final text. - However the recommended way of customizing the congratulate text is using default inst_congratulate step and specifying the text (as a value for 'congratulate' section) it in the firstboot.xml control file (see control.xml examples and documentation). + However the recommended way of customizing the congratulate text is using default inst_congratulate step and specifying the text (as a value for 'congratulate' section) it in the firstboot.xml control file (see control.xml examples and documentation). With such text, it is possible to provide translations to more languages, which is not possible for FIRSTBOOT_FINISH_FILE. </para> </section> 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 Feb 18 11:31:20 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 18 11:28:57 CET 2011 - jsuchome(a)suse.cz + +- call stop_unicode before kbd restart (bnc#665504) +- docu update +- 2.20.2 + +------------------------------------------------------------------- Wed Nov 3 17:11:19 CET 2010 - jsuchome(a)suse.cz - translate bootloader items after setting the language (bnc#644062) Modified: trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup Fri Feb 18 11:31:20 2011 @@ -42,13 +42,13 @@ rm -f $IFCFG_USB fi +stop_unicode + if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then /etc/init.d/kbd restart rm /var/lib/YaST2/firstboot_kbd_restart fi -stop_unicode - if [ -e "/var/lib/YaST2/firstboot_reboot_after_finish" ] ; then log "\tRebooting system as requested by firstboot..." rm /var/lib/YaST2/firstboot_reboot_after_finish -- 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] r63444 - /tags/branch-Code-11-SP1-2_17_16_1/firstboot/
by jsuchome＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: jsuchome Date: Fri Feb 18 11:28:51 2011 New Revision: 63444 URL: http://svn.opensuse.org/viewcvs/yast?rev=63444&view=rev Log: Created tag branch-Code-11-SP1-2_17_16_1 for firstboot Added: tags/branch-Code-11-SP1-2_17_16_1/firstboot/ (props changed) - copied from r63443, branches/SuSE-Code-11-SP1-Branch/firstboot/ -- 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] r63443 - in /branches/SuSE-Code-11-SP1-Branch/firstboot: VERSION package/yast2-firstboot.changes scripts/Firstboot-Stage/S09-cleanup
by jsuchome＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: jsuchome Date: Fri Feb 18 11:28:04 2011 New Revision: 63443 URL: http://svn.opensuse.org/viewcvs/yast?rev=63443&view=rev Log: - call stop_unicode before kbd restart (bnc#665504) - 2.17.16.1 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION Fri Feb 18 11:28:04 2011 @@ -1 +1 @@ -2.17.16 +2.17.16.1 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes Fri Feb 18 11:28:04 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 10 17:05:04 CET 2011 - jsuchome(a)suse.cz + +- call stop_unicode before kbd restart (bnc#665504) +- 2.17.16.1 + +------------------------------------------------------------------- Wed Oct 27 09:51:32 CEST 2010 - jsuchome(a)suse.cz - translate bootloader items after setting the language (bnc#644062) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup Fri Feb 18 11:28:04 2011 @@ -42,13 +42,13 @@ rm -f $IFCFG_USB fi +stop_unicode + if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then /etc/init.d/kbd restart rm /var/lib/YaST2/firstboot_kbd_restart fi -stop_unicode - if [ -e "/var/lib/YaST2/firstboot_reboot_after_finish" ] ; then log "\tRebooting system as requested by firstboot..." rm /var/lib/YaST2/firstboot_reboot_after_finish -- 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] r63442 - /tags/branch-SLE-10-SP4-2_13_141/network/
by mvidner＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: mvidner Date: Thu Feb 17 17:07:21 2011 New Revision: 63442 URL: http://svn.opensuse.org/viewcvs/yast?rev=63442&view=rev Log: Created tag branch-SLE-10-SP4-2_13_141 for network Added: tags/branch-SLE-10-SP4-2_13_141/network/ - copied from r63441, branches/SuSE-SLE-10-SP4-Branch/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] r63441 - /tags/branch-SLE-10-SP4-2_13_141/
by mvidner＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: mvidner Date: Thu Feb 17 17:07:19 2011 New Revision: 63441 URL: http://svn.opensuse.org/viewcvs/yast?rev=63441&view=rev Log: Created tag branch-SLE-10-SP4-2_13_141 Added: tags/branch-SLE-10-SP4-2_13_141/ -- 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] r63440 - in /branches/SuSE-SLE-10-SP4-Branch/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mvidner＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: mvidner Date: Thu Feb 17 16:28:45 2011 New Revision: 63440 URL: http://svn.opensuse.org/viewcvs/yast?rev=63440&view=rev Log: Fixed losing nameservers when doing a DVD installation (bnc#668034). r60729 which intended to fix bnc#561349 claims "write resolv.conf when change from dhcp->static" but in fact writes it always, even if there was no config at all, overwriting the DHCP nameservers with an empty list. Deleted that bit, bringing the patch closer to the original one of which it was a "backport", r41079 bnc#327074. Modified: branches/SuSE-SLE-10-SP4-Branch/network/VERSION branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/VERSION Thu Feb 17 16:28:45 2011 @@ -1 +1 @@ -2.13.140 +2.13.141 Modified: branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes Thu Feb 17 16:28:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 17 16:27:51 CET 2011 - mvidner(a)suse.cz + +- Fixed losing nameservers when doing a DVD installation (bnc#668034). +- 2.13.141 + +------------------------------------------------------------------- Tue Feb 1 13:05:46 CET 2011 - mvidner(a)suse.cz - Dropped ag_xauth (.xauth.key), superseded since 2005 by Modified: branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp Thu Feb 17 16:28:45 2011 @@ -585,9 +585,6 @@ y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); NetworkService::StartStop (); y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); - DNS::modified=true; - DNS::Write(); - y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); sleep(sl); } -- 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] r63439 - in /trunk/storage: package/ storage/src/ storage/src/include/ storage/src/modules/ storage/src/testsuite/
by fehr＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: fehr Date: Thu Feb 17 15:49:12 2011 New Revision: 63439 URL: http://svn.opensuse.org/viewcvs/yast?rev=63439&view=rev Log: add option to demand and proposal using btrfs as default filesystem Added: trunk/storage/storage/src/testsuite/.cvsignore Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/inst_disk_proposal.ycp trunk/storage/storage/src/inst_target_part.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Feb 17 15:49:12 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 17 15:47:57 CET 2011 - fehr(a)suse.de + +- add option to demand and proposal using btrfs as default + filesystem + +------------------------------------------------------------------- Wed Jan 26 16:03:35 CET 2011 - fehr(a)suse.de - add button to trigger query for crypt password (bnc #666883) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Thu Feb 17 15:49:12 2011 @@ -70,74 +70,6 @@ } - boolean QueryProposalPassword() - { - if (!isempty(StorageProposal::GetProposalPassword())) - return true; - - UI::OpenDialog(`VBox( - `Label(_("Enter your password for the proposal encryption.")), - `MinWidth(40, - `Password(`id(`pw1), - // Label: get password for user root - // Please use newline if label is longer than 40 characters - _("Password:"), "")), - `VSpacing(0.5), - `MinWidth(40, - `Password(`id(`pw2), - // Label: get same password again for verification - // Please use newline if label is longer than 40 characters - _("Reenter the password for verification:"), "")), - `Label(_("Don't forget what you enter here!")), - `ButtonBox( - `PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `PushButton(`id(`cancel), Label::CancelButton()) - ) - )); - - string password = ""; - symbol widget = nil; - - repeat - { - // Clear password fields on every round. - UI::ChangeWidget(`id(`pw1), `Value, ""); - UI::ChangeWidget(`id(`pw2), `Value, ""); - - UI::SetFocus(`id(`pw1)); - - widget = (symbol) UI::UserInput(); - - switch (widget) - { - case `ok: - - password = (string) UI::QueryWidget(`id(`pw1), `Value); - string tmp = (string) UI::QueryWidget(`id(`pw2), `Value); - - if (!Storage::CheckEncryptionPasswords(password, tmp, 8, false)) - widget = `again; - - break; - } - - } until (widget == `cancel || widget == `ok); - - UI::CloseDialog(); - - if (widget == `ok) - { - StorageProposal::SetProposalPassword(password); - return true; - } - else - { - return false; - } - - } - - ////////////////////////////////////////////////////////////////////////////// // Dialog Password for Crypted FS Update ////////////////////////////////////////////////////////////////////////////// Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_pr… ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Thu Feb 17 15:49:12 2011 @@ -141,12 +141,6 @@ string detailed_str = _("&Create Partition Setup..."); // Radiobutton for partition dialog string import_str = _("&Import Partition Setup..."); -// Radiobutton for partition dialog -string part_str = _("&Partition Based"); -// Radiobutton for partition dialog -string lvm_str = _("&LVM Based"); -// Checkbox for partition dialog -string encrypt_str = _("Encrypt Volume Group"); string target_is = ""; @@ -185,18 +179,10 @@ y2milestone( "current proposal: %1", changes ); -term rframe = - `HBox( - `HSpacing(3), - `Top(`MinWidth(20, `Left(`RadioButton(`id(`part), `opt(`notify), part_str, - !StorageProposal::GetProposalLvm())))), - `HSpacing(3), - `Top(`MinWidth(20, `VBox(`Left(`RadioButton(`id(`lvm), `opt(`notify), lvm_str, - StorageProposal::GetProposalLvm())), - `Left(`HBox(`HSpacing(4), `CheckBox(`id(`encrypt), `opt(`notify), encrypt_str, - StorageProposal::GetProposalEncrypt())))))), - `HSpacing(3) - ); +term rframe = + `HBox( `HSpacing(20), + StorageProposal::AddCommonWidgets(), + `HSpacing(3) ); term bframe = `VBox( @@ -215,8 +201,7 @@ `HSpacing(2), `VBox( `MinHeight(8, `RichText(`id(`richtext), changes)), - `VSpacing(1), - `RadioButtonGroup( `id("prop_mode"), rframe ), + rframe, `VSpacing(2), bframe, `VStretch() @@ -282,8 +267,7 @@ repeat { - symbol old_mode = (symbol) UI::QueryWidget(`id("prop_mode"), `CurrentButton); - y2milestone( "old_mode %1", old_mode ); + boolean val = false; Wizard::SetFocusToNextButton(); ret = (symbol)Wizard::UserInput(); y2milestone( "USERINPUT %1", ret ); @@ -291,45 +275,13 @@ if( ret == `abort && Popup::ReallyAbort(true) ) return `abort; - if( contains( [ `lvm, `part, `encrypt ], ret ) ) + if( contains( [ `lvm, `home, `btrfs, `encrypt ], ret ) ) { + val = (boolean) UI::QueryWidget(`id(ret), `Value); if( AskOverwriteChanges() ) { target_is = "SUGGESTION"; - - switch (ret) - { - case `part: - StorageProposal::SetProposalLvm(false); - UI::ChangeWidget(`id(`encrypt), `Enabled, false); - break; - - case `lvm: - StorageProposal::SetProposalLvm(true); - UI::ChangeWidget(`id(`encrypt), `Enabled, true); - break; - - case `encrypt: - - if ((boolean) UI::QueryWidget(`id(`encrypt), `Value)) - { - if (QueryProposalPassword()) - { - StorageProposal::SetProposalEncrypt(true); - } - else - { - UI::ChangeWidget(`id(`encrypt), `Value, false); - continue; - } - } - else - { - StorageProposal::SetProposalEncrypt(false); - } - break; - } - + StorageProposal::HandleCommonWidgets( ret ); Storage::ResetOndiskTarget(); Storage::AddMountPointsForWin(Storage::GetTargetMap()); map prop = StorageProposal::get_inst_prop(Storage::GetTargetMap()); @@ -350,9 +302,7 @@ UI::ChangeWidget(`id(`richtext), `Value, changes); } else - { - UI::ChangeWidget( `id("prop_mode"), `CurrentButton, old_mode ); - } + UI::ChangeWidget(`id(ret), `Value, !val); } else if (contains([ `modify, `detailed, `import ], ret)) { @@ -395,13 +345,15 @@ execSubscreens( ret ); changes = Storage::ChangeText(); UI::ChangeWidget(`id(`richtext), `Value, changes); - if( ret==`detailed ) - { - UI::ChangeWidget(`id(`part), `Value, !StorageProposal::GetProposalLvm()); - UI::ChangeWidget(`id(`lvm), `Value, StorageProposal::GetProposalLvm()); - UI::ChangeWidget(`id(`encrypt), `Enabled, StorageProposal::GetProposalLvm()); - UI::ChangeWidget(`id(`encrypt), `Value, StorageProposal::GetProposalEncrypt()); - } + val = StorageProposal::GetProposalLvm(); + UI::ChangeWidget(`id(`lvm), `Value, val ); + UI::ChangeWidget(`id(`encrypt), `Enabled, val ); + UI::ChangeWidget( `id(`encrypt), `Value, + val && StorageProposal::GetProposalEncrypt() ); + UI::ChangeWidget(`id(`home), `Value, + StorageProposal::GetProposalHome() ); + UI::ChangeWidget(`id(`btrfs), `Value, + StorageProposal::GetProposalBtrfs() ); } } until ( ret == `next || ret == `back || ret == `cancel ); Modified: trunk/storage/storage/src/inst_target_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_… ============================================================================== --- trunk/storage/storage/src/inst_target_part.ycp (original) +++ trunk/storage/storage/src/inst_target_part.ycp Thu Feb 17 15:49:12 2011 @@ -17,6 +17,7 @@ import "Mode"; import "Popup"; import "Storage"; + import "StorageProposal"; import "Partitions"; import "Product"; import "Label"; @@ -160,7 +161,7 @@ // this is the resize case // vbox = create_resize_dialog (partitions, target["cyl_size"]:1 ); - vbox = add_common_widgets( vbox ); + vbox = add( vbox, StorageProposal::AddCommonWidgets()); y2milestone ("can resize !"); } else @@ -170,7 +171,7 @@ map tmp = construct_partition_dialog( partitions, target["label"]:"", target["cyl_size"]:1 ); - vbox = add_common_widgets( tmp["term"]:`Empty() ); + vbox = add( tmp["term"]:`VBox(), StorageProposal::AddCommonWidgets()); } } @@ -179,7 +180,7 @@ else { vbox = create_whole_disk_dialog(); - vbox = add_common_widgets( vbox ); + vbox = add( vbox, StorageProposal::AddCommonWidgets()); } // Since resize case and normal case have different help texts we need @@ -220,18 +221,10 @@ { break; } - else if (ret == `lvm) - { - UI::ChangeWidget(`id(`encrypt), `Enabled, (boolean) UI::QueryWidget(`id(`lvm), `Value)); - } - else if (ret == `encrypt) - { - if ((boolean) UI::QueryWidget(`id(`encrypt), `Value)) + else if( contains( [ `lvm, `home, `btrfs, `encrypt ], ret ) ) { - if (!QueryProposalPassword()) - UI::ChangeWidget(`id(`encrypt), `Value, false); - } - } + StorageProposal::HandleCommonWidgets(ret); + } else if (ret == `full) { // Set all checkboxes @@ -396,12 +389,7 @@ y2milestone ("partitions '%1'", partitions); - StorageProposal::SetProposalHome( (boolean)UI::QueryWidget( `id(`home), `Value )); - StorageProposal::SetProposalLvm((boolean) UI::QueryWidget(`id(`lvm), `Value)); - StorageProposal::SetProposalEncrypt((boolean) UI::QueryWidget(`id(`encrypt), `Value)); - ok = create_partitions( targetMap, target, partitions ); - StorageProposal::SetProposalDefault(true); if( !ok ) { string reason = _("Too few partitions are marked for removal Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Thu Feb 17 15:49:12 2011 @@ -131,7 +131,11 @@ { if (default_boot_fs == `unknown) { - default_boot_fs = DefaultFs(); + + if( DefaultFs()!=`btrfs ) + default_boot_fs = DefaultFs(); + else + default_boot_fs = `ext4; if (EfiBoot()) { default_boot_fs = `vfat; Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Thu Feb 17 15:49:12 2011 @@ -19,6 +19,7 @@ import "FileSystems"; import "Partitions"; + import "Label"; import "Storage"; import "ProductFeatures"; import "Arch"; @@ -49,6 +50,7 @@ boolean proposal_home = false; boolean proposal_lvm = false; boolean proposal_encrypt = false; + boolean proposal_btrfs = false; string proposal_password = ""; map<string, any> cfg_xml = $[]; @@ -87,6 +89,17 @@ y2milestone("SetProposalEncrypt val:%1", val); } + global boolean GetProposalBtrfs() + { + return proposal_btrfs; + } + + global void SetProposalBtrfs(boolean val) + { + proposal_btrfs = val; + y2milestone("SetProposalBtrfs val:%1", val); + } + global string GetProposalPassword() { return proposal_password; @@ -107,8 +120,10 @@ SetProposalEncrypt(false); SetProposalPassword(""); } - y2milestone("SetProposalDefault home:%1 lvm:%2 encypt:%3 home_only:%4", proposal_home, - proposal_lvm, proposal_encrypt, home_only); + SetProposalBtrfs(cfg_xml["btrfs"]:false); + y2milestone("SetProposalDefault home:%1 lvm:%2 encypt:%3 home_only:%4 btrfs:%5", + proposal_home, proposal_lvm, proposal_encrypt, home_only, + proposal_btrfs); } @@ -162,7 +177,6 @@ return cfg_xml; } - global string GetProposalVM() { string ret = ""; @@ -174,6 +188,14 @@ return ret; } +symbol PropDefaultFs() + { + symbol ret = Partitions::DefaultFs(); + if( GetProposalBtrfs() ) + ret = `btrfs; + return( ret ); + } + map<string, map> EncryptDevices(map<string, map> target, string vg) { @@ -399,7 +421,10 @@ boolean need_boot( map disk ) { - return( Partitions::NeedBoot() || + y2milestone( "need_boot NeedBoot:%1 GetProposalBtrfs:%2 type:%3", + Partitions::NeedBoot(), GetProposalBtrfs(), + disk["type"]:`CT_UNKNOWN ); + return( Partitions::NeedBoot() || GetProposalBtrfs() || disk["type"]:`CT_UNKNOWN == `CT_DMRAID ); } @@ -413,7 +438,8 @@ ``(e["mount"]:""=="/"))) > 0; map tc = conf; y2milestone( "try_add_boot conf %1", conf ); - y2milestone( "try_add_boot boot %1 root %2 force %3", boot, root, force ); + y2milestone( "try_add_boot boot %1 root %2 force %3 need_boot:%4", + boot, root, force, need_boot(disk) ); if( !boot && (root||force) && (disk["cyl_count"]:0>Partitions::BootCyl() || need_boot(disk)) ) { @@ -2543,7 +2569,6 @@ return( ret ); } - list<map> can_mp_reuse( string mp, integer min, integer max, list<map> partitions ) { @@ -2571,8 +2596,7 @@ if( !p["delete"]:false && p["device"]:""==pl[0,"device"]:"" ) { - p = Storage::SetVolOptions( p, mp, - Partitions::DefaultFs(), + p = Storage::SetVolOptions( p, mp, PropDefaultFs(), "", "", "" ); } return( p ); @@ -2609,7 +2633,7 @@ list<map> ret = []; y2milestone( "get_proposal have_swap:%1 disk %2", have_swap, disk ); map root = $[ "mount" : "/", "increasable" : true, - "fsys" : Partitions::DefaultFs(), "size" : 0 ]; + "fsys" : PropDefaultFs(), "size" : 0 ]; map opts = GetControlCfg(); map conf = $[ "partitions" : [] ]; list<integer> swap_sizes = []; @@ -2627,7 +2651,7 @@ if( GetProposalHome() && opts["home_limit"]:0 < avail_size ) { map home = $[ "mount" : "/home", "increasable" : true, - "fsys" : Partitions::DefaultFs(), "size" : 512*1024*1024, + "fsys" : PropDefaultFs(), "size" : 512*1024*1024, "pct" : 100-opts["root_percent"]:40 ]; conf["partitions"] = maplist( map p, conf["partitions"]:[], ``{ @@ -2946,7 +2970,7 @@ target = AddWinInfo(target); ret["target"] = target; map root = $[ "mount" : "/", "increasable" : true, - "fsys" : Partitions::DefaultFs(), "size" : 0 ]; + "fsys" : PropDefaultFs(), "size" : 0 ]; map opts = GetControlCfg(); list<string> ddev = get_disk_try_list( target, true ); string sol_disk = ""; @@ -3149,7 +3173,7 @@ opts["home_limit"]:0 < avail_size ) { map home = $[ "mount" : "/home", "increasable" : true, - "fsys" : Partitions::DefaultFs(), + "fsys" : PropDefaultFs(), "size" : 512*1024*1024, "pct" : 100-opts["root_percent"]:40 ]; conf["partitions"] = @@ -3609,8 +3633,7 @@ map p = $[ "create":true, "name" : "root", "device" : ret["device"]:"" + "/root", "size_k" : pe_to_sizek(root_pe,pe) ]; - p = Storage::SetVolOptions( p, "/", Partitions::DefaultFs(), - "", "", "" ); + p = Storage::SetVolOptions( p, "/", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm created %1", p ); ret["partitions"] = add( ret["partitions"]:[], p ); } @@ -3620,7 +3643,7 @@ ``{ if( p["name"]:"" == "root" ) { - p = Storage::SetVolOptions( p, "/", Partitions::DefaultFs(), + p = Storage::SetVolOptions( p, "/", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm reuse %1", p ); } @@ -3655,8 +3678,7 @@ map p = $[ "create":true, "name" : "home", "device" : ret["device"]:"" + "/home", "size_k" : pe_to_sizek(home_pe,pe) ]; - p = Storage::SetVolOptions( p, "/home", Partitions::DefaultFs(), - "", "", "" ); + p = Storage::SetVolOptions( p, "/home", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm created %1", p ); ret["partitions"] = add( ret["partitions"]:[], p ); } @@ -3666,7 +3688,7 @@ ``{ if( p["name"]:"" == "home" ) { - p = Storage::SetVolOptions( p, "/home", Partitions::DefaultFs(), + p = Storage::SetVolOptions( p, "/home", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm reuse %1", p ); } @@ -4012,4 +4034,144 @@ return ret; } +global term AddCommonWidgets() + { + term vb = `VBox(); + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox(`id(`lvm), `opt(`notify), + // Label text + _("Create &LVM Based Proposal"), GetProposalLvm() )))); + vb = add( vb, + `Left(`HBox(`HSpacing(7), `CheckBox(`id(`encrypt), `opt(`notify), + // Label text + _("Encr&ypt Volume Group"), GetProposalEncrypt())))); + vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox( `id(`home), `opt(`notify), + // Label text + _("Propose Separate &Home Partition"), + GetProposalHome() )))); + vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox(`id(`btrfs), `opt(`notify), + // Label text + _("Use &Btrfs as default Filesystem"), + GetProposalBtrfs() )))); + term frame = `VBox( `VSpacing(1.5), + `HVCenter( `VBox( `Left(`Label( `opt(`boldFont), _("Proposal settings"))), `VSpacing(0.3), `HVCenter(vb)) )); + //`HVCenter(`Frame( _("Proposal settings"), `HVCenter(vb) ))); + y2milestone( "AddCommonWidgets Home:%1 Btrfs:%2", GetProposalHome(), + GetProposalBtrfs() ); + return( frame ); + } + +boolean QueryProposalPassword() + { + if (!isempty(StorageProposal::GetProposalPassword())) + return true; + + UI::OpenDialog(`VBox( + `Label(_("Enter your password for the proposal encryption.")), + `MinWidth(40, + `Password(`id(`pw1), + // Label: get password for user root + // Please use newline if label is longer than 40 characters + _("Password:"), "")), + `VSpacing(0.5), + `MinWidth(40, + `Password(`id(`pw2), + // Label: get same password again for verification + // Please use newline if label is longer than 40 characters + _("Reenter the password for verification:"), "")), + `Label(_("Don't forget what you enter here!")), + `ButtonBox( + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + )); + + string password = ""; + symbol widget = nil; + + repeat + { + // Clear password fields on every round. + UI::ChangeWidget(`id(`pw1), `Value, ""); + UI::ChangeWidget(`id(`pw2), `Value, ""); + + UI::SetFocus(`id(`pw1)); + + widget = (symbol) UI::UserInput(); + + switch (widget) + { + case `ok: + + password = (string) UI::QueryWidget(`id(`pw1), `Value); + string tmp = (string) UI::QueryWidget(`id(`pw2), `Value); + + if (!Storage::CheckEncryptionPasswords(password, tmp, 8, false)) + widget = `again; + + break; + } + } until (widget == `cancel || widget == `ok); + + UI::CloseDialog(); + + if (widget == `ok) + { + StorageProposal::SetProposalPassword(password); + return true; + } + else + { + return false; + } + } + +global boolean HandleCommonWidgets( symbol id ) + { + boolean ret = false; + boolean val = (boolean) UI::QueryWidget(`id(id), `Value); + y2milestone( "id:%1 val:%2", ret, val ); + switch( id ) + { + case `lvm: + StorageProposal::SetProposalLvm(val); + UI::ChangeWidget(`id(`encrypt), `Enabled, val); + ret = true; + break; + + case `encrypt: + if( val ) + { + if (QueryProposalPassword()) + { + StorageProposal::SetProposalEncrypt(true); + } + else + { + UI::ChangeWidget(`id(`encrypt), `Value, false); + } + } + else + { + StorageProposal::SetProposalEncrypt(false); + } + ret = true; + break; + + case `btrfs: + StorageProposal::SetProposalBtrfs(val); + ret = true; + break; + + case `home: + StorageProposal::SetProposalHome(val); + ret = true; + break; + } + return( ret ); + } } Added: trunk/storage/storage/src/testsuite/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/.c… ============================================================================== --- trunk/storage/storage/src/testsuite/.cvsignore (added) +++ trunk/storage/storage/src/testsuite/.cvsignore Thu Feb 17 15:49:12 2011 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test -- 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] r63438 - /tags/stable-2_20_5/installation/
by aschnell＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: aschnell Date: Thu Feb 17 13:54:06 2011 New Revision: 63438 URL: http://svn.opensuse.org/viewcvs/yast?rev=63438&view=rev Log: Created tag stable-2_20_5 for installation Added: tags/stable-2_20_5/installation/ - copied from r63437, trunk/installation/ -- 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] r63437 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call
by aschnell＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: aschnell Date: Thu Feb 17 13:51:18 2011 New Revision: 63437 URL: http://svn.opensuse.org/viewcvs/yast?rev=63437&view=rev Log: - fixed braille support during installation (bnc #672086) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63437&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Feb 17 13:51:18 2011 @@ -1 +1 @@ -2.20.4 +2.20.5 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 Feb 17 13:51:18 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 17 13:49:19 CET 2011 - aschnell(a)suse.de + +- fixed braille support during installation (bnc #672086) +- 2.20.5 + +------------------------------------------------------------------- Tue Feb 8 15:10:25 CET 2011 - locilka(a)suse.cz - Adapted openSUSE control file to the current naming schema of 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 Feb 17 13:51:18 2011 @@ -124,10 +124,11 @@ if [ $INST_MODE = "normal" ];then if [ ! -z "$Braille" ];then log "Braille config needed, setting up braille display" - sed -e "s#brlname=.*#brlname=$Braille#" \ - -e "s#brlport=.*#brlport=$Brailledevice#" /etc/suse-blinux.conf \ + # downcase $Braille so that brld will find the driver + sed -e "s#brlname=.*#brlname=${Braille,,}#" \ + -e "s#brlport=.*#brlport=$Brailledevice#" /etc/sbl.conf \ >/tmp/suse-blinux.conf - mv -f /tmp/suse-blinux.conf /etc + mv -f /tmp/suse-blinux.conf /etc/sbl.conf /etc/init.d/brld start /etc/init.d/sbl start fi -- 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] r63436 - /tags/stable-2_20_2/users/
by jsuchome＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: jsuchome Date: Thu Feb 17 11:10:21 2011 New Revision: 63436 URL: http://svn.opensuse.org/viewcvs/yast?rev=63436&view=rev Log: Created tag stable-2_20_2 for users Added: tags/stable-2_20_2/users/ - copied from r63435, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0