summaryrefslogtreecommitdiff
path: root/legacy/eeze
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-07-30 09:49:05 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-07-30 09:49:05 +0000
commitba567e440ee3d11916ce369d9b5539e22f2221c2 (patch)
treea6c09524365da36eb5dbc9d97d47020abb231b41 /legacy/eeze
parentd995e25c80ea2a7b5080d7f9e35a6da125fd137a (diff)
add EEZE_DISK_MOUNTOPT_NODEV
yes, I realize we're in a freeze, but this is trivial and important SVN revision: 74564
Diffstat (limited to 'legacy/eeze')
-rw-r--r--legacy/eeze/ChangeLog4
-rw-r--r--legacy/eeze/src/lib/Eeze_Disk.h3
-rw-r--r--legacy/eeze/src/lib/eeze_disk_libmount.c1
-rw-r--r--legacy/eeze/src/lib/eeze_disk_libmount_new.c1
-rw-r--r--legacy/eeze/src/lib/eeze_disk_mount.c2
5 files changed, 10 insertions, 1 deletions
diff --git a/legacy/eeze/ChangeLog b/legacy/eeze/ChangeLog
index 029dbef1e4..d6189bfea4 100644
--- a/legacy/eeze/ChangeLog
+++ b/legacy/eeze/ChangeLog
@@ -110,3 +110,7 @@
110 110
111 * Add yet another libmount backend for eeze_disk to handle current 111 * Add yet another libmount backend for eeze_disk to handle current
112 setups which do not have mtab and instead use /proc/self/mountinfo 112 setups which do not have mtab and instead use /proc/self/mountinfo
113
1142012-07-30 Mike Blumenkrantz
115
116 * Add EEZE_DISK_MOUNTOPT_NODEV option for disabling device nodes on mount
diff --git a/legacy/eeze/src/lib/Eeze_Disk.h b/legacy/eeze/src/lib/Eeze_Disk.h
index 8c402ad305..36079b34de 100644
--- a/legacy/eeze/src/lib/Eeze_Disk.h
+++ b/legacy/eeze/src/lib/Eeze_Disk.h
@@ -63,7 +63,8 @@ typedef enum
63 EEZE_DISK_MOUNTOPT_NOEXEC = (1 << 3), 63 EEZE_DISK_MOUNTOPT_NOEXEC = (1 << 3),
64 EEZE_DISK_MOUNTOPT_NOSUID = (1 << 4), 64 EEZE_DISK_MOUNTOPT_NOSUID = (1 << 4),
65 EEZE_DISK_MOUNTOPT_REMOUNT = (1 << 5), 65 EEZE_DISK_MOUNTOPT_REMOUNT = (1 << 5),
66 EEZE_DISK_MOUNTOPT_UID = (1 << 6) /**< use current user's uid */ 66 EEZE_DISK_MOUNTOPT_UID = (1 << 6), /**< use current user's uid */
67 EEZE_DISK_MOUNTOPT_NODEV = (1 << 7) /**< @since 1.7 */
67} Eeze_Mount_Opts; 68} Eeze_Mount_Opts;
68 69
69 70
diff --git a/legacy/eeze/src/lib/eeze_disk_libmount.c b/legacy/eeze/src/lib/eeze_disk_libmount.c
index d1c38e8bee..885f313cc0 100644
--- a/legacy/eeze/src/lib/eeze_disk_libmount.c
+++ b/legacy/eeze/src/lib/eeze_disk_libmount.c
@@ -29,6 +29,7 @@ static struct libmnt_optmap eeze_optmap[] =
29 { "nosuid", EEZE_DISK_MOUNTOPT_NOSUID, 0 }, 29 { "nosuid", EEZE_DISK_MOUNTOPT_NOSUID, 0 },
30 { "remount", EEZE_DISK_MOUNTOPT_REMOUNT, 0 }, 30 { "remount", EEZE_DISK_MOUNTOPT_REMOUNT, 0 },
31 { "uid[=]", EEZE_DISK_MOUNTOPT_UID, 0 }, 31 { "uid[=]", EEZE_DISK_MOUNTOPT_UID, 0 },
32 { "nodev", EEZE_DISK_MOUNTOPT_NODEV, 0 },
32 { NULL, 0, 0 } 33 { NULL, 0, 0 }
33}; 34};
34typedef struct libmnt_table libmnt_table; 35typedef struct libmnt_table libmnt_table;
diff --git a/legacy/eeze/src/lib/eeze_disk_libmount_new.c b/legacy/eeze/src/lib/eeze_disk_libmount_new.c
index 1c77b03d40..95dc74a448 100644
--- a/legacy/eeze/src/lib/eeze_disk_libmount_new.c
+++ b/legacy/eeze/src/lib/eeze_disk_libmount_new.c
@@ -32,6 +32,7 @@ static struct libmnt_optmap eeze_optmap[] =
32 { "nosuid", EEZE_DISK_MOUNTOPT_NOSUID, 0 }, 32 { "nosuid", EEZE_DISK_MOUNTOPT_NOSUID, 0 },
33 { "remount", EEZE_DISK_MOUNTOPT_REMOUNT, 0 }, 33 { "remount", EEZE_DISK_MOUNTOPT_REMOUNT, 0 },
34 { "uid[=]", EEZE_DISK_MOUNTOPT_UID, 0 }, 34 { "uid[=]", EEZE_DISK_MOUNTOPT_UID, 0 },
35 { "nodev", EEZE_DISK_MOUNTOPT_NODEV, 0 },
35 { NULL, 0, 0 } 36 { NULL, 0, 0 }
36}; 37};
37typedef struct libmnt_table libmnt_table; 38typedef struct libmnt_table libmnt_table;
diff --git a/legacy/eeze/src/lib/eeze_disk_mount.c b/legacy/eeze/src/lib/eeze_disk_mount.c
index f4bfc13e6b..41bd8c6b35 100644
--- a/legacy/eeze/src/lib/eeze_disk_mount.c
+++ b/legacy/eeze/src/lib/eeze_disk_mount.c
@@ -348,6 +348,8 @@ eeze_disk_mount(Eeze_Disk *disk)
348 } 348 }
349 if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NOEXEC) 349 if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NOEXEC)
350 eina_strbuf_append(disk->mount_cmd, "noexec,"); 350 eina_strbuf_append(disk->mount_cmd, "noexec,");
351 if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NODEV)
352 eina_strbuf_append(disk->mount_cmd, "nodev,");
351 if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NOSUID) 353 if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NOSUID)
352 eina_strbuf_append(disk->mount_cmd, "nosuid,"); 354 eina_strbuf_append(disk->mount_cmd, "nosuid,");
353 if (disk->mount_opts & EEZE_DISK_MOUNTOPT_REMOUNT) 355 if (disk->mount_opts & EEZE_DISK_MOUNTOPT_REMOUNT)