Author: aschnell Date: Mon Jul 5 15:21:08 2010 New Revision: 62181 URL: http://svn.opensuse.org/viewcvs/yast?rev=62181&view=rev Log: - moved EFI detection from YCP to C++ (bnc #612867) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=62181&r1=62180&r2=62181&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jul 5 15:21:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 05 15:13:18 CEST 2010 - aschnell@suse.de + +- moved EFI detection from YCP to C++ (bnc #612867) +- 2.20.0 + +------------------------------------------------------------------- Mon Jun 21 16:42:34 CEST 2010 - aschnell@suse.de - avoid unreadable buttons (bnc #615377) Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=62181&r1=62180&r2=62181&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Mon Jul 5 15:21:08 2010 @@ -472,7 +472,7 @@ { not_used_mp = filter( string mp, not_used_mp, - ``(!contains( FileSystems::system_m_points, mp))); + ``(!contains(FileSystems::system_m_points(), mp))); } if(mount == "swap") new["mount"] = ""; Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=62181&r1=62180&r2=62181&view=diff ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Jul 5 15:21:08 2010 @@ -63,8 +63,8 @@ global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ]; - global const list<string> system_m_points = [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; - global const list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ]; + global list<string> system_m_points() { return [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; } + global list<string> crypt_m_points() { return [ "/", Partitions::BootMount(), "/usr" ]; } global const list<string> swap_m_points = [ "swap" ]; global const list<string> tmp_m_points = [ "/tmp", "/var/tmp" ]; @@ -79,7 +79,7 @@ { suggest_m_points = [ "/home", "/srv", "/tmp", "/local" ]; if( Stage::initial() ) - suggest_m_points = (list<string>)union( system_m_points, + suggest_m_points = (list<string>)union( system_m_points(), suggest_m_points ); y2milestone( "SuggestMPoints init:%1", suggest_m_points ); } @@ -1149,10 +1149,10 @@ global define boolean IsCryptMp( string mount, boolean prefix ) ``{ - boolean ret = contains( crypt_m_points, mount ); + boolean ret = contains( crypt_m_points(), mount ); if( !ret && prefix ) { - list<string> mp = filter(string s, system_m_points, ``(s!="/") ); + list<string> mp = filter(string s, system_m_points(), ``(s!="/") ); foreach(string s, mp, ``{ ret = ret || search( mount, s + "/" )==0; @@ -1164,10 +1164,10 @@ global define boolean IsSystemMp( string mount, boolean prefix ) ``{ - boolean ret = contains( system_m_points, mount ); + boolean ret = contains( system_m_points(), mount ); if( !ret && prefix ) { - list<string> mp = filter(string s, system_m_points, ``(s!="/") ); + list<string> mp = filter(string s, system_m_points(), ``(s!="/") ); foreach(string s, mp, ``{ ret = ret || search( mount, s + "/" )==0; Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=62181&r1=62180&r2=62181&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Mon Jul 5 15:21:08 2010 @@ -101,30 +101,7 @@ global boolean EfiBoot() { - // TODO: move to libstorage - - boolean ret = false; - - if (Arch::ia64()) - { - ret = true; - } - else - { - if (Stage::initial()) - { - string tmp = (string) SCR::Read(.etc.install_inf.EFI); - if (tmp != nil && tmp == "1") - ret = true; - } - else - { - string tmp = (string) SCR::Read(.sysconfig.bootloader.LOADER_TYPE); - if (tmp != nil && tmp == "elilo") - ret = true; - } - } - + boolean ret = LibStorage::StorageInterface::getEfiBoot(sint); y2milestone("EfiBoot ret:%1", ret); return ret; } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=62181&r1=62180&r2=62181&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Jul 5 15:21:08 2010 @@ -322,8 +322,6 @@ LibStorage::StorageInterface::setRootPrefix(sint, Installation::destdir); } - LibStorage::StorageInterface::setEfiBoot(sint, Partitions::EfiBoot()); - conts = getContainers(); y2milestone("InitLibstorage conts:%1", conts); FileSystems::InitSlib(sint); Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev=62181&r1=62180&r2=62181&view=diff ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Jul 5 15:21:08 2010 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.15 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.20.0 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings perl = %{perl_version} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org