SOURCES (AC-branch): util-linux-dm_crypt.patch - fixed error in fl...

[kosmo]

Author: kosmo                        Date: Fri May 25 12:20:20 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- fixed error in flags passed to kernel

---- Files affected:
SOURCES:
   util-linux-dm_crypt.patch (1.2.2.1 -> 1.2.2.2) 

---- Diffs:

================================================================
Index: SOURCES/util-linux-dm_crypt.patch
diff -u SOURCES/util-linux-dm_crypt.patch:1.2.2.1 SOURCES/util-linux-dm_crypt.patch:1.2.2.2
--- SOURCES/util-linux-dm_crypt.patch:1.2.2.1	Fri May 25 13:00:48 2007
+++ SOURCES/util-linux-dm_crypt.patch	Fri May 25 14:20:15 2007
@@ -43,14 +43,6 @@
  #include "loop.h"
  #include "linux_fs.h"		/* for BLKGETSIZE */
  #include "mount_guess_rootdev.h"
-@@ -98,6 +99,7 @@
- #define MS_USER		0x20000000
- #define MS_OWNER	0x10000000
- #define MS_GROUP	0x08000000
-+#define	MS_CRYPT	0x00040000
- #define MS_COMMENT	0x00020000
- #define MS_LOOP		0x00010000
- 
 @@ -607,7 +609,7 @@
        *type = opt_vfstype;
    }
@@ -69,7 +61,7 @@
  	if (verbose)
  	  printf(_("mount: failed setting up loop device\n"));
  	return EX_FAIL;
-@@ -636,6 +638,42 @@
+@@ -636,6 +638,41 @@
        *spec = *loopdev;
        if (loopro)
  	*flags |= MS_RDONLY;
@@ -86,11 +78,10 @@
 +	    int *crypt, char **cryptdev, char **realdev) {
 +  int offset;
 +
-+  *crypt = ((*flags & MS_CRYPT) || opt_encryption);
++  *crypt = opt_encryption;
 +  *realdev = *spec;
 +
 +  if (*crypt) {
-+    *flags |= MS_CRYPT;
 +    if (fake) {
 +      if (verbose)
 +	printf(_("mount: skipping the setup of an encrypted device\n"));
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/util-linux-dm_crypt.patch?r1=1.2.2.1&r2=1.2.2.2&f=u