Attachment 46347 Details for Bug 105020

[patch] changes needed in RootPart.ycp

update.diff (text/plain), 1.17 KB, created by Thomas Fehr on 2005-08-17 17:09:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Fehr

Created: 2005-08-17 17:09:18 UTC

Size: 1.17 KB

patch

obsolete

>Index: src/modules/RootPart.ycp
>===================================================================
>--- src/modules/RootPart.ycp	(revision 24997)
>+++ src/modules/RootPart.ycp	(working copy)
>@@ -247,7 +247,7 @@
>     {
> 	if (!Mode::test ())
> 	{
>-	    symbol detected_fs = FileSystems::DetectFs (partition);
>+	    symbol detected_fs = Storage::DetectFs (partition);
> 	    if (detected_fs == `ext2)
> 	    {
> 		// label, %1 is partition
>@@ -277,7 +277,7 @@
> {
>     if (mount_type == "")
> 	mount_type = FileSystems::GetMountString (
>-	    FileSystems::DetectFs (device), "");
>+	    Storage::DetectFs (device), "");
>     if (mount_type != "")
> 	mount_type = "-t " + mount_type;
> 
>@@ -560,12 +560,6 @@
> 
> 	    if (!issubstring (mntops, "noauto"))
> 	    {
>-		if (crypt_nb == 0)
>-		{
>-		    SCR::Execute(.target.modprobe, "loop_fish2", "");
>-		    crypt_nb = crypt_nb + 1;
>-		}
>-
> 		string crypt_passwd = DlgUpdateCryptFs( device, fspath );
> 
> 		if (crypt_passwd == nil)
>@@ -583,6 +577,8 @@
> 				     "partitionName" : device ];
> 
> 		    crypt_ok = Storage::PerformLosetup( setloop, false );
>+		    if( crypt_ok )
>+			loop = setloop["loop_dev"]:"";
> 
> 		    y2milestone ("crypt ok: %1", crypt_ok);
> 		}

Actions: View | Diff

Attachments on bug 105020: 46206 | 46347