service: rename ValidNoProcess= to RemainAfterExit=

diff --git a/fixme b/fixme
index 101cebb2ccf7656e0f92123bf3133b112fc44223..de3543e7b28d8e79dd47a93368513c58a325883b 100644 (file)
--- a/fixme
+++ b/fixme
@@ -1,6 +1,3 @@
-* ValidNoProcess= ? ContinueAfterExit=, ActiveAfterExit=, KeepAfterExit=
-  (after this change update udev service files)
-
 * systemd.log_level=debug should overwrite 'quiet' ?
 
 * implicit 'default.target' ?
@@ -107,6 +104,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=617317 -- acpid
 https://bugzilla.redhat.com/show_bug.cgi?id=617327 -- gpm
 https://bugzilla.redhat.com/show_bug.cgi?id=617330 -- pcsc-lite
 https://bugzilla.redhat.com/show_bug.cgi?id=617321 -- audit
+https://bugzilla.redhat.com/show_bug.cgi?id=617316 -- abrt
 
 Regularly:
 

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index c3eebeabc1950395f31b1f03340dbe846c25fe9c..c0fc9a989ceb9d550cdf8df82dc1eaddbd528c69 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -164,7 +164,7 @@
                                 to <option>simple</option>, however
                                 it is expected that the process has to
                                 exit before systemd starts follow-up
-                                units. <varname>ValidNoProcess=</varname>
+                                units. <varname>RemainAfterExit=</varname>
                                 is particularly useful for this type
                                 of service.</para>
 
@@ -205,7 +205,7 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>ValidNoProcess=</varname></term>
+                                <term><varname>RemainAfterExit=</varname></term>
 
                                 <listitem><para>Takes a boolean value
                                 that specifies whether the service

diff --git a/src/dbus-service.c b/src/dbus-service.c
index 608cb4fe149dd6e304a8bbd9918c92b2426b4b82..59222066ea54f304efab419e3462f23efed9f904 100644 (file)
--- a/src/dbus-service.c
+++ b/src/dbus-service.c
@@ -42,7 +42,7 @@
         BUS_EXEC_CONTEXT_INTERFACE                                      \
         "  <property name=\"PermissionsStartOnly\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"RootDirectoryStartOnly\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"ValidNoProcess\" type=\"b\" access=\"read\"/>\n" \
+        "  <property name=\"RemainAfterExit\" type=\"b\" access=\"read\"/>\n" \
         BUS_EXEC_STATUS_INTERFACE("ExecMain")                           \
         "  <property name=\"MainPID\" type=\"u\" access=\"read\"/>\n"   \
         "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
