[systemd-commits] 2 commits - Makefile.am src/main.c units/frugalware

[Lennart Poettering]

 Makefile.am                              |    5 +++++
 src/main.c                               |    1 -
 units/frugalware/display-manager.service |   19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 196e3fa74a88a04b0ecec7d3af648287dd088f8a
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Wed Mar 9 00:49:47 2011 +0100

    Add Frugalware display-manager service

diff --git a/Makefile.am b/Makefile.am
index f7b7053..3bac478 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -360,6 +360,11 @@ dist_systemunit_DATA += \
 	units/fedora/halt-local.service
 endif
 
+if TARGET_FRUGALWARE
+dist_systemunit_DATA += \
+	units/frugalware/display-manager.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
 	units/plymouth-start.service \
diff --git a/units/frugalware/display-manager.service b/units/frugalware/display-manager.service
new file mode 100644
index 0000000..a092c56
--- /dev/null
+++ b/units/frugalware/display-manager.service
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Display Manager
+After=syslog.target local.service systemd-user-sessions.service
+
+Conflicts=splashy-quit.service
+After=splashy-quit.service
+
+[Service]
+EnvironmentFile=/etc/sysconfig/desktop
+ExecStart=/bin/bash -c "exec ${desktop}"
+Restart=always
+RestartSec=0

commit bba6cb45a501916f0e99d5b25c45f40ba6088649
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Wed Mar 16 03:50:39 2011 +0100

    main: revert recognition of "b" argument
    
    Commit 099663ff8c117303af369a4d412dafed0c5614c2 added "b" as a
    recognized argument, however, B is not a runlevel like S. (B appears
    as a pseudo runlevel in openSUSE's init.d scripts only for the sake of
    insserv being able to manage /etc/init.d/boot.d like the other dirs).

diff --git a/src/main.c b/src/main.c
index 1d6ac42..5154b57 100644
--- a/src/main.c
+++ b/src/main.c
@@ -227,7 +227,6 @@ static int parse_proc_cmdline_word(const char *word) {
         static const char * const rlmap[] = {
                 "emergency", SPECIAL_EMERGENCY_TARGET,
                 "-b",        SPECIAL_EMERGENCY_TARGET,
-                "b",         SPECIAL_EMERGENCY_TARGET,
                 "single",    SPECIAL_RESCUE_TARGET,
                 "-s",        SPECIAL_RESCUE_TARGET,
                 "s",         SPECIAL_RESCUE_TARGET,