March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56508 - in /trunk/ruby-bindings: CMakeLists.txt yast2-ruby-bindings.spec.in
by kkaempf＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: kkaempf Date: Tue Mar 31 16:22:42 2009 New Revision: 56508 URL: http://svn.opensuse.org/viewcvs/yast?rev=56508&view=rev Log: improve build requires and cmake checks Modified: trunk/ruby-bindings/CMakeLists.txt trunk/ruby-bindings/yast2-ruby-bindings.spec.in Modified: trunk/ruby-bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/CMakeLists.txt?rev… ============================================================================== --- trunk/ruby-bindings/CMakeLists.txt (original) +++ trunk/ruby-bindings/CMakeLists.txt Tue Mar 31 16:22:42 2009 @@ -1,30 +1,69 @@ +# +# CMakeLists.txt for yast2/ruby-bindings +# + +cmake_minimum_required(VERSION 2.4) +if(COMMAND cmake_policy) + # escape preprocessor, see -DVERSION below + cmake_policy(SET CMP0005 OLD) +endif(COMMAND cmake_policy) + + PROJECT(yast2-ruby-bindings) SET(PACKAGE "yast2-ruby-bindings") SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual" ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) +# +# Where is SWIG ? +# + +FIND_PACKAGE(SWIG) +IF ( NOT SWIG_FOUND ) + FIND_PROGRAM(SWIG_EXECUTABLE NAMES swig-1.3 swig PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin ) +ENDIF ( NOT SWIG_FOUND ) IF ( NOT SWIG_EXECUTABLE ) - MESSAGE( FATAL "SWIG not found." ) + MESSAGE( FATAL_ERROR "SWIG not found." ) ELSE ( NOT SWIG_EXECUTABLE ) MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" ) ENDIF ( NOT SWIG_EXECUTABLE ) -FIND_PACKAGE(Yast REQUIRED) -INCLUDE(YastCommon) +# +# Where is YaST ? +# +FIND_PACKAGE(Yast REQUIRED) +IF ( NOT YAST_LIBRARY ) + MESSAGE( FATAL_ERROR "Please install yast2-core-devel." ) +ENDIF ( NOT YAST_LIBRARY ) + +IF ( NOT YAST_PLUGIN_UI_LIBRARY ) + MESSAGE( FATAL_ERROR "YAST_PLUGIN_UI_LIBRARY not set, please install yast2-ycp-ui-bindings-devel." ) +ENDIF ( NOT YAST_PLUGIN_UI_LIBRARY ) + +# +# Where is Ruby ? +# FIND_PACKAGE(Ruby REQUIRED) - -#RUBY_RUBY_LIB_PATH -MESSAGE( STATUS "Ruby vendor arch dir: ${RUBY_VENDORARCH_DIR}" ) +IF ( NOT RUBY_EXECUTABLE ) + MESSAGE( FATAL_ERROR "Ruby not found." ) +ENDIF ( NOT RUBY_EXECUTABLE ) + +# +# -> src/ +# ADD_SUBDIRECTORY(src) +# +# packaging +# SET( RPMNAME "yast2-ruby-bindings" ) GENERATE_PACKAGING(${RPMNAME} ${VERSION}) Modified: trunk/ruby-bindings/yast2-ruby-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/yast2-ruby-binding… ============================================================================== --- trunk/ruby-bindings/yast2-ruby-bindings.spec.in (original) +++ trunk/ruby-bindings/yast2-ruby-bindings.spec.in Tue Mar 31 16:22:42 2009 @@ -19,8 +19,9 @@ # libzypp-devel is missing .la requires BuildRequires: ruby-devel Requires: yast2-core >= 2.16.37 -BuildRequires: yast2-ycp-ui-bindings-devel >= 2.16.37 +BuildRequires: yast2-core-devel >= 2.16.37 Requires: yast2-ycp-ui-bindings >= 2.16.37 +BuildRequires: yast2-ycp-ui-bindings-devel >= 2.16.37 Requires: ruby Summary: Ruby bindings for the YaST platform. -- 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] r56507 - in /trunk/storage/libstorage/src: Storage.cc StorageTmpl.h
by aschnell＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: aschnell Date: Tue Mar 31 16:16:46 2009 New Revision: 56507 URL: http://svn.opensuse.org/viewcvs/yast?rev=56507&view=rev Log: - use templated binary function Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageTmpl.h 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 Tue Mar 31 16:16:46 2009 @@ -3532,7 +3532,7 @@ i->getCommitActions( l ); ac.splice( ac.end(), l ); } - ac.sort( cont_less<commitAction>() ); + ac.sort(deref_less<commitAction>()); for( list<commitAction*>::const_iterator i=ac.begin(); i!=ac.end(); ++i ) { CommitInfo info; @@ -3656,7 +3656,7 @@ b << "> "; y2mil(b.str()); b.str(""); - todo.sort( cont_less<commitAction>() ); + todo.sort(deref_less<commitAction>()); y2mil("stage:" << stage); b << "sorted co <"; for( list<const Container*>::const_iterator i=co.begin(); i!=co.end(); ++i ) @@ -5595,13 +5595,6 @@ return ret; } -struct equal_co - { - equal_co( const Container* const co ) : c(co) {}; - bool operator()(const Container* co) { return( *co==*c ); } - const Container* const c; - }; - bool Storage::equalBackupStates(const string& lhs, const string& rhs, @@ -5634,7 +5627,7 @@ CCIter j; while( (ret||verbose_log) && i!=l->end() ) { - j = find_if( r->begin(), r->end(), equal_co( *i ) ); + j = find_if(r->begin(), r->end(), bind2nd(deref_equal_to<Container>(), *i)); if( j!=r->end() ) ret = (*i)->compareContainer( *j, verbose_log ) && ret; else @@ -5648,7 +5641,7 @@ i=r->begin(); while( (ret||verbose_log) && i!=r->end() ) { - j = find_if( l->begin(), l->end(), equal_co( *i ) ); + j = find_if(l->begin(), l->end(), bind2nd(deref_equal_to<Container>(), *i)); if( j==l->end() ) { ret = false; Modified: trunk/storage/libstorage/src/StorageTmpl.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTm… ============================================================================== --- trunk/storage/libstorage/src/StorageTmpl.h (original) +++ trunk/storage/libstorage/src/StorageTmpl.h Tue Mar 31 16:16:46 2009 @@ -191,12 +191,21 @@ return( s ); } -template< class Val > -struct cont_less : public std::binary_function<Val*,Val*,bool> + + template<class Type> + struct deref_less : public std::binary_function<const Type*, const Type*, bool> { - bool operator()(const Val* __x, const Val* __y) const { return *__x < *__y; } + bool operator()(const Type* x, const Type* y) const { return *x < *y; } }; + + template<class Type> + struct deref_equal_to : public std::binary_function<const Type*, const Type*, bool> + { + bool operator()(const Type* x, const Type* y) const { return *x == *y; } + }; + + template <class T, unsigned int sz> inline unsigned int lengthof (T (&)[sz]) { return sz; } -- 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] r56506 - /trunk/storage/libstorage/src/StorageTypes.h
by aschnell＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: aschnell Date: Tue Mar 31 15:58:09 2009 New Revision: 56506 URL: http://svn.opensuse.org/viewcvs/yast?rev=56506&view=rev Log: - added const Modified: trunk/storage/libstorage/src/StorageTypes.h Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Tue Mar 31 15:58:09 2009 @@ -159,21 +159,21 @@ struct regex_matches { regex_matches(const Regex& t) : val(t) {} - bool operator()(const string& s) { return val.match(s); } + bool operator()(const string& s) const { return val.match(s); } const Regex& val; }; struct string_starts_with { string_starts_with(const string& t) : val(t) {} - bool operator()(const string& s) { return boost::starts_with(s, val); } + bool operator()(const string& s) const { return boost::starts_with(s, val); } const string& val; }; struct string_contains { string_contains(const string& t) : val(t) {} - bool operator()(const string& s) { return boost::contains(s, val); } + bool operator()(const string& s) const { return boost::contains(s, val); } const string& val; }; -- 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] r56505 - /trunk/devtools/devtools/cmake/modules/FindYast.cmake
by kkaempf＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: kkaempf Date: Tue Mar 31 15:54:13 2009 New Revision: 56505 URL: http://svn.opensuse.org/viewcvs/yast?rev=56505&view=rev Log: make it a bit more verbose on error Modified: trunk/devtools/devtools/cmake/modules/FindYast.cmake Modified: trunk/devtools/devtools/cmake/modules/FindYast.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/cmake/modules/… ============================================================================== --- trunk/devtools/devtools/cmake/modules/FindYast.cmake (original) +++ trunk/devtools/devtools/cmake/modules/FindYast.cmake Tue Mar 31 15:54:13 2009 @@ -76,9 +76,16 @@ MESSAGE( STATUS " UI in ${YAST_PLUGIN_UI_LIBRARY}") set(YAST_FOUND TRUE) else(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) - MESSAGE( STATUS "YaST2 not found") + if (NOT YAST_INCLUDE_DIR) + MESSAGE( STATUS "YaST2 include dir not found.") + endif (NOT YAST_INCLUDE_DIR) + if (NOT YAST_LIBRARY) + MESSAGE( STATUS "YaST2 library not found.") + endif (NOT YAST_LIBRARY) + if (NOT YAST_YCP_LIBRARY) + MESSAGE( STATUS "YaST2 YCP files not found.") + endif (NOT YAST_YCP_LIBRARY) endif(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) MARK_AS_ADVANCED(YAST_INCLUDE_DIR YAST_LIBRARY YAST_YCP_LIBRARY YAST_PLUGIN_WFM_LIBRARY YAST_PLUGIN_SCR_LIBRARY YAST_PLUGIN_UI_LIBRARY YAST_PLUGIN_DIR YAST_IMAGE_DIR YAST_DATA_DIR YAST_YUI_LIBRARY ) - -- 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] r56504 - /trunk/autoinstallation/src/modules/AutoinstStorage.ycp
by locilka＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: locilka Date: Tue Mar 31 15:48:16 2009 New Revision: 56504 URL: http://svn.opensuse.org/viewcvs/yast?rev=56504&view=rev Log: Reading fstab using Storage Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Tue Mar 31 15:48:16 2009 @@ -20,6 +20,7 @@ import "Popup"; import "Report"; import "Mode"; + import "Installation"; // All shared data are in yast2.rpm to break cyclic dependencies import "AutoinstData"; @@ -602,7 +603,7 @@ } }); string mount_options = ""; - foreach (map entry, fstab, { + foreach (map entry, (list <map>) Storage::ReadFstab (Installation::destdir), { if( entry["file"]:"" == mntpt ) { mount_options = entry["mntops"]:""; 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] r56503 - in /trunk/autoinstallation: autoyast2.spec.in package/autoyast2.changes src/modules/AutoinstStorage.ycp
by locilka＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: locilka Date: Tue Mar 31 15:38:54 2009 New Revision: 56503 URL: http://svn.opensuse.org/viewcvs/yast?rev=56503&view=rev Log: - Adapted to RootPart API cleanup. Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.… ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Tue Mar 31 15:38:54 2009 @@ -1,9 +1,11 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-update yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp +BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp # API for Disabled Modules (ProductControl) BuildRequires: yast2 >= 2.16.36 +# After API cleanup +BuildRequires: yast2-update >= 2.18.3 Requires: yast2 >= 2.16.36 Requires: yast2-core yast2-xml libxslt @@ -31,7 +33,9 @@ Group: System/YaST # API for Disabled Modules (ProductControl) Requires: yast2 >= 2.16.36 -Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-update +# After API cleanup +Requires: yast2-update >= 2.18.3 +Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer Provides: yast2-trans-autoinst Obsoletes: yast2-trans-autoinst %description installation Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Mar 31 15:38:54 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 31 15:38:16 CEST 2009 - locilka(a)suse.cz + +- Adapted to RootPart API cleanup. + +------------------------------------------------------------------- Tue Mar 31 14:53:33 CEST 2009 - ug(a)suse.de - default filesystem changed to ext3 (bnc#490389) Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Tue Mar 31 15:38:54 2009 @@ -578,6 +578,52 @@ return summary; } + // Moved here from RootPart module (used just by this module) + global define boolean SetFormatPartitions (list<map> fstabpart) + { + // All storage devices + map <string, map> target_map = Storage::GetTargetMap (); + + // all activated + list <map> tmp = filter (map e, RootPart::GetActivated(), { + return (e[`type]:"" == "mount" || e[`type]:"" == "swap"); + }); + + foreach (map e, tmp, { + string mntpt = (e[`type]:"" == "swap")?("swap"):(e[`mntpt]:""); + string part = e[`device]:""; + + map p = $[]; + foreach (map pp, fstabpart, { + // mountpoint matches + if (pp["mount"]:"" == mntpt) { + p = pp; + break; + } + }); + string mount_options = ""; + foreach (map entry, fstab, { + if( entry["file"]:"" == mntpt ) { + mount_options = entry["mntops"]:""; + break; + } + }); + target_map = Storage::SetPartitionData (target_map, part, "mount", mntpt ); + target_map = Storage::SetPartitionData (target_map, part, "format", p["format"]:false ); + target_map = Storage::SetPartitionData (target_map, part, "delete", false); + target_map = Storage::SetPartitionData (target_map, part, "create", false); + if( size(mount_options) > 0 && !haskey(p, "fstopt" ) ) + target_map = Storage::SetPartitionData (target_map, part, "fstopt", mount_options); + if( haskey(p, "fstopt" ) ) + target_map = Storage::SetPartitionData (target_map, part, "fstopt", p["fstopt"]:""); + if( haskey( p, "mountby" ) ) + target_map = Storage::SetPartitionData (target_map, part, "mountby", p["mountby"]:`device); + }); + + Storage::SetTargetMap (target_map); + return true; + } + /** * Handle /etc/fstab usage * @return boolean @@ -623,7 +669,7 @@ } RootPart::MountPartitions(RootPart::selectedRootPartition); - RootPart::SetFormatPartitions (fstab_partitions); + SetFormatPartitions (fstab_partitions); RootPart::UnmountPartitions (true); return true; } @@ -795,5 +841,7 @@ } + + // EOF } -- 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] r56502 - /trunk/devtools/y2logview/y2log_ana/
by kkaempf＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: kkaempf Date: Tue Mar 31 15:30:38 2009 New Revision: 56502 URL: http://svn.opensuse.org/viewcvs/yast?rev=56502&view=rev Log: cgui.moc.cc is generated Modified: trunk/devtools/y2logview/y2log_ana/ (props changed) -- 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] r56501 - in /trunk/devtools: devtools/cmake/ devtools/cmake/modules/ y2logview/ y2logview/y2log_ana/
by kkaempf＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: kkaempf Date: Tue Mar 31 15:22:57 2009 New Revision: 56501 URL: http://svn.opensuse.org/viewcvs/yast?rev=56501&view=rev Log: ignore generated Makefile and Makefile.in Modified: trunk/devtools/devtools/cmake/ (props changed) trunk/devtools/devtools/cmake/modules/ (props changed) trunk/devtools/y2logview/ (props changed) trunk/devtools/y2logview/y2log_ana/ (props changed) -- 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] r56500 - /tags/stable-2_18_3/update/
by locilka＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: locilka Date: Tue Mar 31 15:22:20 2009 New Revision: 56500 URL: http://svn.opensuse.org/viewcvs/yast?rev=56500&view=rev Log: Created tag stable-2_18_3 for update Added: tags/stable-2_18_3/update/ - copied from r56499, trunk/update/ -- 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] r56499 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp
by locilka＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: locilka Date: Tue Mar 31 15:19:23 2009 New Revision: 56499 URL: http://svn.opensuse.org/viewcvs/yast?rev=56499&view=rev Log: - Cleanup in RootPart module. - 2.18.3 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=56499&r1=5649… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Tue Mar 31 15:19:23 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Tue Mar 31 15:19:23 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 31 15:18:39 CEST 2009 - locilka(a)suse.cz + +- Cleanup in RootPart module. +- 2.18.3 + +------------------------------------------------------------------- Thu Feb 19 17:27:25 CET 2009 - aschnell(a)suse.de - added missing import statement Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Tue Mar 31 15:19:23 2009 @@ -84,6 +84,15 @@ */ list <map <symbol, string> > activated = []; + /** + * Returns currently activated partitions. + * + * @return list <map <symbol, string> > activated + */ + global list <map <symbol, string> > GetActivated () { + return activated; + } + global boolean Mounted () { return size (activated) > 0; } @@ -550,33 +559,6 @@ return true; } -/* - * No more EVMS - // bugzilla #237139 - // '/dev/evms/lvm2/system/root' is the same as '/dev/system/root' - // the root from /etc/fstab must be used - if (regexpmatch (root["spec"]:"", "/dev/evms/lvm2/") || regexpmatch (partition, "/dev/evms/lvm2/")) { - y2milestone ("Special case with EVMS: %1 vs. %2", root["spec"]:"", partition); - - string tmp_rootspec = root["spec"]:""; - string tmp_partition = partition; - - // they might be the same but this case covers it as well - if (regexpmatch (root["spec"]:"", "/dev/evms/lvm2/")) - tmp_rootspec = regexpsub (root["spec"]:"", "/dev/evms/lvm2/(.*)$", "/dev/\\1"); - if (regexpmatch (partition, "/dev/evms/lvm2/")) - tmp_partition = regexpsub (partition, "/dev/evms/lvm2/(.*)$", "/dev/\\1"); - - y2milestone ("Checking '%1' vs. '%2'", tmp_rootspec, tmp_partition); - - if (tmp_rootspec == tmp_partition) { - found_partition = root["spec"]:""; - y2milestone ("EVMS case matching, using %1", found_partition); - return true; - } - } -*/ - return true; } @@ -782,7 +764,12 @@ /** + * Reads FSTab and CryptoTab and fills fstab and crtab got as parameters. + * Uses Installation::destdir as the base mount point. * + * @param list <map> ('pointer' to) fstab + * @param list <map> ('pointer' to) crtab + * @param string root device */ define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab, string root_device_current) { @@ -801,8 +788,6 @@ crtab = (list<map>) SCR::Read (.etc.cryptotab); } - Update::GetProductName(); - boolean fstab_has_separate_var = FstabHasSeparateVar (fstab); // mount /var if (fstab_has_separate_var) { @@ -1387,6 +1372,7 @@ } read_fstab_and_cryptotab (fstab, crtab, root_device_current); + Update::GetProductName(); if (FstabUsesKernelDeviceNameForHarddisks(fstab)) { @@ -1469,54 +1455,6 @@ return success; } - - global define boolean SetFormatPartitions (list<map> fstabpart) - { - // All storage devices - map <string, map> target_map = Storage::GetTargetMap (); - list<map> fstab = []; - readFsTab(fstab); - // all activated - list <map> tmp = filter (map e, activated, { - return (e[`type]:"" == "mount" || e[`type]:"" == "swap"); - }); - - foreach (map e, tmp, { - string mntpt = (e[`type]:"" == "swap")?("swap"):(e[`mntpt]:""); - string part = e[`device]:""; - - map p = $[]; - foreach (map pp, fstabpart, { - // mountpoint matches - if (pp["mount"]:"" == mntpt) { - p = pp; - break; - } - }); - string mount_options = ""; - foreach (map entry, fstab, { - if( entry["file"]:"" == mntpt ) { - mount_options = entry["mntops"]:""; - break; - } - }); - target_map = Storage::SetPartitionData (target_map, part, "mount", mntpt ); - target_map = Storage::SetPartitionData (target_map, part, "format", p["format"]:false ); - target_map = Storage::SetPartitionData (target_map, part, "delete", false); - target_map = Storage::SetPartitionData (target_map, part, "create", false); - if( size(mount_options) > 0 && !haskey(p, "fstopt" ) ) - target_map = Storage::SetPartitionData (target_map, part, "fstopt", mount_options); - if( haskey(p, "fstopt" ) ) - target_map = Storage::SetPartitionData (target_map, part, "fstopt", p["fstopt"]:""); - if( haskey( p, "mountby" ) ) - target_map = Storage::SetPartitionData (target_map, part, "mountby", p["mountby"]:`device); - }); - - Storage::SetTargetMap (target_map); - return true; - } - - /** * Get architecture of an elf file. */ @@ -1607,6 +1545,7 @@ list <map> crtab = []; read_fstab_and_cryptotab (fstab, crtab, p_dev); + Update::GetProductName(); fstab = filter (map p, fstab, ``(p["file"]:""=="/")); @@ -1815,26 +1754,4 @@ } } -global void Propose (boolean force_reset) { - y2milestone ("Proposing root partition"); - Detect (); - if (force_reset) - { - selectedRootPartition = ""; - } - - if (numberOfValidRootPartitions == 0 - && selectedRootPartition == "") - { - targetOk = false; - } - else - { - if (selectedRootPartition == "") - { - SetSelectedToValid (); - } - } -} - } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0