@@ -86,7 +86,7 @@ DBusHandlerResult bus_service_message_handler(Unit *u, DBusConnection *connectio
                 BUS_EXEC_CONTEXT_PROPERTIES("org.freedesktop.systemd1.Service", u->service.exec_context),
                 { "org.freedesktop.systemd1.Service", "PermissionsStartOnly",   bus_property_append_bool,   "b", &u->service.permissions_start_only    },
                 { "org.freedesktop.systemd1.Service", "RootDirectoryStartOnly", bus_property_append_bool,   "b", &u->service.root_directory_start_only },
-                { "org.freedesktop.systemd1.Service", "ValidNoProcess",         bus_property_append_bool,   "b", &u->service.valid_no_process          },
+                { "org.freedesktop.systemd1.Service", "RemainAfterExit",        bus_property_append_bool,   "b", &u->service.remain_after_exit          },
                 BUS_EXEC_STATUS_PROPERTIES("org.freedesktop.systemd1.Service", u->service.main_exec_status, "ExecMain"),
                 { "org.freedesktop.systemd1.Service", "MainPID",                bus_property_append_pid,    "u", &u->service.main_pid                  },
                 { "org.freedesktop.systemd1.Service", "ControlPID",             bus_property_append_pid,    "u", &u->service.control_pid               },

diff --git a/src/load-fragment.c b/src/load-fragment.c
index 185c07756e561346a8bca63515498c5d5db5ff97..103e0569616273b54618c0728a5ae70d3a4e8183 100644 (file)
--- a/src/load-fragment.c
+++ b/src/load-fragment.c
@@ -1597,7 +1597,7 @@ static int load_from_path(Unit *u, const char *path) {
                 { "Restart",                config_parse_service_restart, &u->service.restart,                             "Service" },
                 { "PermissionsStartOnly",   config_parse_bool,            &u->service.permissions_start_only,              "Service" },
                 { "RootDirectoryStartOnly", config_parse_bool,            &u->service.root_directory_start_only,           "Service" },
-                { "ValidNoProcess",         config_parse_bool,            &u->service.valid_no_process,                    "Service" },
+                { "RemainAfterExit",        config_parse_bool,            &u->service.remain_after_exit,                   "Service" },
                 { "SysVStartPriority",      config_parse_sysv_priority,   &u->service.sysv_start_priority,                 "Service" },
                 { "NonBlocking",            config_parse_bool,            &u->service.exec_context.non_blocking,           "Service" },
                 { "BusName",                config_parse_string_printf,   &u->service.bus_name,                            "Service" },

diff --git a/src/service.c b/src/service.c
index bc856084b5b5120e2586ea8516c72bd1040080d8..ff74a6d6689576d07ad5d6c045215b5d37adb3c1 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -706,7 +706,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
         /* Special setting for all SysV services */
         s->type = SERVICE_FORKING;
-        s->valid_no_process = true;
+        s->remain_after_exit = true;
         s->restart = SERVICE_ONCE;
         s->exec_context.std_output = s->meta.manager->sysv_console ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
         s->exec_context.kill_mode = KILL_PROCESS_GROUP;
@@ -951,14 +951,14 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sService State: %s\n"
                 "%sPermissionsStartOnly: %s\n"
                 "%sRootDirectoryStartOnly: %s\n"
-                "%sValidNoProcess: %s\n"
+                "%sRemainAfterExit: %s\n"
                 "%sType: %s\n"
                 "%sRestart: %s\n"
                 "%sNotifyAccess: %s\n",
                 prefix, service_state_to_string(s->state),
                 prefix, yes_no(s->permissions_start_only),
                 prefix, yes_no(s->root_directory_start_only),
-                prefix, yes_no(s->valid_no_process),
+                prefix, yes_no(s->remain_after_exit),
                 prefix, service_type_to_string(s->type),
                 prefix, service_restart_to_string(s->restart),
                 prefix, notify_access_to_string(s->notify_access));
@@ -1669,7 +1669,7 @@ static void service_enter_running(Service *s, bool success) {
         if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
             (s->bus_name_good || s->type != SERVICE_DBUS))
                 service_set_state(s, SERVICE_RUNNING);
-        else if (s->valid_no_process)
+        else if (s->remain_after_exit)
                 service_set_state(s, SERVICE_EXITED);
         else
                 service_enter_stop(s, true);

diff --git a/src/service.h b/src/service.h
index 3a033929fbae45526b1d80a5948ca906224c4960..0fdcb62d540fc309e45cd5cb6675dc205d99c919 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -33,7 +33,7 @@ typedef enum ServiceState {
         SERVICE_START,
         SERVICE_START_POST,
         SERVICE_RUNNING,
-        SERVICE_EXITED,            /* Nothing is running anymore, but ValidNoProcess is true, ehnce this is OK */
+        SERVICE_EXITED,            /* Nothing is running anymore, but RemainAfterExit is true, ehnce this is OK */
         SERVICE_RELOAD,
         SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */
         SERVICE_STOP_SIGTERM,
@@ -109,7 +109,7 @@ struct Service {
 
         bool permissions_start_only;
         bool root_directory_start_only;
-        bool valid_no_process;
+        bool remain_after_exit;
 
         /* If we shut down, remember why */
         bool failure:1;

diff --git a/units/arch/halt.service b/units/arch/halt.service
index dbfc22878777e7ae7d4b77ce6442136b9950f110..2079bc025c5142df76a61343db41e9348fef482f 100644 (file)
--- a/units/arch/halt.service
+++ b/units/arch/halt.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/rc.shutdown
 StandardOutput=tty

diff --git a/units/arch/poweroff.service b/units/arch/poweroff.service
index bd563ba586bd2681101bcb9ed0a2f04c1dc84487..df2812fd9b6119f5a5579eb7c2b63fdb2457425c 100644 (file)
--- a/units/arch/poweroff.service
+++ b/units/arch/poweroff.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/rc.shutdown
 StandardOutput=tty

diff --git a/units/arch/rc-local.service b/units/arch/rc-local.service
index 596861ac95b63fe20bd5475194b0d9d2a0bdb7de..0005e9aefb0aebf33311329c2e7cb1206dae19f1 100644 (file)
--- a/units/arch/rc-local.service
+++ b/units/arch/rc-local.service
@@ -13,7 +13,7 @@ ExecStart=/etc/rc.local
 ExectStop=/etc/rc.local.shutdown
 TimeoutSec=0
 StandardInput=tty
-ValidNoProcess=yes
+RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target

diff --git a/units/arch/reboot.service b/units/arch/reboot.service
index 6bce95d8fd409a1cfeb28cb5e53525abf6e61a2d..ae5c979e3e7a65fbc05ca149690ec3a26ad2e89d 100644 (file)
--- a/units/arch/reboot.service
+++ b/units/arch/reboot.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=RUNLEVEL=6
 ExecStart=/etc/rc.shutdown
 StandardOutput=tty

diff --git a/units/arch/sysinit.service b/units/arch/sysinit.service
index 880deccf9c8e7a04987be908310f4548a9042151..ae80f18e8d051799d81dd3f0a570f0967b3ca0ce 100644 (file)
--- a/units/arch/sysinit.service
+++ b/units/arch/sysinit.service
@@ -16,4 +16,4 @@ ExecStart=/etc/rc.sysinit
 Type=forking
 TimeoutSec=0
 StandardInput=tty
-ValidNoProcess=yes
+RemainAfterExit=yes

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index a6c4786a8b91ce6ab21502f9a529a2db8e1fbb9e..c337dce6d9ad4523c2723f5f1ef173dcfc34b554 100644 (file)
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=INIT_HALT=HALT RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
 StandardOutput=tty

diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 53c65d4a3bb7108a8213dda6afae0bb46124d5ff..b81b6a83d1148a462ed93af8e5b43a6d2afb16f0 100644 (file)
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -13,6 +13,6 @@ RefuseManualStart=yes
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 ExecStart=-/etc/init.d/killall start
 StandardOutput=tty

diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index 7597f4f651f6e9cfd5346e5c55ecd5a11cf86f30..dbbed75d6d9caec12f2746a9525656e1bbad2b81 100644 (file)
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
 StandardOutput=tty

diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index aff12901282d832c6ca16577214320a9079caf03..90a38a01bd97436fef3d4f09ad649b30a0b3536a 100644 (file)
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -16,7 +16,7 @@ Names=rc-local.service local.service
 ExecStart=/etc/rc.local start
 TimeoutSec=0
 StandardOutput=tty
-ValidNoProcess=yes
+RemainAfterExit=yes
 SysVStartPriority=99
 
 [Install]

diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 6120ceb8213ad4193fc26cfdd9b27a2c5ce0a1e8..ca8b3b182a5f52bb079dee164523ce2a57a8402c 100644 (file)
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=RUNLEVEL=6
 ExecStart=/etc/init.d/reboot start
 StandardOutput=tty

diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service
index 0c25bd2538ebddab0d0b442a91d586e2eb186f2a..860d3a34589bc932a495ff4dd5b3594ff1682bf5 100644 (file)
--- a/units/fedora/sysinit.service
+++ b/units/fedora/sysinit.service
@@ -16,4 +16,4 @@ ExecStart=/etc/rc.d/rc.sysinit
 Type=forking
 TimeoutSec=0
 StandardInput=tty
-ValidNoProcess=yes
+RemainAfterExit=yes

diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index 826c69f061394022be856883557bc39dc452cff1..d97b942fe069a4f87d1e05ac3671cc294e0c32e4 100644 (file)
--- a/units/gentoo/halt.service
+++ b/units/gentoo/halt.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=INIT_HALT=HALT RC_DOWN_HARDDISK=yes
 ExecStart=/etc/init.d/shutdown.sh
 StandardOutput=tty

diff --git a/units/gentoo/killall.service b/units/gentoo/killall.service
index 8b42af87b52f1bb4500cf91fdf2ac578d1fe5ebc..de994d1f03ea24d3d9eee591fc82b0229ca29f78 100644 (file)
--- a/units/gentoo/killall.service
+++ b/units/gentoo/killall.service
@@ -13,6 +13,6 @@ RefuseManualStart=yes
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 ExecStart=-/etc/init.d/killprocs start
 StandardOutput=tty

diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
index 8a5a62794f18014de13a54e12d14ffd762d5d742..2483f9448ce2dfa3a9979887f702a7b132fc39b3 100644 (file)
--- a/units/gentoo/poweroff.service
+++ b/units/gentoo/poweroff.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=RC_DOWN_HARDDISK=yes
 ExecStart=/etc/init.d/shutdown.sh
 StandardOutput=tty

diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index b5defb16807cb5608a5a662ec35e74cb4c5fa0f8..8f8d7328c7e9aea2c0cbe83fcd7e92517cd1aa7f 100644 (file)
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -13,6 +13,6 @@ After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 ExecStart=/etc/init.d/reboot.sh
 StandardOutput=tty

diff --git a/units/suse/halt.service b/units/suse/halt.service
index 32b7dc204a702ac100e411feff3099e986ba0e65..d826ca3e22d846832e1221ca6862e81376ce3f80 100644 (file)
--- a/units/suse/halt.service
+++ b/units/suse/halt.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=INIT_HALT=HALT RUNLEVEL=0 COLD_BOOT=1
 ExecStart=/etc/init.d/halt
 StandardOutput=tty

diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
index 13b13b04279f88602acc893ff7cdeab6609da672..fe8c67761e61c7b18de61d38ba0a75d8a3673c1b 100644 (file)
--- a/units/suse/poweroff.service
+++ b/units/suse/poweroff.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=COLD_BOOT=1
 ExecStart=/etc/init.d/halt
 StandardOutput=tty

diff --git a/units/suse/reboot.service b/units/suse/reboot.service
index 3ee290e659bd6c5ee741732c9e3193ba6e79833c..001d1364a0f205c84c9ed30e193b9b6e6bd341f7 100644 (file)
--- a/units/suse/reboot.service
+++ b/units/suse/reboot.service
@@ -13,7 +13,7 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 Environment=COLD_BOOT=1
 ExecStart=/etc/init.d/reboot
 StandardOutput=tty

diff --git a/units/var-lock.service b/units/var-lock.service
index d382958aea4ef14baa03c8a2d2730e650bd27c5c..82ba6de207ea6eff365f21673b554650a4e19d0a 100644 (file)
--- a/units/var-lock.service
+++ b/units/var-lock.service
@@ -14,7 +14,7 @@ Before=local-fs.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 ExecStart=/bin/mkdir -p /var/lock/subsys
 
 [Install]

diff --git a/units/var-run.service b/units/var-run.service
index a958ff7d11125e762efa56fb9bba7d543ae180c0..38e072025be4f02bf3d617301bacc72febb74d08 100644 (file)
--- a/units/var-run.service
+++ b/units/var-run.service
@@ -14,7 +14,7 @@ Before=local-fs.target
 
 [Service]
 Type=oneshot
-ValidNoProcess=yes
+RemainAfterExit=yes
 ExecStart=/bin/touch /var/run/utmp ; /bin/chmod 0664 /var/run/utmp ; /bin/chown root:utmp /var/run/utmp
 
 [Install]