agetty: use sd_get_sessions() for number of users (#2088)

diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index 15423204222392eed576f4f0604a21fda97f71a1..b7037fb116d60f5a3e6f018e6851a299f4e060cd 100644 (file)
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -58,6 +58,10 @@ endif
 if HAVE_ECONF
 agetty_LDADD += -leconf
 endif
+if HAVE_SYSTEMD
+agetty_LDADD += $(SYSTEMD_LIBS)
+agetty_CFLAGS = $(SYSTEMD_CFLAGS)
+endif
 endif # BUILD_AGETTY
 
 

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index cf8725537b98a8e2824828b6c49d76bbaabb32e5..6bc3e5b5a8338c3673db26f9998b2382c4b84b5f 100644 (file)
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -73,6 +73,11 @@
 # endif
 #endif
 
+#ifdef USE_SYSTEMD
+# include <systemd/sd-daemon.h>
+# include <systemd/sd-login.h>
+#endif
+
 #ifdef __linux__
 #  include <sys/kd.h>
 #  define USE_SYSLOG
@@ -2864,12 +2869,23 @@ static void output_special_char(struct issue *ie,
        case 'U':
        {
                int users = 0;
-               struct utmpx *ut;
-               setutxent();
-               while ((ut = getutxent()))
-                       if (ut->ut_type == USER_PROCESS)
-                               users++;
-               endutxent();
+#ifdef USE_SYSTEMD
+               if (sd_booted() > 0) {
+                       users = sd_get_sessions(NULL);
+                       if (users < 0)
+                               users = 0;
+               } else {
+#endif
+                       users = 0;
+                       struct utmpx *ut;
+                       setutxent();
+                       while ((ut = getutxent()))
+                               if (ut->ut_type == USER_PROCESS)
+                                       users++;
+                       endutxent();
+#ifdef USE_SYSTEMD
+               }
+#endif
                if (c == 'U')
                        fprintf(ie->output, P_("%d user", "%d users", users), users);
                else