Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-updates-src > by-pkgid > 55eb56c258e2e09e5695782a54aaaf5b > files > 28

util-linux-2.25.2-3.5.mga5.src.rpm

diff -p -up util-linux-ng-2.14.1/mount/mount.c.set-as-encrypted util-linux-ng-2.14.1/mount/mount.c
--- util-linux-ng-2.14.1/mount/mount.c.set-as-encrypted	2008-09-16 16:03:52.000000000 +0200
+++ util-linux-ng-2.14.1/mount/mount.c	2008-09-16 16:12:05.000000000 +0200
@@ -100,11 +100,12 @@ struct opt_map {
 #define MS_USER		0x20000000
 #define MS_OWNER	0x10000000
 #define MS_GROUP	0x08000000
+#define MS_ENCRYPT	0x00030000
 #define MS_COMMENT	0x02000000
 #define MS_LOOP		0x00010000
 
 /* Options that we keep the mount system call from seeing.  */
-#define MS_NOSYS	(MS_NOAUTO|MS_USERS|MS_USER|MS_COMMENT|MS_LOOP)
+#define MS_NOSYS	(MS_NOAUTO|MS_USERS|MS_USER|MS_COMMENT|MS_ENCRYPT|MS_LOOP)
 
 /* Options that we keep from appearing in the options field in the mtab.  */
 #define MS_NOMTAB	(MS_REMOUNT|MS_NOAUTO|MS_USERS|MS_USER)
@@ -143,6 +144,7 @@ static const struct opt_map opt_map[] = 
   { "noowner",	0, 1, MS_OWNER  },	/* Device owner has no special privs */
   { "group",	0, 0, MS_GROUP  },	/* Let the group of the device mount */
   { "nogroup",	0, 1, MS_GROUP  },	/* Device group has no special privs */
+  { "encrypted", 0, 0, MS_ENCRYPT },	/* Device encrypted */
   { "_netdev",	0, 0, MS_COMMENT},	/* Device requires network */
   { "comment",	0, 0, MS_COMMENT},	/* fstab comment only (kudzu,_netdev)*/