mount-setup: mount /dev/pts with mode=620,gid=5 by default and make GID overridable...

diff --git a/configure.ac b/configure.ac
index 4f77aa8f1904642a02438d71f18cd1243bdb0955..396a414ac79fe82844cb36f2063972c25dadc10f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -410,6 +410,12 @@ else
         SYSTEM_SYSV_COMPAT="no"
 fi
 
         SYSTEM_SYSV_COMPAT="no"
 fi
 

+AC_ARG_WITH([tty-gid],
+        [AS_HELP_STRING([--tty-gid=GID],
+                [Specify the numeric GID of the 'tty' group])],
+        [AC_DEFINE_UNQUOTED(TTY_GID, [$withval], [GID of the 'tty' group])],
+        [])
+

 AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
 AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
 AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)

diff --git a/src/macro.h b/src/macro.h
index 85a7fbccfdb4a8dd153780368859ebac08657047..996b7c2ed141b42c4f8ce8ea3ffa4881cf1108c1 100644 (file)
--- a/src/macro.h
+++ b/src/macro.h
@@ -47,6 +47,9 @@
 #define _weakref_(x) __attribute__((weakref(#x)))
 #define _introspect_(x) __attribute__((section("introspect." x)))
 
 #define _weakref_(x) __attribute__((weakref(#x)))
 #define _introspect_(x) __attribute__((section("introspect." x)))
 

+#define XSTRINGIFY(x) #x
+#define STRINGIFY(x) XSTRINGIFY(x)
+

 /* Rounds up */
 static inline size_t ALIGN(size_t l) {
         return ((l + sizeof(void*) - 1) & ~(sizeof(void*) - 1));
 /* Rounds up */
 static inline size_t ALIGN(size_t l) {
         return ((l + sizeof(void*) - 1) & ~(sizeof(void*) - 1));

diff --git a/src/mount-setup.c b/src/mount-setup.c
index b85ac6d3fe0db6d7356658c64dc52a2dcca5f355..64fb4765f613d9929e956e753673ca813544a28c 100644 (file)
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -35,6 +35,10 @@
 #include "util.h"
 #include "label.h"
 
 #include "util.h"
 #include "label.h"
 

+#ifndef TTY_GID
+#define TTY_GID 5
+#endif
+

 typedef struct MountPoint {
         const char *what;
         const char *where;
 typedef struct MountPoint {
         const char *what;
         const char *where;


@@ -49,7 +53,7 @@ static const MountPoint mount_table[] = {
         { "sysfs",    "/sys",                   "sysfs",    NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID,                    true },
         { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV,           true },
         { "sysfs",    "/sys",                   "sysfs",    NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID,                    true },
         { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV,           true },

-        { "devpts",   "/dev/pts",               "devpts",   NULL,                MS_NOSUID|MS_NOEXEC,          false },
+        { "devpts",   "/dev/pts",               "devpts",   "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false },

         { "tmpfs",    "/sys/fs/cgroup",         "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "cgroup",   "/sys/fs/cgroup/systemd", "cgroup",   "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
 };
         { "tmpfs",    "/sys/fs/cgroup",         "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "cgroup",   "/sys/fs/cgroup/systemd", "cgroup",   "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
 };