July 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39128 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp
by sh-sh-sh＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: sh-sh-sh Date: Mon Jul 2 18:20:06 2007 New Revision: 39128 URL: http://svn.opensuse.org/viewcvs/yast?rev=39128&view=rev Log: logging Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp Mon Jul 2 18:20:06 2007 @@ -1,7 +1,7 @@ +// Advanced MultiSelectionBox example: +// +// Retrieve the list of selected items and output it. { - // Advanced MultiSelectionBox example: - // - // Retrieve the list of selected items and output it. UI::OpenDialog( `VBox( @@ -19,6 +19,8 @@ ); UI::UserInput(); list selected_items = (list) UI::QueryWidget( `id(`toppings), `SelectedItems ); + + y2debug( "Selected items: %1", selected_items ); // Remember to retrieve the widget's data _before_ the dialog is closed, // i.e. before it is destroyed! -- 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] r39127 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/SelectionBox2.ycp
by sh-sh-sh＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: sh-sh-sh Date: Mon Jul 2 18:19:09 2007 New Revision: 39127 URL: http://svn.opensuse.org/viewcvs/yast?rev=39127&view=rev Log: logging Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/SelectionBox2.ycp Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/SelectionBox2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/SelectionBox2.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/SelectionBox2.ycp Mon Jul 2 18:19:09 2007 @@ -1,3 +1,4 @@ +// Simple SelectionBox example { // Create a selection box with three entries. // All entries have IDs to identify them independent of locale @@ -23,6 +24,7 @@ // Rather, it returns the ID of the widget (normally the PushButton) // that caused UI::UserInput() to return. any pizza = UI::QueryWidget(`id(`pizza), `CurrentItem); + y2milestone( "Selected pizza: %1", pizza ); // Close the dialog. // Remember to read values from the dialog's widgets BEFORE closing it! -- 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] r39126 - /tags/stable-2_15_18/storage/
by fehr＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: fehr Date: Mon Jul 2 18:11:07 2007 New Revision: 39126 URL: http://svn.opensuse.org/viewcvs/yast?rev=39126&view=rev Log: Created tag stable-2_15_18 for storage Added: tags/stable-2_15_18/storage/ - copied from r39125, trunk/storage/ -- 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] r39125 - /trunk/storage/package/yast2-storage.changes
by fehr＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: fehr Date: Mon Jul 2 18:10:45 2007 New Revision: 39125 URL: http://svn.opensuse.org/viewcvs/yast?rev=39125&view=rev Log: add version to changelog Modified: trunk/storage/package/yast2-storage.changes 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 Mon Jul 2 18:10:45 2007 @@ -3,6 +3,7 @@ - make sure util-linux-crypto gets installed and boot.crypto is insserved (#279900) +- version 2.15.18 ------------------------------------------------------------------- Mon Jul 02 18:09:18 CEST 2007 - aschnell(a)suse.de -- 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] r39124 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_lib.ycp storage/src/inst_prepdisk.ycp storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: fehr Date: Mon Jul 2 18:09:31 2007 New Revision: 39124 URL: http://svn.opensuse.org/viewcvs/yast?rev=39124&view=rev Log: make sure util-linux-crypto gets installed and boot.crypto is insserved (#279900) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/inst_prepdisk.ycp trunk/storage/storage/src/modules/Storage.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 Mon Jul 2 18:09:31 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 2 18:08:11 CEST 2007 - fehr(a)suse.de + +- make sure util-linux-crypto gets installed and boot.crypto is + insserved (#279900) + +------------------------------------------------------------------- Mon Jul 02 18:09:18 CEST 2007 - aschnell(a)suse.de - handle old encryption types with cryptsetup (bug #258222) Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Mon Jul 2 18:09:31 2007 @@ -931,6 +931,7 @@ new["mountby"] = `device; new["label"] = ""; new["ori_label"] = ""; + Package::InstallAll( ["util-linux-crypto"] ); } } if( ret == `fs_options ) Modified: trunk/storage/storage/src/inst_prepdisk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_prepdis… ============================================================================== --- trunk/storage/storage/src/inst_prepdisk.ycp (original) +++ trunk/storage/storage/src/inst_prepdisk.ycp Mon Jul 2 18:09:31 2007 @@ -135,7 +135,10 @@ destproc = Installation::scr_destdir+"/sys"; SCR::Execute (.target.mount, ["sysfs", destproc], "-t sysfs"); } - + else + { + Storage::FinishInstall(); + } Storage::UpdateTargetMap(); SCR::Write( .target.ycp, Storage::SaveDumpPath("targetMap_pe"), Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Jul 2 18:09:31 2007 @@ -4278,16 +4278,24 @@ pl = add( pl, "yast2-storage-evms" ); } boolean need_quota = false; + boolean need_crypt = false; foreach( string k, map e, tg, ``{ if( size(filter( map p, e["partitions"]:[], ``(FileSystems::HasQuota(p))))>0 ) need_quota = true; + if( size(filter( map p, e["partitions"]:[], + ``(p["enc_type"]:`none != `none)))>0 ) + need_crypt = true; }); if( need_quota ) { pl = add( pl, "quota" ); } + if( need_crypt ) + { + pl = add( pl, "util-linux-crypto" ); + } y2milestone( "AddPackageList ret %1", pl ); return( pl ); } @@ -5502,65 +5510,83 @@ global define void FinishInstall() ``{ + y2milestone( "FinishInstall initial:%1", Stage::initial() ); map<string,map> tg = GetTargetMap(); - HandleModulesOnBoot( tg ); - list evms = GetUsedEvmsDisks( tg ); - y2milestone( "FinishInstall evms %1", evms ); - if( size(evms)>0 ) + if( Stage::initial() ) { - string cmd = "cd / && /sbin/insserv /etc/init.d/boot.evms"; - y2milestone( "FinishInstall cmd %1", cmd ); - map bo = (map)SCR::Execute (.target.bash_output, cmd ); - y2milestone( "FinishInstall bo %1", bo ); - } - list<string> nonevms = GetUsedRealDisks( tg ); - nonevms = filter( string d, nonevms, ``(!contains( evms, d ))); - nonevms = maplist( string d, nonevms, ``(substring(d,5))); - y2milestone( "FinishInstall nonevms %1", nonevms ); - nonevms = (list<string>)merge( nonevms, maplist( map p, GetPrepBoot(tg), - ``(substring(p["device"]:"",5)))); - y2milestone( "FinishInstall nonevms %1", nonevms ); - if( size(nonevms)>0 && SCR::Read( .target.size, "/etc/evms.conf" )>=0 ) - { - map evmsconf = $[]; - AsciiFile::ReadFile( evmsconf, "/etc/evms.conf" ); - boolean found = false; - integer i = 1; - string regex1 = "^[ \t]*activate[ \t]*\\{"; - string regex2 = "^[ \t]*exclude[ \t]*="; - string regex3 = "^[ \t]*\\}"; - while( i<=AsciiFile::NumLines(evmsconf) && !found ) - { - found = regexpmatch( evmsconf["l",i,"line"]:"", regex1 ); - i = i+1; - } - found = false; - boolean found2 = false; - while( i<=AsciiFile::NumLines(evmsconf) && !found && !found2) + HandleModulesOnBoot( tg ); + list evms = GetUsedEvmsDisks( tg ); + y2milestone( "FinishInstall evms %1", evms ); + if( size(evms)>0 ) { - found = regexpmatch( evmsconf["l",i,"line"]:"", regex2 ); - found2 = regexpmatch( evmsconf["l",i,"line"]:"", regex3 ); - if( found ) - { - string co = evmsconf["l",i,"line"]:""; - integer pos = search( co, "[" ); - if( pos!=nil ) - co = substring( co, pos+1 ); - pos = search( co, "]" ); - if( pos!=nil ) - co = substring( co, 0, pos ); - y2milestone( "FinishInstall co = \"%1\"", co ); - string li = "\texclude = [ " + co + mergestring( nonevms, " " ) + - " ]"; - y2milestone( "FinishInstall li = %1", li ); - evmsconf["l",i,"line"] = li; - evmsconf["l",i,"buildline"] = false; - AsciiFile::RewriteFile( evmsconf, "/etc/evms.conf" ); + string cmd = "cd / && /sbin/insserv /etc/init.d/boot.evms"; + y2milestone( "FinishInstall cmd %1", cmd ); + map bo = (map)SCR::Execute (.target.bash_output, cmd ); + y2milestone( "FinishInstall bo %1", bo ); + } + list<string> nonevms = GetUsedRealDisks( tg ); + nonevms = filter( string d, nonevms, ``(!contains( evms, d ))); + nonevms = maplist( string d, nonevms, ``(substring(d,5))); + y2milestone( "FinishInstall nonevms %1", nonevms ); + nonevms = (list<string>)merge( nonevms, maplist( map p, GetPrepBoot(tg), + ``(substring(p["device"]:"",5)))); + y2milestone( "FinishInstall nonevms %1", nonevms ); + if( size(nonevms)>0 && SCR::Read( .target.size, "/etc/evms.conf" )>=0 ) + { + map evmsconf = $[]; + AsciiFile::ReadFile( evmsconf, "/etc/evms.conf" ); + boolean found = false; + integer i = 1; + string regex1 = "^[ \t]*activate[ \t]*\\{"; + string regex2 = "^[ \t]*exclude[ \t]*="; + string regex3 = "^[ \t]*\\}"; + while( i<=AsciiFile::NumLines(evmsconf) && !found ) + { + found = regexpmatch( evmsconf["l",i,"line"]:"", regex1 ); + i = i+1; + } + found = false; + boolean found2 = false; + while( i<=AsciiFile::NumLines(evmsconf) && !found && !found2) + { + found = regexpmatch( evmsconf["l",i,"line"]:"", regex2 ); + found2 = regexpmatch( evmsconf["l",i,"line"]:"", regex3 ); + if( found ) + { + string co = evmsconf["l",i,"line"]:""; + integer pos = search( co, "[" ); + if( pos!=nil ) + co = substring( co, pos+1 ); + pos = search( co, "]" ); + if( pos!=nil ) + co = substring( co, 0, pos ); + y2milestone( "FinishInstall co = \"%1\"", co ); + string li = "\texclude = [ " + co + + mergestring( nonevms, " " ) + " ]"; + y2milestone( "FinishInstall li = %1", li ); + evmsconf["l",i,"line"] = li; + evmsconf["l",i,"buildline"] = false; + AsciiFile::RewriteFile( evmsconf, "/etc/evms.conf" ); + } + i = i+1; } - i = i+1; } } - y2milestone( "FinishInstall" ); + boolean need_crypt = false; + foreach( string k, map e, tg, + ``{ + if( size(filter( map p, e["partitions"]:[], + ``(p["enc_type"]:`none != `none)))>0 ) + need_crypt = true; + }); + if( need_crypt ) + { + string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto"; + y2milestone( "FinishInstall cmd %1", cmd ); + map bo = (map)SCR::Execute (.target.bash_output, cmd ); + y2milestone( "FinishInstall bo %1", bo ); + } + y2milestone( "FinishInstall done" ); } global define map GetEntryForMountpoint( string mp ) -- 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] r39123 - in /branches/tmp/sh/mod-ui/core/libyui/src: YCPPropertyHandler.cc YCPPropertyHandler.h YProperty.cc YProperty.h YRadioButtonGroup.cc YUI_builtins.cc
by sh-sh-sh＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: sh-sh-sh Date: Mon Jul 2 18:02:01 2007 New Revision: 39123 URL: http://svn.opensuse.org/viewcvs/yast?rev=39123&view=rev Log: got rid of widgetPtrProperty kludge Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc Mon Jul 2 18:02:01 2007 @@ -29,42 +29,50 @@ #include <ycp/y2log.h> #include "YCPPropertyHandler.h" +#include "YCPDialogParser.h" #include "YCPItemParser.h" +#include "YCPValueWidgetID.h" #include "YCheckBox.h" #include "YSelectionBox.h" #include "YComboBox.h" +#include "YRadioButtonGroup.h" +#include "YRadioButton.h" #include "YCPItem.h" #include "YUISymbols.h" -void +bool YCPPropertyHandler::setComplexProperty( YWidget * widget, const string & propertyName, const YCPValue & val ) { // y2debug( "%s::%s", widget->widgetClass(), propertyName.c_str() ); - + if ( propertyName == YUIProperty_Value ) { - if ( trySetCheckBoxValue ( widget, val ) ) return; - if ( trySetSelectionBoxValue ( widget, val ) ) return; - if ( trySetComboBoxValue ( widget, val ) ) return; + if ( trySetCheckBoxValue ( widget, val ) ) return true; + if ( trySetSelectionBoxValue ( widget, val ) ) return true; + if ( trySetComboBoxValue ( widget, val ) ) return true; } - - if ( propertyName == YUIProperty_CurrentItem ) + else if ( propertyName == YUIProperty_CurrentItem ) { - if ( trySetSelectionBoxValue ( widget, val ) ) return; + if ( trySetSelectionBoxValue ( widget, val ) ) return true; } - - if ( propertyName == YUIProperty_Items ) + else if ( propertyName == YUIProperty_Items ) + { + if ( trySetSelectionWidgetItems( widget, val ) ) return true; + } + else if ( propertyName == YUIProperty_CurrentButton ) { - if ( trySetSelectionWidgetItems( widget, val ) ) return; + if ( trySetRadioButtonGroupCurrentButton( widget, val ) ) return true; } y2error( "Can't handle property %s::%s - not changing anything", widget->widgetClass(), propertyName.c_str() ); + + return false; } @@ -72,30 +80,32 @@ YCPPropertyHandler::getComplexProperty( YWidget * widget, const string & propertyName ) { YCPValue val = YCPNull(); - + if ( propertyName == YUIProperty_Value ) { val = tryGetCheckBoxValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetComboBoxValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetSelectionBoxValue ( widget ); if ( ! val.isNull() ) return val; } - - if ( propertyName == YUIProperty_CurrentItem ) + else if ( propertyName == YUIProperty_CurrentItem ) { val = tryGetSelectionBoxValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetComboBoxValue ( widget ); if ( ! val.isNull() ) return val; // tryGetMultiSelectionBoxCurrentItem } + else if ( propertyName == YUIProperty_CurrentButton ) + { + val = tryGetRadioButtonGroupCurrentButton( widget ); if ( ! val.isNull() ) return val; + } + - // FIXME: TO DO: // FIXME: TO DO: // FIXME: TO DO: - + // tryGetMultiSelectionBoxSelectedItems // tryGetSelectionWidgetItems - // tryGetRadioButtonGroupCurrentButton y2error( "Can't handle property %s::%s - returning 'nil'", widget->widgetClass(), propertyName.c_str() ); @@ -115,7 +125,7 @@ if ( ! checkBox ) return false; - + if ( val->isBoolean() ) { checkBox->setChecked( val->asBoolean()->value() ); @@ -155,7 +165,7 @@ widget->debugLabel().c_str(), val->toString().c_str() ); } - + return true; } @@ -190,7 +200,7 @@ widget->debugLabel().c_str(), val->toString().c_str() ); } - + return true; } @@ -240,6 +250,37 @@ } +bool +YCPPropertyHandler::trySetRadioButtonGroupCurrentButton( YWidget * widget, const YCPValue & val ) +{ + YRadioButtonGroup * radioButtonGroup = dynamic_cast<YRadioButtonGroup *> (widget); + + if ( ! radioButtonGroup ) + return false; + + YWidget * refWidget = YCPDialogParser::findWidgetWithId( radioButtonGroup, val ); + // This will throw an exception if no widget with that ID found + + YRadioButton * newCurrentButton = dynamic_cast<YRadioButton *> (refWidget); + + if ( newCurrentButton ) + { + y2debug( "Setting new current radio button: %s", newCurrentButton->debugLabel().c_str() ); + newCurrentButton->setValue( true ); + } + else + { + string msg = string( "Expected a YRadioButton, not a " ) + widget->widgetClass(); + YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_CurrentButton, + YOtherProperty ), + widget, msg ) ); + } + + return true; +} + + + @@ -253,7 +294,7 @@ if ( ! checkBox ) return YCPNull(); - + switch ( checkBox->value() ) { case YCheckBox_on: return YCPBoolean( true ); @@ -274,7 +315,7 @@ if ( ! comboBox ) return YCPNull(); - + YItem * selectedItem = comboBox->selectedItem(); if ( selectedItem ) @@ -296,7 +337,7 @@ if ( ! selBox ) return YCPNull(); - + YItem * selectedItem = selBox->selectedItem(); if ( selectedItem ) @@ -312,3 +353,33 @@ return YCPVoid(); } + +YCPValue +YCPPropertyHandler::tryGetRadioButtonGroupCurrentButton( YWidget * widget ) +{ + YRadioButtonGroup * radioButtonGroup = dynamic_cast<YRadioButtonGroup *> (widget); + + if ( ! radioButtonGroup ) + return YCPNull(); + + YRadioButton * currentButton = radioButtonGroup->currentButton(); + + if ( ! currentButton ) + return YCPVoid(); + + y2debug( "Current radio button: %s", currentButton->debugLabel().c_str() ); + + if ( currentButton->hasId() ) + { + YCPValueWidgetID * id = dynamic_cast<YCPValueWidgetID *> ( currentButton->id() ); + + if ( id ) + return id->value(); + } + + y2warning( "%s \"%s\" has no ID", + currentButton->widgetClass(), + currentButton->debugLabel().c_str() ); + + return YCPVoid(); +} Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h Mon Jul 2 18:02:01 2007 @@ -48,14 +48,18 @@ public: /** * Set a complex property. + * + * Return 'true' on success, 'false' on failure. **/ - static void setComplexProperty( YWidget * widget, + static bool setComplexProperty( YWidget * widget, const string & propertyName, const YCPValue & val ); /** * Get a complex property. + * + * Return YCPNull upon failure, a non-null YCPValue (the result) upon success. **/ static YCPValue getComplexProperty( YWidget * widget, const string & propertyName ); @@ -77,10 +81,11 @@ * * They all return 'true' upon success and 'false' upon failure. **/ - static bool trySetCheckBoxValue ( YWidget * widget, const YCPValue & val ); - static bool trySetSelectionBoxValue ( YWidget * widget, const YCPValue & val ); - static bool trySetComboBoxValue ( YWidget * widget, const YCPValue & val ); - static bool trySetSelectionWidgetItems ( YWidget * widget, const YCPValue & val ); + static bool trySetCheckBoxValue ( YWidget * widget, const YCPValue & val ); + static bool trySetSelectionBoxValue ( YWidget * widget, const YCPValue & val ); + static bool trySetComboBoxValue ( YWidget * widget, const YCPValue & val ); + static bool trySetSelectionWidgetItems ( YWidget * widget, const YCPValue & val ); + static bool trySetRadioButtonGroupCurrentButton ( YWidget * widget, const YCPValue & val ); /** * All trySet..() functions try to dynamic_cast 'widget' to the expected @@ -88,9 +93,10 @@ * * They all return YCPNull upon failure and a non-null YCPValue upon success. **/ - static YCPValue tryGetCheckBoxValue ( YWidget * widget ); - static YCPValue tryGetComboBoxValue ( YWidget * widget ); - static YCPValue tryGetSelectionBoxValue ( YWidget * widget ); + static YCPValue tryGetCheckBoxValue ( YWidget * widget ); + static YCPValue tryGetComboBoxValue ( YWidget * widget ); + static YCPValue tryGetSelectionBoxValue ( YWidget * widget ); + static YCPValue tryGetRadioButtonGroupCurrentButton ( YWidget * widget ); }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc Mon Jul 2 18:02:01 2007 @@ -33,7 +33,6 @@ case YStringProperty: return "String"; case YBoolProperty: return "Bool"; case YIntegerProperty: return "Integer"; - case YWidgetPtrProperty: return "YWidget *"; // Intentionally omitting default branch // so the compiler catches unhandled enum values @@ -105,18 +104,7 @@ it->type() == YOtherProperty ) // "Other" could be anything return true; - YUIPropertyTypeMismatchException exception( *it, type ); - - if ( it->type() == YWidgetPtrProperty ) - { - // Kludge for YWidget * properties: Those typically throw an - // exception (and the caller tries again with the correct - // type), so let's at least not appear it in the log file. - - throw exception; // silent throw (doesn't appear in log file) - } - else - YUI_THROW( exception ); // verbose throw (appears in log file) + YUI_THROW( YUIPropertyTypeMismatchException( *it, type ) ); } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h Mon Jul 2 18:02:01 2007 @@ -32,8 +32,7 @@ YOtherProperty, // requires futher checking YStringProperty, // const string & YBoolProperty, // bool - YIntegerProperty, // YCP Integer == C++ long long - YWidgetPtrProperty // YWidget * + YIntegerProperty // YCP Integer == C++ long long }; class YWidget; @@ -126,12 +125,6 @@ explicit YPropertyValue( int num ): _type( YIntegerProperty ), _integerVal( num ) {} - /** - * Constructor for YWidget * properties. - **/ - YPropertyValue( YWidget * widget ): - _type( YWidgetPtrProperty ), _widgetPtrVal( widget ) {} - explicit YPropertyValue( YPropertyType type ) : _type( type ) {} Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc Mon Jul 2 18:02:01 2007 @@ -131,8 +131,8 @@ * @property any CurrentButton widget ID of the currently selected RadioButton of this group * @property any Value Alias for CurrentButton */ - propSet.add( YProperty( YUIProperty_Value, YWidgetPtrProperty ) ); - propSet.add( YProperty( YUIProperty_CurrentButton, YWidgetPtrProperty ) ); + propSet.add( YProperty( YUIProperty_Value, YOtherProperty ) ); + propSet.add( YProperty( YUIProperty_CurrentButton, YOtherProperty ) ); propSet.add( YWidget::propertySet() ); } @@ -146,33 +146,7 @@ propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch if ( propertyName == YUIProperty_CurrentButton || - propertyName == YUIProperty_Value ) - { - YWidget * widget = val.widgetPtrVal(); - - if ( widget ) - { - YRadioButton * newCurrentButton = dynamic_cast<YRadioButton *> (widget); - - if ( newCurrentButton ) - { - newCurrentButton->setValue( true ); - return true; // success -- no special processing necessary - } - } - - // widget == 0 or not a YRadioButton - throw exception - - string msg; - - if ( widget ) - msg = string( "Expected a YRadioButton, not a " ) + widget->widgetClass(); - else - msg = "Null widget"; - - YUI_THROW( YUIBadPropertyArgException( YProperty( propertyName, YWidgetPtrProperty ), - this, msg ) ); - } + propertyName == YUIProperty_Value ) return false; // Needs special handling else { YWidget::setProperty( propertyName, val ); @@ -188,7 +162,7 @@ propertySet().check( propertyName ); // throws exceptions if not found if ( propertyName == YUIProperty_CurrentButton || - propertyName == YUIProperty_Value ) return YPropertyValue( currentButton() ); + propertyName == YUIProperty_Value ) return YPropertyValue( YOtherProperty ); else { return YWidget::getProperty( propertyName ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Mon Jul 2 18:02:01 2007 @@ -894,46 +894,20 @@ if ( newValue->isString() ) val = YPropertyValue( newValue->asString()->value() ); else if ( newValue->isInteger() ) val = YPropertyValue( newValue->asInteger()->value() ); else if ( newValue->isBoolean() ) val = YPropertyValue( newValue->asBoolean()->value() ); - else if ( newValue->isVoid() || - newValue->isSymbol() ) YCPPropertyHandler::setComplexProperty( widget, propertyName, newValue ); else - { - y2error( "Unknown type for property %s::%s: %s", - widget->widgetClass(), sym->symbol().c_str(), newValue->toString().c_str() ); - - unblockEvents(); - return YCPBoolean( false ); - } + val = YPropertyValue( false ); // Dummy value, will be rejected anyway try { bool success = widget->setProperty( propertyName, val ); if ( ! success ) - YCPPropertyHandler::setComplexProperty( widget, propertyName, newValue ); - - ret = YCPBoolean( true ); - } - catch ( YUIPropertyTypeMismatchException & typeMismatchException ) - { - if ( typeMismatchException.property().type() == YWidgetPtrProperty ) { - try - { - // This is not particularly elegant, but it's the only way with widget IDs that are - // YCPStrings or YCPIntegers (which is legal): It's not at all clear if that kind of - // YCPValue should be passed as a YCPString or as a widget ID. So now that YCPString - // failed, let's try again with a widget. - - YWidget * refWidget = YCPDialogParser::findWidgetWithId( newValue ); - widget->setProperty( sym->symbol(), YPropertyValue( refWidget ) ); - ret = YCPBoolean( true ); - } - catch( YUIPropertyException & exception ) - { - y2error( "Caught property exception" ); - } + // Try again with the known special cases + success = YCPPropertyHandler::setComplexProperty( widget, propertyName, newValue ); } + + ret = YCPBoolean( success ); } catch( YUIPropertyException & exception ) { @@ -1022,24 +996,6 @@ case YBoolProperty: return YCPBoolean( val.boolVal() ); case YIntegerProperty: return YCPInteger( val.integerVal() ); case YOtherProperty: return YCPPropertyHandler::getComplexProperty( widget, propertyName ); - case YWidgetPtrProperty: - { - YWidget * widget = val.widgetPtrVal(); - - if ( widget->hasId() ) - { - YCPValueWidgetID * id = dynamic_cast<YCPValueWidgetID *> ( widget->id() ); - - if ( id ) - return id->value(); - } - - y2warning( "%s \"%s\" has no ID", - widget->widgetClass(), - widget->debugLabel().c_str() ); - - return YCPVoid(); - } default: y2error( "Unknown result for setProperty( %s )", sym->symbol().c_str() ); -- 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] r39122 - in /trunk/storage: VERSION package/yast2-storage.changes
by aschnell＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: aschnell Date: Mon Jul 2 18:01:20 2007 New Revision: 39122 URL: http://svn.opensuse.org/viewcvs/yast?rev=39122&view=rev Log: - handle old encryption types with cryptsetup (bug #258222) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=39122&r1=391… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Jul 2 18:01:20 2007 @@ -1 +1 @@ -2.15.17 +2.15.18 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 Mon Jul 2 18:01:20 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 02 18:09:18 CEST 2007 - aschnell(a)suse.de + +- handle old encryption types with cryptsetup (bug #258222) + +------------------------------------------------------------------- Tue Jun 26 10:57:56 CEST 2007 - fehr(a)suse.de - add windows default mount points also in VM proposal (#262417) @@ -24,7 +29,7 @@ - use provided fstab options when mounting filesystems - implement support for user quota (fate#120106) - disable noauto option for crypted volumes (see fate #302001) -- fix fs type detection for luks encrypted volumes +- fix fs type detection for luks encrypted volumes ------------------------------------------------------------------- Wed Jun 6 13:56:50 CEST 2007 - fehr(a)suse.de @@ -35,7 +40,7 @@ ------------------------------------------------------------------- Mon Jun 4 13:06:28 CEST 2007 - fehr(a)suse.de -- fix missing ldconfig call detect by RPMLINT +- fix missing ldconfig call detect by RPMLINT - removed obsolete script create_udev_cdrom_rules ------------------------------------------------------------------- -- 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] r39121 - in /trunk/storage: libstorage/src/ storage/src/include/
by aschnell＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: aschnell Date: Mon Jul 2 17:59:53 2007 New Revision: 39121 URL: http://svn.opensuse.org/viewcvs/yast?rev=39121&view=rev Log: - handle old encryption types with cryptsetup (bug #258222) Modified: trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmCo.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Mon Jul 2 17:59:53 2007 @@ -67,6 +67,44 @@ dev = "/dev/mapper"; } + +// dev should be something like /dev/mapper/cr_test +storage::EncryptType +DmCo::detectEncryption( const string& dev ) const +{ + storage::EncryptType ret = ENC_UNKNOWN; + + if( dev.substr( 0, 12 ) == "/dev/mapper/") + { + string tdev = dev.substr (12); + SystemCmd c( "cryptsetup status \"" + tdev + "\"" ); + + string cipher, keysize; + for( unsigned int i = 0; i < c.numLines(); i++) + { + string line = *c.getLine(i); + string key = extractNthWord( 0, line ); + if( key == "cipher:" ) + cipher = extractNthWord( 1, line ); + if( key == "keysize:" ) + keysize = extractNthWord( 1, line ); + } + + if( cipher == "aes-cbc-essiv:sha256" ) + ret = ENC_LUKS; + else if( cipher == "twofish-cbc-plain" ) + ret = ENC_TWOFISH; + else if( cipher == "twofish-cbc-null" && keysize == "192" ) + ret = ENC_TWOFISH_OLD; + else if( cipher == "twofish-cbc-null" && keysize == "256" ) + ret = ENC_TWOFISH256_OLD; + } + + y2milestone( "ret:%d", ret ); + return ret; +} + + void DmCo::getDmData( ProcPart& ppart ) { @@ -155,7 +193,7 @@ { skip = true; getStorage()->setDmcryptData( it->first, m->device(), min_num, - m->sizeK() ); + m->sizeK(), detectEncryption (m->device()) ); getStorage()->setUsedBy( it->first, UB_NONE, "" ); } if( !skip && m->sizeK()>0 ) @@ -173,7 +211,7 @@ addToList( m ); else { - y2warning( "addDm alread exists %u", m->nr() ); + y2warning( "addDm already exists %u", m->nr() ); delete m; } } Modified: trunk/storage/libstorage/src/DmCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.h?re… ============================================================================== --- trunk/storage/libstorage/src/DmCo.h (original) +++ trunk/storage/libstorage/src/DmCo.h Mon Jul 2 17:59:53 2007 @@ -29,7 +29,6 @@ DmCo( Storage * const s, const string& File ); void getDmData( ProcPart& ppart ); - void getDmData( unsigned num ); bool findDm( unsigned num, DmIter& i ); bool findDm( unsigned num ); bool findDm( const string& dev, DmIter& i ); @@ -41,6 +40,8 @@ void init(); + storage::EncryptType detectEncryption( const string& device ) const; + virtual void print( std::ostream& s ) const { s << *this; } int doRemove( Volume* v ); Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Jul 2 17:59:53 2007 @@ -5337,7 +5337,8 @@ } bool Storage::setDmcryptData( const string& dev, const string& dm, - unsigned dmnum, unsigned long long siz ) + unsigned dmnum, unsigned long long siz, + storage::EncryptType typ ) { y2milestone( "dev:%s dm:%s dmn:%u sizeK:%llu", dev.c_str(), dm.c_str(), dmnum, siz ); @@ -5346,7 +5347,7 @@ if( dm.find("/temporary-cryptsetup-")==string::npos && findVolume( dev, v ) ) { - v->setDmcryptDev( dm, siz!=0 ); + v->setDmcryptDevEnc( dm, typ, siz!=0 ); v->replaceAltName( "/dev/dm-", Dm::dmDeviceName(dmnum) ); v->setSize( siz ); ret = true; Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Mon Jul 2 17:59:53 2007 @@ -232,7 +232,8 @@ bool canUseDevice( const string& dev, bool disks_allowed=false ); bool knownDevice( const string& dev, bool disks_allowed=false ); bool setDmcryptData( const string& dev, const string& dm, - unsigned dmnum, unsigned long long siz ); + unsigned dmnum, unsigned long long siz, + storage::EncryptType typ ); bool deletedDevice( const string& dev ); bool isDisk( const string& dev ); const Volume* getVolume( const string& dev ); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon Jul 2 17:59:53 2007 @@ -69,11 +69,20 @@ nm = dev.substr( 5 ); } +// TODO: maybe obsoleted by function setDmcryptDevEnc void Volume::setDmcryptDev( const string& dm, bool active ) { y2mil( "dev:" << dev << " dm:" << dm << " active:" << active ); dmcrypt_dev = dm; - encryption = orig_encryption = ENC_LUKS; + dmcrypt_active = active; + y2mil( "this:" << *this ); + } + +void Volume::setDmcryptDevEnc( const string& dm, storage::EncryptType typ, bool active ) + { + y2mil( "dev:" << dev << " dm:" << dm << " type:" << typ << " active:" << active ); + dmcrypt_dev = dm; + encryption = orig_encryption = typ; dmcrypt_active = active; y2mil( "this:" << *this ); } @@ -81,7 +90,7 @@ bool Volume::sameDevice( const string& device ) const { string d = normalizeDevice(device); - return( d==dev || + return( d==dev || find( alt_names.begin(), alt_names.end(), d )!=alt_names.end() ); } @@ -102,7 +111,7 @@ if( mp=="swap" && mb==MOUNTBY_UUID ) mb = MOUNTBY_DEVICE; y2mil( "path:" << udevPath() << " id:" << udevId() ); - if( (mb==MOUNTBY_PATH && udevPath().empty()) || + if( (mb==MOUNTBY_PATH && udevPath().empty()) || (mb==MOUNTBY_ID && udevId().empty()) ) mb = MOUNTBY_DEVICE; if( encryption != ENC_NONE && @@ -121,7 +130,7 @@ if( (mby==MOUNTBY_PATH && udevPath().empty()) || (mby==MOUNTBY_ID && udevId().empty()) ) ret = false; - if( ret && encryption != ENC_NONE && + if( ret && encryption != ENC_NONE && (mby==MOUNTBY_UUID || mby==MOUNTBY_LABEL) ) ret = false; y2mil( "mby:" << mb_names[mby] << " mp:" << mp << " ret:" << ret ) @@ -434,8 +443,8 @@ { uuid = i->second; b << " uuid:" << uuid; - list<string>::iterator i = find_if( alt_names.begin(), - alt_names.end(), + list<string>::iterator i = find_if( alt_names.begin(), + alt_names.end(), find_any( "/by-uuid/" ) ); if( i!=alt_names.end() ) { @@ -448,8 +457,8 @@ { label = orig_label = i->second; b << " label:\"" << label << "\""; - list<string>::iterator i = find_if( alt_names.begin(), - alt_names.end(), + list<string>::iterator i = find_if( alt_names.begin(), + alt_names.end(), find_any( "/by-label/" ) ); if( i!=alt_names.end() ) { @@ -697,7 +706,6 @@ for( unsigned i=0; i<count; ++i ) s.write( buf, bufsize ); } - } if( ret==0 && mountDevice()!=dev && !cont->getStorage()->test() ) { @@ -791,7 +799,7 @@ SystemCmd c( cmd ); if( c.retcode()!=0 ) ret = VOLUME_TUNE2FS_FAILED; - if( ret==0 && mp=="/" && + if( ret==0 && mp=="/" && (fstab_opt.find( "data=writeback" )!=string::npos || fstab_opt.find( "data=journal" )!=string::npos) ) { @@ -836,7 +844,8 @@ } if( needMount ) { - int r = mount( (ret==0)?mp:orig_mp ); + // possible change of mp is handled later in doMount + int r = mount( orig_mp ); ret = (ret==0)?r:ret; } y2milestone( "ret:%d", ret ); @@ -1029,7 +1038,9 @@ else if( !orig_mp.empty() ) { string fn = "/etc/fstab"; - if( encryption!=ENC_NONE && !optNoauto() ) + if( inCrypttab() ) + fn = "/etc/crypttab"; + if( inCryptotab() ) fn = "/etc/cryptotab"; // displayed text before action, %1$s is replaced by device name e.g. /dev/hda1 // %2$s is replaced by pathname e.g. /etc/fstab @@ -1275,7 +1286,7 @@ if( ret==0 && format ) { encryption = typ; - is_loop = encryption!=ENC_LUKS || cont->type()==LOOP; + is_loop = cont->type()==LOOP; } if( ret==0 && !format && !loop_active ) { @@ -1422,80 +1433,110 @@ return( ret ); } -string Volume::getLosetupCmd( storage::EncryptType e, const string& pwdfile ) const +string Volume::getLosetupCmd( storage::EncryptType, const string& pwdfile ) const { string cmd = "/sbin/losetup"; - if( e!=ENC_NONE && e!=ENC_LUKS ) - cmd += " -e " + encTypeString(e); - switch( e ) - { - case ENC_TWOFISH: - cmd = "rmmod loop_fish2; modprobe twofish; modprobe cryptoloop; " + - cmd; - break; - case ENC_TWOFISH_OLD: - case ENC_TWOFISH256_OLD: - cmd = "rmmod twofish cryptoloop; modprobe loop_fish2; " + cmd; - break; - default: - break; - } cmd += " "; cmd += loop_dev; cmd += " "; - if( cont->type()!=LOOP ) - cmd += dev; - else - { - const Loop* l = static_cast<const Loop*>(this); - cmd += l->lfileRealPath(); - } - if( e!=ENC_LUKS ) - { - cmd += " -p0 < "; - cmd += pwdfile; - } + const Loop* l = static_cast<const Loop*>(this); + cmd += l->lfileRealPath(); y2milestone( "cmd:%s", cmd.c_str() ); return( cmd ); } -string Volume::getCryptsetupCmd( const string& dmdev, const string& mount, - const string& pwdf, bool format, - bool empty_pwd ) const +string Volume::getCryptsetupCmd( storage::EncryptType e, const string& dmdev, + const string& mount, const string& pwdf, + bool format, bool empty_pwd ) const { string table = dmdev; - y2mil( "dmdev:" << dmdev << " mount:" << mount << " format:" << format << - " pwempty:" << empty_pwd ); + y2mil( "enctype:" << e << " dmdev:" << dmdev << " mount:" << mount << + " format:" << format << " pwempty:" << empty_pwd ); if( table.find( '/' )!=string::npos ) table.erase( 0, table.find_last_of( '/' )+1 ); string cmd = "/sbin/cryptsetup -q"; + if( format ) + { + switch( e ) { - if( isTmpCryptMp(mount) && empty_pwd ) - { - cmd += " --key-file /dev/urandom create"; - cmd += ' '; - cmd += table; - cmd += ' '; - cmd += is_loop?loop_dev:dev; - } - else - { - cmd += " luksFormat"; - cmd += ' '; - cmd += is_loop?loop_dev:dev; - cmd += ' '; - cmd += pwdf; - } + case ENC_LUKS: + if( isTmpCryptMp(mount) && empty_pwd ) + { + cmd += " --key-file /dev/urandom create"; + cmd += ' '; + cmd += table; + cmd += ' '; + cmd += is_loop?loop_dev:dev; + } + else + { + cmd += " luksFormat"; + cmd += ' '; + cmd += is_loop?loop_dev:dev; + cmd += ' '; + cmd += pwdf; + } + break; + + case ENC_TWOFISH: + case ENC_TWOFISH_OLD: + case ENC_TWOFISH256_OLD: + cmd = ""; + break; + + case ENC_NONE: + case ENC_UNKNOWN: + cmd = ""; + break; } + } else + { + switch( e ) { - cmd += " --key-file " + pwdf; - cmd += " luksOpen "; - cmd += is_loop?loop_dev:dev; - cmd += ' '; - cmd += table; + case ENC_LUKS: + cmd += " --key-file " + pwdf; + cmd += " luksOpen "; + cmd += is_loop?loop_dev:dev; + cmd += ' '; + cmd += table; + break; + + case ENC_TWOFISH: + cmd += " --hash sha512 --cipher twofish"; + cmd += " create "; + cmd += table; + cmd += ' '; + cmd += is_loop?loop_dev:dev; + cmd += " < " + pwdf; + break; + + case ENC_TWOFISH_OLD: + cmd += " --hash ripemd160:20 --cipher twofish-cbc-null --key-size 192"; + cmd += " create "; + cmd += table; + cmd += ' '; + cmd += is_loop?loop_dev:dev; + cmd += " < " + pwdf; + break; + + case ENC_TWOFISH256_OLD: + cmd += " --hash sha512 --cipher twofish-cbc-null --key-size 256"; + cmd += " create "; + cmd += table; + cmd += ' '; + cmd += is_loop?loop_dev:dev; + cmd += " < " + pwdf; + break; + + case ENC_NONE: + case ENC_UNKNOWN: + cmd = ""; + break; } + } + y2milestone( "cmd:%s", cmd.c_str() ); return( cmd ); } @@ -1529,14 +1570,17 @@ bool Volume::needLosetup() const { - return( (is_loop!=loop_active) && + return( (is_loop!=loop_active) && (encryption==ENC_NONE || !crypt_pwd.empty() || (dmcrypt()&&cont->type()==LOOP)) ); } bool Volume::needCryptsetup() const { - return( dmcrypt()!=dmcrypt_active && + if (dmcrypt() && encryption != orig_encryption) + return true; + + return( dmcrypt()!=dmcrypt_active && (encryption==ENC_NONE || !crypt_pwd.empty() || isTmpCryptMp(mp))); } @@ -1546,10 +1590,10 @@ } bool Volume::needFstabUpdate() const - { + { bool ret = !ignore_fstab && !(mp.empty() && orig_mp.empty()) && (fstab_opt!=orig_fstab_opt || mount_by!=orig_mount_by || - encryption!=orig_encryption); + encryption!=orig_encryption); return( ret ); } @@ -1565,7 +1609,7 @@ } unsigned pos=0; - static EncryptType try_order[] = { ENC_LUKS, ENC_TWOFISH_OLD, + static EncryptType try_order[] = { ENC_LUKS, ENC_TWOFISH_OLD, ENC_TWOFISH256_OLD, ENC_TWOFISH }; string fname = cont->getStorage()->tmpDir()+"/pwdf"; string mpname = cont->getStorage()->tmpDir()+"/mp"; @@ -1577,32 +1621,24 @@ detected_fs = fs = FSUNKNOWN; do { - bool losetup = try_order[pos]!=ENC_LUKS; ofstream pwdfile( fname.c_str() ); pwdfile << crypt_pwd; - if( losetup ) - pwdfile << endl; pwdfile.close(); encryption = orig_encryption = try_order[pos]; - is_loop = losetup || cont->type()==LOOP; - dmcrypt_dev = losetup ? "" : getDmcryptName(); + is_loop = cont->type()==LOOP; + dmcrypt_dev = getDmcryptName(); crUnsetup( true ); - if( is_loop && !losetup ) + if( is_loop ) { string lfile; if( getLoopFile( lfile )) - c.execute( "losetup " + loop_dev + " " + + c.execute( "losetup " + loop_dev + " " + cont->getStorage()->root() + lfile ); } - string cmd = losetup ? getLosetupCmd( try_order[pos], fname ) - : getCryptsetupCmd( dmcrypt_dev, "", fname, - false ); - if( !losetup ) - { - c.execute( "modprobe dm-crypt; modprobe aes" ); - } + string cmd = getCryptsetupCmd( try_order[pos], dmcrypt_dev, "", fname, false ); + c.execute( "modprobe dm-crypt" ); c.execute( cmd ); - string use_dev = losetup?loop_dev:dmcrypt_dev; + string use_dev = dmcrypt_dev; if( c.retcode()==0 ) { cont->getStorage()->waitForDevice( use_dev ); @@ -1652,7 +1688,7 @@ crUnsetup( true ); if( detected_fs!=FSUNKNOWN ) { - is_loop = try_order[pos]!=ENC_LUKS || cont->type()==LOOP; + is_loop = cont->type()==LOOP; ret = encryption = orig_encryption = try_order[pos]; } else @@ -1795,26 +1831,38 @@ } if( ret==0 ) { + ret = cryptUnsetup(); + } + if( ret==0 ) + { string fname = cont->getStorage()->tmpDir()+"/pwdf"; ofstream pwdfile( fname.c_str() ); pwdfile << crypt_pwd; pwdfile.close(); - SystemCmd c; - if( format || isTmpCryptMp(mp) ) + SystemCmd cmd; + if( format || (isTmpCryptMp(mp)&&crypt_pwd.empty()) ) { - c.execute( getCryptsetupCmd( dmcrypt_dev, mp, fname, true, - crypt_pwd.empty() )); - if( c.retcode()!=0 ) + string cmdline = getCryptsetupCmd( encryption, dmcrypt_dev, mp, fname, true, + crypt_pwd.empty() ); + if( !cmdline.empty() ) + { + cmd.execute( cmdline ); + if( cmd.retcode()!=0 ) ret = VOLUME_CRYPTFORMAT_FAILED; if( ret==0 && mp=="swap" ) - c.execute( "mkswap " + dmcrypt_dev ); + cmd.execute( "mkswap " + dmcrypt_dev ); + } } if( ret==0 && (!isTmpCryptMp(mp)||!crypt_pwd.empty()) ) { - c.execute( getCryptsetupCmd( dmcrypt_dev, mp, fname, false )); - if( c.retcode()!=0 ) + string cmdline = getCryptsetupCmd( encryption, dmcrypt_dev, mp, fname, false ); + if( !cmdline.empty() ) + { + cmd.execute( cmdline ); + if( cmd.retcode()!=0 ) ret = VOLUME_CRYPTSETUP_FAILED; } + } unlink( fname.c_str() ); rmdir( cont->getStorage()->tmpDir().c_str() ); cont->getStorage()->waitForDevice( dmcrypt_dev ); @@ -2018,7 +2066,7 @@ else if( fs == FSUNKNOWN ) fsn = "auto"; const char * ign_opt[] = { "defaults", "" }; - const char * ign_beg[] = { "loop", "encryption=", "phash=", + const char * ign_beg[] = { "loop", "encryption=", "phash=", "itercountk=" }; if( cont->getStorage()->instsys() ) ign_opt[1] = "ro"; @@ -2027,7 +2075,7 @@ for( unsigned i=0; i<lengthof(ign_opt); i++ ) l.erase( remove(l.begin(), l.end(), ign_opt[i]), l.end() ); for( unsigned i=0; i<lengthof(ign_beg); i++ ) - l.erase( remove_if(l.begin(), l.end(), find_begin(ign_beg[i])), + l.erase( remove_if(l.begin(), l.end(), find_begin(ign_beg[i])), l.end() ); y2mil( "l after:" << l ); string opts = " "; @@ -2217,10 +2265,10 @@ list<string>::iterator loop = find( l.begin(), l.end(), "loop" ); if( loop == l.end() ) loop = find_if( l.begin(), l.end(), find_begin( "loop=" ) ); - list<string>::iterator enc = + list<string>::iterator enc = find_if( l.begin(), l.end(), find_begin( "encryption=" ) ); string lstr; - if( optNoauto() && + if( optNoauto() && ((encryption!=ENC_NONE && !dmcrypt()) || cont->type()==LOOP )) { lstr = "loop"; @@ -2280,8 +2328,8 @@ { string fname; if( fstab->findDevice( dev, entry ) || - fstab->findDevice( alt_names, entry ) || - (cont->type()==LOOP && getLoopFile(fname) && + fstab->findDevice( alt_names, entry ) || + (cont->type()==LOOP && getLoopFile(fname) && fstab->findDevice( fname, entry ))) { y2mil( "changed:" << entry ) @@ -2331,7 +2379,7 @@ if( !silent() && !fstab_added ) { cont->getStorage()->showInfoCb( - fstab->updateText( true, inCryptotab(), + fstab->updateText( true, inCryptotab(), che.mount )); } y2mil( "update fstab: " << che ); @@ -2362,7 +2410,7 @@ } if( !silent() ) { - cont->getStorage()->showInfoCb( + cont->getStorage()->showInfoCb( fstab->addText( true, inCryptotab(), che.mount )); } ret = fstab->addEntry( che ); @@ -2375,7 +2423,7 @@ } } if( ret==0 && !format && !cont->getStorage()->instsys() && - fstab_opt!=orig_fstab_opt && !orig_fstab_opt.empty() && + fstab_opt!=orig_fstab_opt && !orig_fstab_opt.empty() && mp==orig_mp && mp!="swap" ) { y2mil( "fstab_opt:" << fstab_opt << " fstab_opt_orig:" << orig_fstab_opt ); @@ -2457,7 +2505,7 @@ { bool need = false; need = mp!=orig_mp; - if( !need && !mp.empty() && !isMounted() && !optNoauto() && + if( !need && !mp.empty() && !isMounted() && !optNoauto() && is_loop==loop_active ) need = true; return( need ); @@ -2718,11 +2766,11 @@ { s << " alt_names:" << v.alt_names; } - if( v.encryption != storage::ENC_NONE || + if( v.encryption != storage::ENC_NONE || v.orig_encryption != storage::ENC_NONE ) { s << " encr:" << v.enc_names[v.encryption]; - if( v.encryption != v.orig_encryption && + if( v.encryption != v.orig_encryption && v.orig_encryption!=storage::ENC_NONE ) s << " orig_encr:" << v.enc_names[v.orig_encryption]; #ifdef DEBUG_LOOP_CRYPT_PASSWORD @@ -2879,7 +2927,7 @@ fs==rhs.fs && mount_by==rhs.mount_by && uuid==rhs.uuid && label==rhs.label && mp==rhs.mp && fstab_opt==rhs.fstab_opt && mkfs_opt==rhs.mkfs_opt && - dtxt==rhs.dtxt && + dtxt==rhs.dtxt && is_loop==rhs.is_loop && loop_active==rhs.loop_active && is_mounted==rhs.is_mounted && encryption==rhs.encryption && loop_dev==rhs.loop_dev && fstab_loop_dev==rhs.fstab_loop_dev && Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?… ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Mon Jul 2 17:59:53 2007 @@ -65,7 +65,7 @@ int changeMountBy( storage::MountByType mby ); virtual int changeMount( const string& m ); bool loop() const { return is_loop; } - bool dmcrypt() const { return( encryption==ENC_LUKS ); } + bool dmcrypt() const { return encryption != ENC_NONE && encryption != ENC_UNKNOWN; } bool loopActive() const { return( is_loop&&loop_active ); } bool dmcryptActive() const { return( dmcrypt()&&dmcrypt_active ); } bool needCrsetup() const; @@ -112,6 +112,7 @@ void setSize( unsigned long long SizeK ) { size_k=orig_size_k=SizeK; } virtual void setResizedSize( unsigned long long SizeK ) { size_k=SizeK; } void setDmcryptDev( const string& dm, bool active ); + void setDmcryptDevEnc( const string& dm, storage::EncryptType typ, bool active ); virtual void forgetResize() { size_k=orig_size_k; } virtual bool canUseDevice() const; @@ -155,8 +156,8 @@ string sizeString() const; string bootMount() const; bool optNoauto() const; - bool inCryptotab() const { return( !dmcrypt() && is_loop && !optNoauto() ); } - bool inCrypttab() const { return( dmcrypt() && !optNoauto() ); } + bool inCryptotab() const { return( encryption!=ENC_LUKS && is_loop && !optNoauto() ); } + bool inCrypttab() const { return( encryption==ENC_LUKS && !optNoauto() ); } virtual void print( std::ostream& s ) const { s << *this; } int getFreeLoop(); int getFreeLoop( SystemCmd& loopData ); @@ -221,9 +222,9 @@ int cryptUnsetup( bool force=false ); std::ostream& logVolume( std::ostream& file ) const; - string getLosetupCmd( storage::EncryptType e, const string& pwdfile ) const; - string getCryptsetupCmd( const string& dmdev, const string& mp, - const string& pwdfile, bool format, + string getLosetupCmd( storage::EncryptType, const string& pwdfile ) const; + string getCryptsetupCmd( storage::EncryptType e, const string& dmdev, + const string& mp, const string& pwdfile, bool format, bool empty_pwd=false ) const; storage::EncryptType detectEncryption(); string getFilesysSysfsPath() const; Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Mon Jul 2 17:59:53 2007 @@ -458,7 +458,7 @@ ret["field"] = `mount_point; } } - if( !new["format"]:false && + if( !new["format"]:false && !crypt_fs && contains( [`unknown, `none], new["detected_fs"]:`unknown )) { // error popup text -- 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] r39120 - /tags/stable-2_15_47/network/
by mzugec＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: mzugec Date: Mon Jul 2 17:48:34 2007 New Revision: 39120 URL: http://svn.opensuse.org/viewcvs/yast?rev=39120&view=rev Log: Created tag stable-2_15_47 for network Added: tags/stable-2_15_47/network/ - copied from r39119, 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] r39119 - /tags/stable-2_15_47/
by mzugec＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: mzugec Date: Mon Jul 2 17:48:29 2007 New Revision: 39119 URL: http://svn.opensuse.org/viewcvs/yast?rev=39119&view=rev Log: Created tag stable-2_15_47 Added: tags/stable-2_15_47/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0