[systemd-commits] 2 commits - configure.ac src/macro.h src/mount-setup.c src/systemctl.c

[Lennart Poettering]

 configure.ac      |    6 ++++++
 src/macro.h       |    3 +++
 src/mount-setup.c |    6 +++++-
 src/systemctl.c   |    3 +--
 4 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit bef2733fae665e880da6ea011b1f918e6900bb42
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 4 01:58:38 2011 +0100

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

diff --git a/configure.ac b/configure.ac
index 4f77aa8..396a414 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,6 +410,12 @@ else
         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)
diff --git a/src/macro.h b/src/macro.h
index 85a7fbc..996b7c2 100644
--- 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 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));
diff --git a/src/mount-setup.c b/src/mount-setup.c
index b85ac6d..64fb476 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -35,6 +35,10 @@
 #include "util.h"
 #include "label.h"
 
+#ifndef TTY_GID
+#define TTY_GID 5
+#endif
+
 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 },
-        { "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 },
 };

commit 4c00bf25614779a58ca57dfe8e2c477c926c5c2b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 4 01:18:57 2011 +0100

    systemctl: drop redundant getenv('LESS') check

diff --git a/src/systemctl.c b/src/systemctl.c
index 0908b6a..5d2efbe 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -5328,8 +5328,7 @@ static void pager_open(void) {
                 dup2(fd[0], STDIN_FILENO);
                 close_pipe(fd);
 
-                if (!getenv("LESS"))
-                        setenv("LESS", "FRSX", 0);
+                setenv("LESS", "FRSX", 0);
 
                 prctl(PR_SET_PDEATHSIG, SIGTERM);