[yast-commit] r56503 - in /trunk/autoinstallation: autoyast2.spec.in package/autoyast2.changes src/modules/AutoinstStorage.ycp

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.in?rev=56503&r1=56502&r2=56503&view=diff ============================================================================== --- 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/autoyast2.changes?rev=56503&r1=56502&r2=56503&view=diff ============================================================================== --- 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@suse.cz + +- Adapted to RootPart API cleanup. + +------------------------------------------------------------------- Tue Mar 31 14:53:33 CEST 2009 - ug@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/AutoinstStorage.ycp?rev=56503&r1=56502&r2=56503&view=diff ============================================================================== --- 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 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org