prevent cloning of /dev/tmpfs storage container (bnc#776365)

yast · Aug 29, 2012 · 9e96aed · 9e96aed
1 parent 0171e1c
commit 9e96aed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 29 17:53:45 CEST 2012 - fehr@suse.de
+
+- prevent cloning of /dev/tmpfs storage container (bnc#776365)
+
 -------------------------------------------------------------------
 Tue Aug  7 14:07:30 CEST 2012 - ug@suse.de
 

diff --git a/src/modules/AutoinstPartPlan.ycp b/src/modules/AutoinstPartPlan.ycp
@@ -622,15 +622,20 @@
     {
         y2milestone("entering Import with %1", settings);
 	AutoPartPlan = [];
+        list IgnoreTypes = [ `CT_TMPFS, `CT_BTRFS ];
 	foreach( map drive, settings, {
-	  DriveT newDrive = AutoinstDrive::parseDrive( drive );
-	  if( AutoinstDrive::isDrive( newDrive ) ){
-	    AutoPartPlan = internalAddDrive( AutoPartPlan, newDrive );
-	  }
-	  else{
-	    y2error( "Couldn't construct DriveT from '%1'", drive );
-	  }
-	});
+          if( !contains( IgnoreTypes, drive["type"]:`CT_DISK ))
+            {
+            DriveT newDrive = AutoinstDrive::parseDrive( drive );
+            if( AutoinstDrive::isDrive( newDrive ) ){
+              AutoPartPlan = internalAddDrive( AutoPartPlan, newDrive );
+              }
+            else
+              y2error( "Couldn't construct DriveT from '%1'", drive );
+            }
+          else
+            y2milestone( "Ignoring Container type '%1'", drive["type"]:`CT_DISK );
+	  });
         return true;
     }