Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
systemd
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
steam
systemd
Commits
02ee865a
Commit
02ee865a
authored
Aug 17, 2010
by
Lennart Poettering
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
service: rename ValidNoProcess= to RemainAfterExit=
parent
46948365
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
32 additions
and
34 deletions
+32
-34
fixme
fixme
+1
-3
man/systemd.service.xml
man/systemd.service.xml
+2
-2
src/dbus-service.c
src/dbus-service.c
+2
-2
src/load-fragment.c
src/load-fragment.c
+1
-1
src/service.c
src/service.c
+4
-4
src/service.h
src/service.h
+2
-2
units/arch/halt.service
units/arch/halt.service
+1
-1
units/arch/poweroff.service
units/arch/poweroff.service
+1
-1
units/arch/rc-local.service
units/arch/rc-local.service
+1
-1
units/arch/reboot.service
units/arch/reboot.service
+1
-1
units/arch/sysinit.service
units/arch/sysinit.service
+1
-1
units/fedora/halt.service
units/fedora/halt.service
+1
-1
units/fedora/killall.service
units/fedora/killall.service
+1
-1
units/fedora/poweroff.service
units/fedora/poweroff.service
+1
-1
units/fedora/rc-local.service
units/fedora/rc-local.service
+1
-1
units/fedora/reboot.service
units/fedora/reboot.service
+1
-1
units/fedora/sysinit.service
units/fedora/sysinit.service
+1
-1
units/gentoo/halt.service
units/gentoo/halt.service
+1
-1
units/gentoo/killall.service
units/gentoo/killall.service
+1
-1
units/gentoo/poweroff.service
units/gentoo/poweroff.service
+1
-1
units/gentoo/reboot.service
units/gentoo/reboot.service
+1
-1
units/suse/halt.service
units/suse/halt.service
+1
-1
units/suse/poweroff.service
units/suse/poweroff.service
+1
-1
units/suse/reboot.service
units/suse/reboot.service
+1
-1
units/var-lock.service
units/var-lock.service
+1
-1
units/var-run.service
units/var-run.service
+1
-1
No files found.
fixme
View file @
02ee865a
* 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:
...
...
man/systemd.service.xml
View file @
02ee865a
...
...
@@ -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
...
...
src/dbus-service.c
View file @
02ee865a
...
...
@@ -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
},
...
...
src/load-fragment.c
View file @
02ee865a
...
...
@@ -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"
},
...
...
src/service.c
View file @
02ee865a
...
...
@@ -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
"
"%s
ValidNoProcess
: %s
\n
"
"%s
RemainAfterExit
: %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
);
...
...
src/service.h
View file @
02ee865a
...
...
@@ -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
;
...
...
units/arch/halt.service
View file @
02ee865a
...
...
@@ -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
units/arch/poweroff.service
View file @
02ee865a
...
...
@@ -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
units/arch/rc-local.service
View file @
02ee865a
...
...
@@ -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
units/arch/reboot.service
View file @
02ee865a
...
...
@@ -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
units/arch/sysinit.service
View file @
02ee865a
...
...
@@ -16,4 +16,4 @@ ExecStart=/etc/rc.sysinit
Type
=
forking
TimeoutSec
=
0
StandardInput
=
tty
ValidNoProcess
=
yes
RemainAfterExit
=
yes
units/fedora/halt.service
View file @
02ee865a
...
...
@@ -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
units/fedora/killall.service
View file @
02ee865a
...
...
@@ -13,6 +13,6 @@ RefuseManualStart=yes
[Service]
Type
=
oneshot
ValidNoProcess
=
yes
RemainAfterExit
=
yes
ExecStart
=
-/etc/init.d/killall start
StandardOutput
=
tty
units/fedora/poweroff.service
View file @
02ee865a
...
...
@@ -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
units/fedora/rc-local.service
View file @
02ee865a
...
...
@@ -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]
...
...
units/fedora/reboot.service
View file @
02ee865a
...
...
@@ -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
units/fedora/sysinit.service
View file @
02ee865a
...
...
@@ -16,4 +16,4 @@ ExecStart=/etc/rc.d/rc.sysinit
Type
=
forking
TimeoutSec
=
0
StandardInput
=
tty
ValidNoProcess
=
yes
RemainAfterExit
=
yes
units/gentoo/halt.service
View file @
02ee865a
...
...
@@ -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
units/gentoo/killall.service
View file @
02ee865a
...
...
@@ -13,6 +13,6 @@ RefuseManualStart=yes
[Service]
Type
=
oneshot
ValidNoProcess
=
yes
RemainAfterExit
=
yes
ExecStart
=
-/etc/init.d/killprocs start
StandardOutput
=
tty
units/gentoo/poweroff.service
View file @
02ee865a
...
...
@@ -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
units/gentoo/reboot.service
View file @
02ee865a
...
...
@@ -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
units/suse/halt.service
View file @
02ee865a
...
...
@@ -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
units/suse/poweroff.service
View file @
02ee865a
...
...
@@ -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
units/suse/reboot.service
View file @
02ee865a
...
...
@@ -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
units/var-lock.service
View file @
02ee865a
...
...
@@ -14,7 +14,7 @@ Before=local-fs.target
[Service]
Type
=
oneshot
ValidNoProcess
=
yes
RemainAfterExit
=
yes
ExecStart
=
/bin/mkdir -p /var/lock/subsys
[Install]
...
...
units/var-run.service
View file @
02ee865a
...
...
@@ -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]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment