picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

service: rename ValidNoProcess= to RemainAfterExit=

Browse source
This commit is contained in:
Lennart Poettering 2010-08-17 19:37:36 +02:00
parent 4694836523
commit 02ee865a46
26 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fixme
View file

@ -1,6 +1,3 @@
* ValidNoProcess= ? ContinueAfterExit=, ActiveAfterExit=, KeepAfterExit=
(after this change update udev service files)
* systemd.log_level=debug should overwrite 'quiet' ? * systemd.log_level=debug should overwrite 'quiet' ?
* implicit 'default.target' ? * 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=617327 -- gpm
https://bugzilla.redhat.com/show_bug.cgi?id=617330 -- pcsc-lite 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=617321 -- audit
https://bugzilla.redhat.com/show_bug.cgi?id=617316 -- abrt
Regularly: Regularly:

4
man/systemd.service.xml
View file

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

4
src/dbus-service.c
View file

@ -42,7 +42,7 @@
BUS_EXEC_CONTEXT_INTERFACE \ BUS_EXEC_CONTEXT_INTERFACE \
" <property name=\"PermissionsStartOnly\" type=\"b\" access=\"read\"/>\n" \ " <property name=\"PermissionsStartOnly\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"RootDirectoryStartOnly\" 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") \ BUS_EXEC_STATUS_INTERFACE("ExecMain") \
" <property name=\"MainPID\" type=\"u\" access=\"read\"/>\n" \ " <property name=\"MainPID\" type=\"u\" access=\"read\"/>\n" \
" <property name=\"ControlPID\" 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), 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", "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", "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"), 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", "MainPID", bus_property_append_pid, "u", &u->service.main_pid },
{ "org.freedesktop.systemd1.Service", "ControlPID", bus_property_append_pid, "u", &u->service.control_pid }, { "org.freedesktop.systemd1.Service", "ControlPID", bus_property_append_pid, "u", &u->service.control_pid },

2
src/load-fragment.c
View file

@ -1597,7 +1597,7 @@ static int load_from_path(Unit *u, const char *path) {
{ "Restart", config_parse_service_restart, &u->service.restart, "Service" }, { "Restart", config_parse_service_restart, &u->service.restart, "Service" },
{ "PermissionsStartOnly", config_parse_bool, &u->service.permissions_start_only, "Service" }, { "PermissionsStartOnly", config_parse_bool, &u->service.permissions_start_only, "Service" },
{ "RootDirectoryStartOnly", config_parse_bool, &u->service.root_directory_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" }, { "SysVStartPriority", config_parse_sysv_priority, &u->service.sysv_start_priority, "Service" },
{ "NonBlocking", config_parse_bool, &u->service.exec_context.non_blocking, "Service" }, { "NonBlocking", config_parse_bool, &u->service.exec_context.non_blocking, "Service" },
{ "BusName", config_parse_string_printf, &u->service.bus_name, "Service" }, { "BusName", config_parse_string_printf, &u->service.bus_name, "Service" },

8
src/service.c
View file

@ -706,7 +706,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
/* Special setting for all SysV services */ /* Special setting for all SysV services */
s->type = SERVICE_FORKING; s->type = SERVICE_FORKING;
s->valid_no_process = true; s->remain_after_exit = true;
s->restart = SERVICE_ONCE; s->restart = SERVICE_ONCE;
s->exec_context.std_output = s->meta.manager->sysv_console ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL; s->exec_context.std_output = s->meta.manager->sysv_console ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
s->exec_context.kill_mode = KILL_PROCESS_GROUP; 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" "%sService State: %s\n"
"%sPermissionsStartOnly: %s\n" "%sPermissionsStartOnly: %s\n"
"%sRootDirectoryStartOnly: %s\n" "%sRootDirectoryStartOnly: %s\n"
"%sValidNoProcess: %s\n" "%sRemainAfterExit: %s\n"
"%sType: %s\n" "%sType: %s\n"
"%sRestart: %s\n" "%sRestart: %s\n"
"%sNotifyAccess: %s\n", "%sNotifyAccess: %s\n",
prefix, service_state_to_string(s->state), prefix, service_state_to_string(s->state),
prefix, yes_no(s->permissions_start_only), prefix, yes_no(s->permissions_start_only),
prefix, yes_no(s->root_directory_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_type_to_string(s->type),
prefix, service_restart_to_string(s->restart), prefix, service_restart_to_string(s->restart),
prefix, notify_access_to_string(s->notify_access)); 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)) && if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
(s->bus_name_good || s->type != SERVICE_DBUS)) (s->bus_name_good || s->type != SERVICE_DBUS))
service_set_state(s, SERVICE_RUNNING); service_set_state(s, SERVICE_RUNNING);
else if (s->valid_no_process) else if (s->remain_after_exit)
service_set_state(s, SERVICE_EXITED); service_set_state(s, SERVICE_EXITED);
else else
service_enter_stop(s, true); service_enter_stop(s, true);

4
src/service.h
View file

@ -33,7 +33,7 @@ typedef enum ServiceState {
SERVICE_START, SERVICE_START,
SERVICE_START_POST, SERVICE_START_POST,
SERVICE_RUNNING, 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_RELOAD,
SERVICE_STOP, /* No STOP_PRE state, instead just register multiple STOP executables */ SERVICE_STOP, /* No STOP_PRE state, instead just register multiple STOP executables */
SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGTERM,
@ -109,7 +109,7 @@ struct Service {
bool permissions_start_only; bool permissions_start_only;
bool root_directory_start_only; bool root_directory_start_only;
bool valid_no_process; bool remain_after_exit;
/* If we shut down, remember why */ /* If we shut down, remember why */
bool failure:1; bool failure:1;

2
units/arch/halt.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=RUNLEVEL=0 Environment=RUNLEVEL=0
ExecStart=/etc/rc.shutdown ExecStart=/etc/rc.shutdown
StandardOutput=tty StandardOutput=tty

2
units/arch/poweroff.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=RUNLEVEL=0 Environment=RUNLEVEL=0
ExecStart=/etc/rc.shutdown ExecStart=/etc/rc.shutdown
StandardOutput=tty StandardOutput=tty

2
units/arch/rc-local.service
View file

@ -13,7 +13,7 @@ ExecStart=/etc/rc.local
ExectStop=/etc/rc.local.shutdown ExectStop=/etc/rc.local.shutdown
TimeoutSec=0 TimeoutSec=0
StandardInput=tty StandardInput=tty
ValidNoProcess=yes RemainAfterExit=yes
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
units/arch/reboot.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=RUNLEVEL=6 Environment=RUNLEVEL=6
ExecStart=/etc/rc.shutdown ExecStart=/etc/rc.shutdown
StandardOutput=tty StandardOutput=tty

2
units/arch/sysinit.service
View file

@ -16,4 +16,4 @@ ExecStart=/etc/rc.sysinit
Type=forking Type=forking
TimeoutSec=0 TimeoutSec=0
StandardInput=tty StandardInput=tty
ValidNoProcess=yes RemainAfterExit=yes

2
units/fedora/halt.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=INIT_HALT=HALT RUNLEVEL=0 Environment=INIT_HALT=HALT RUNLEVEL=0
ExecStart=/etc/init.d/halt start ExecStart=/etc/init.d/halt start
StandardOutput=tty StandardOutput=tty

2
units/fedora/killall.service
View file

@ -13,6 +13,6 @@ RefuseManualStart=yes
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
ExecStart=-/etc/init.d/killall start ExecStart=-/etc/init.d/killall start
StandardOutput=tty StandardOutput=tty

2
units/fedora/poweroff.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=RUNLEVEL=0 Environment=RUNLEVEL=0
ExecStart=/etc/init.d/halt start ExecStart=/etc/init.d/halt start
StandardOutput=tty StandardOutput=tty

2
units/fedora/rc-local.service
View file

@ -16,7 +16,7 @@ Names=rc-local.service local.service
ExecStart=/etc/rc.local start ExecStart=/etc/rc.local start
TimeoutSec=0 TimeoutSec=0
StandardOutput=tty StandardOutput=tty
ValidNoProcess=yes RemainAfterExit=yes
SysVStartPriority=99 SysVStartPriority=99
[Install] [Install]

2
units/fedora/reboot.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=RUNLEVEL=6 Environment=RUNLEVEL=6
ExecStart=/etc/init.d/reboot start ExecStart=/etc/init.d/reboot start
StandardOutput=tty StandardOutput=tty

2
units/fedora/sysinit.service
View file

@ -16,4 +16,4 @@ ExecStart=/etc/rc.d/rc.sysinit
Type=forking Type=forking
TimeoutSec=0 TimeoutSec=0
StandardInput=tty StandardInput=tty
ValidNoProcess=yes RemainAfterExit=yes

2
units/gentoo/halt.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=INIT_HALT=HALT RC_DOWN_HARDDISK=yes Environment=INIT_HALT=HALT RC_DOWN_HARDDISK=yes
ExecStart=/etc/init.d/shutdown.sh ExecStart=/etc/init.d/shutdown.sh
StandardOutput=tty StandardOutput=tty

2
units/gentoo/killall.service
View file

@ -13,6 +13,6 @@ RefuseManualStart=yes
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
ExecStart=-/etc/init.d/killprocs start ExecStart=-/etc/init.d/killprocs start
StandardOutput=tty StandardOutput=tty

2
units/gentoo/poweroff.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target killall.service
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=RC_DOWN_HARDDISK=yes Environment=RC_DOWN_HARDDISK=yes
ExecStart=/etc/init.d/shutdown.sh ExecStart=/etc/init.d/shutdown.sh
StandardOutput=tty StandardOutput=tty

2
units/gentoo/reboot.service
View file

@ -13,6 +13,6 @@ After=shutdown.target umount.target killall.service
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
ExecStart=/etc/init.d/reboot.sh ExecStart=/etc/init.d/reboot.sh
StandardOutput=tty StandardOutput=tty

2
units/suse/halt.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=INIT_HALT=HALT RUNLEVEL=0 COLD_BOOT=1 Environment=INIT_HALT=HALT RUNLEVEL=0 COLD_BOOT=1
ExecStart=/etc/init.d/halt ExecStart=/etc/init.d/halt
StandardOutput=tty StandardOutput=tty

2
units/suse/poweroff.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=COLD_BOOT=1 Environment=COLD_BOOT=1
ExecStart=/etc/init.d/halt ExecStart=/etc/init.d/halt
StandardOutput=tty StandardOutput=tty

2
units/suse/reboot.service
View file

@ -13,7 +13,7 @@ After=shutdown.target umount.target
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
Environment=COLD_BOOT=1 Environment=COLD_BOOT=1
ExecStart=/etc/init.d/reboot ExecStart=/etc/init.d/reboot
StandardOutput=tty StandardOutput=tty

2
units/var-lock.service
View file

@ -14,7 +14,7 @@ Before=local-fs.target
[Service] [Service]
Type=oneshot Type=oneshot
ValidNoProcess=yes RemainAfterExit=yes
ExecStart=/bin/mkdir -p /var/lock/subsys ExecStart=/bin/mkdir -p /var/lock/subsys
[Install] [Install]

2
units/var-run.service
View file

@ -14,7 +14,7 @@ Before=local-fs.target
[Service] [Service]
Type=oneshot 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 ExecStart=/bin/touch /var/run/utmp ; /bin/chmod 0664 /var/run/utmp ; /bin/chown root:utmp /var/run/utmp
[Install] [Install]