Attachment 156500 Details for Bug 258222

[patch] Adaptions for crypt handling needed for RootPart.ycp

RootPart.diff (text/plain), 1.30 KB, created by Thomas Fehr on 2007-08-09 14:11:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Fehr

Created: 2007-08-09 14:11:29 UTC

Size: 1.30 KB

patch

obsolete

>Index: src/modules/RootPart.ycp
>===================================================================
>--- src/modules/RootPart.ycp	(revision 40127)
>+++ src/modules/RootPart.ycp	(working copy)
>@@ -73,7 +73,7 @@
>      *
>      * Keys/values are:
>      *
>-     *   `type     The type, one of "mount", "swap" or "loop".
>+     *   `type     The type, one of "mount", "swap" or "crypt".
>      *
>      *   `device   The device.
>      *
>@@ -219,13 +219,14 @@
> 			y2error("Cannot deactivate swap %1", device);
> 		    }
> 		}
>-		else if (type == "loop")
>+		else if (type == "crypt")
> 		{
>-		    string device = info[`device]:"";
>+		    string dmname = info[`device]:"";
>+		    dmname = "cr_" + substring( dmname, findlastof( dmname, "/" )+1 );
> 		    // FIXME? is it safe?
>-		    if (WFM::Execute(.local.bash, "losetup -d " + device) != 0)
>+		    if (WFM::Execute(.local.bash, "cryptsetup remove " + dmname) != 0)
> 		    {
>-			y2error("Cannot deactivate loopback device %1", device);
>+			y2error("Cannot remove dm device %1", dmname);
> 		    }
> 		}
> 	    }
>@@ -818,7 +819,7 @@
> 				    "passno" : 0,
> 				    "vfstype": vfstype ];
> 		    fstab = prepend (fstab, add_fs);
>-		    AddMountedPartition ($[`type : "loop", `device : device]);
>+		    AddMountedPartition ($[`type : "crypt", `device : device]);
> 		    again = false;
> 		}
> 	      }

Actions: View | Diff

Attachments on bug 258222: 127208 | 129200 | 131224 | 141070 | 154116 | 156500