Mailinglist Archive: yast-commit (590 mails)

< Previous Next >
[yast-commit] r61609 - in /trunk/autoinstallation: doc/Makefile.am package/autoyast2.changes src/modules/AutoinstLVM.ycp
  • From: ug@xxxxxxxxxxxxxxxx
  • Date: Thu, 08 Apr 2010 09:55:31 -0000
  • Message-id: <E1NzoSR-0002ij-HZ@xxxxxxxxxxxxxxxx>
Author: ug
Date: Thu Apr 8 11:55:31 2010
New Revision: 61609

URL: http://svn.opensuse.org/viewcvs/yast?rev=61609&view=rev
Log:
reuse of a physical device for an LVM fixed (bnc#591601)

Modified:
trunk/autoinstallation/doc/Makefile.am
trunk/autoinstallation/package/autoyast2.changes
trunk/autoinstallation/src/modules/AutoinstLVM.ycp

Modified: trunk/autoinstallation/doc/Makefile.am
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Makefile.am?rev=61609&r1=61608&r2=61609&view=diff
==============================================================================
--- trunk/autoinstallation/doc/Makefile.am (original)
+++ trunk/autoinstallation/doc/Makefile.am Thu Apr 8 11:55:31 2010
@@ -25,7 +25,7 @@
html/yast2docs.css \
html/default.css

-#doc_DATA = autoyast.pdf
+doc_DATA = autoyast.pdf

components: components.ent
bin/components.sh noref > components.ent
@@ -55,10 +55,13 @@
# @XSLTPROC@ --xinclude @STYLESHEET_HTML@ \
# $<

+#autoyast.fo: autoyast.xml
+# XML_CATALOG_FILES=@XML_CATALOG@ \
+# @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
+# -o $@ @STYLESHEET_PDF@ $<
+
autoyast.fo: autoyast.xml
- XML_CATALOG_FILES=@XML_CATALOG@ \
- @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
- -o $@ @STYLESHEET_PDF@ $<
+ saxon -o autoyast.fo autoyast.xml @STYLESHEET_PDF@

autoyast.pdf: autoyast.fo
fop -q $< $@

Modified: trunk/autoinstallation/package/autoyast2.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=61609&r1=61608&r2=61609&view=diff
==============================================================================
--- trunk/autoinstallation/package/autoyast2.changes (original)
+++ trunk/autoinstallation/package/autoyast2.changes Thu Apr 8 11:55:31 2010
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Apr 8 11:53:53 CEST 2010 - ug@xxxxxxx
+
+- reuse of a physical device for an LVM fixed
+ (bnc#591601)
+
+-------------------------------------------------------------------
Fri Mar 26 10:43:46 CET 2010 - ug@xxxxxxx

- <notification> added to scripts UI

Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstLVM.ycp?rev=61609&r1=61608&r2=61609&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original)
+++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Thu Apr 8 11:55:31 2010
@@ -77,7 +77,7 @@
/* look for VGs to reuse */
foreach ( string k, map v, AutoinstStorage::AutoTargetMap, ``{
foreach ( map p, v["partitions"]:[], ``{
- if( haskey( p, "lvm_group" ) && p["create"]:true == false ) {
+ if( haskey( p, "lvm_group" ) && p["create"]:true == false &&
p["format"]:true == false ) {
keepLVM[p["lvm_group"]:"x"] = [];
if( !contains( ExistingVGs, p["lvm_group"]:"x" ) )
Report::Error( sformat( _("Cannot reuse volume group
%1. The volume group does not exist."), p["lvm_group"]:"x" ) );
@@ -225,8 +225,9 @@
map atm = AutoinstStorage::AutoTargetMap;
integer smallest_physical = 0;
foreach(map pv, new_pvs, ``{
+ boolean to_add = false;
if (pv["create"]:false) {
- boolean to_add = true;
+ to_add = true;
// exclude partitions that are NOT supposed to be in the
LVM
foreach( map atm_vol,
atm[pv["maindev"]:"","partitions"]:[], ``{
if( pv["nr"]:0 == atm_vol["partition_nr"]:-1 ) {
@@ -236,13 +237,25 @@
}
}
});
- if( to_add ) {
- y2milestone("addPhysicalVolume %1 ,
%2",pv["device"]:"", current_vg );
- if( smallest_physical == 0 || pv["size_k"]:0 <
smallest_physical )
- smallest_physical = pv["size_k"]:0;
- addPhysicalVolume(targetMap, pv["device"]:"",
current_vg );
- }
+ } else {
+ to_add = false;
+ // exclude partitions that are NOT supposed to be in the
LVM
+ foreach( map atm_vol,
atm[pv["maindev"]:"","partitions"]:[], ``{
+ if( pv["nr"]:0 == atm_vol["partition_nr"]:-1 ) {
+ if( atm_vol["lvm_group"]:"" == current_vg ) {
+ y2milestone("add %1",atm_vol);
+ to_add = true;
+ }
+ }
+ });
}
+ if( to_add ) {
+ y2milestone("addPhysicalVolume %1 , %2",pv["device"]:"",
current_vg );
+ if( smallest_physical == 0 || pv["size_k"]:0 <
smallest_physical )
+ smallest_physical = pv["size_k"]:0;
+ addPhysicalVolume(targetMap, pv["device"]:"", current_vg
);
+ }
+
});
// calculating the "max" for logical volume
map<string, map> tmp_tm = Storage::GetTargetMap();

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages