Commit 7ae14227 authored by Tollef Fog Heen's avatar Tollef Fog Heen
Browse files

Merge branch 'master' into debian

parents c7b3ac9c f6f2f493
......@@ -41,6 +41,7 @@ rootsbindir=$(rootdir)/sbin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
systemgeneratordir=$(rootdir)/lib/systemd/system-generators
systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
......@@ -62,6 +63,7 @@ AM_CPPFLAGS = \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
......@@ -95,7 +97,8 @@ rootbin_PROGRAMS = \
systemctl \
systemd-notify \
systemd-ask-password \
systemd-tty-ask-password-agent
systemd-tty-ask-password-agent \
systemd-tmpfiles
bin_PROGRAMS = \
systemd-cgls
......@@ -121,7 +124,6 @@ rootlibexec_PROGRAMS = \
systemd-reply-password \
systemd-readahead-collect \
systemd-readahead-replay \
systemd-tmpfiles \
systemd-user-sessions \
systemd-fsck \
systemd-quotacheck \
......@@ -233,6 +235,7 @@ dist_systemunit_DATA = \
units/hwclock-save.service \
units/remount-rootfs.service \
units/printer.target \
units/sound.target \
units/bluetooth.target \
units/smartcard.target \
units/systemd-readahead-done.timer \
......@@ -331,14 +334,18 @@ if TARGET_FEDORA
dist_systemunit_DATA += \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service \
units/fedora/plymouth-start.service \
units/fedora/plymouth-read-write.service \
units/fedora/plymouth-quit.service \
units/fedora/plymouth-reboot.service \
units/fedora/plymouth-kexec.service \
units/fedora/plymouth-poweroff.service \
units/fedora/plymouth-halt.service
units/fedora/halt-local.service
endif
if HAVE_PLYMOUTH
dist_systemunit_DATA += \
units/plymouth-start.service \
units/plymouth-read-write.service \
units/plymouth-quit.service \
units/plymouth-reboot.service \
units/plymouth-kexec.service \
units/plymouth-poweroff.service \
units/plymouth-halt.service
endif
dist_doc_DATA = \
......@@ -370,7 +377,8 @@ libsystemd_basic_la_SOURCES = \
src/conf-parser.c \
src/socket-util.c \
src/log.c \
src/ratelimit.c
src/ratelimit.c \
src/exit-status.c
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
......@@ -398,7 +406,6 @@ libsystemd_core_la_SOURCES = \
src/load-dropin.c \
src/execute.c \
src/utmp-wtmp.c \
src/exit-status.c \
src/dbus.c \
src/dbus-manager.c \
src/dbus-unit.c \
......@@ -480,6 +487,7 @@ MANPAGES = \
man/systemctl.1 \
man/systemadm.1 \
man/systemd-cgls.1 \
man/systemd-tmpfiles.8 \
man/systemd-notify.1 \
man/sd_notify.3 \
man/sd_readahead.3 \
......@@ -1197,13 +1205,14 @@ install-data-hook:
$(LN_S) ../var-run.mount var-run.mount && \
$(LN_S) ../var-lock.mount var-lock.mount )
( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
$(LN_S) $(systemunitdir)/swap.target swap.target && \
$(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
$(LN_S) $(systemunitdir)/printer.target printer.target)
$(LN_S) $(systemunitdir)/printer.target printer.target && \
$(LN_S) $(systemunitdir)/sound.target sound.target )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
$(LN_S) poweroff.target runlevel0.target && \
......@@ -1271,20 +1280,13 @@ install-data-hook:
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
if TARGET_FEDORA
if HAVE_PLYMOUTH
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
$(DESTDIR)$(systemunitdir)/reboot.target.wants \
$(DESTDIR)$(systemunitdir)/kexec.target.wants \
$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
$(DESTDIR)$(systemunitdir)/halt.target.wants \
$(DESTDIR)$(systemunitdir)/final.target.wants
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
$(DESTDIR)$(systemunitdir)/halt.target.wants
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f plymouth-start.service plymouth-read-write.service && \
$(LN_S) ../plymouth-start.service plymouth-start.service && \
......@@ -1304,6 +1306,16 @@ if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
rm -f plymouth-halt.service && \
$(LN_S) ../plymouth-halt.service plymouth-halt.service )
endif
if TARGET_FEDORA
$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service )
......
......@@ -30,9 +30,27 @@ REQUIREMENTS:
Linux kernel >= 2.6.30 (with autofs4, devtmpfs, cgroups)
libudev >= 163
dbus >= 1.4.0
libcap
gtk+ >= 2.20 (optional)
PAM >= 1.1.2 (optional)
libcryptsetup (optional)
libaudit (optional)
libselinux (optional)
tcpwrappers (optional)
libnotify (optional)
When you build from git you need the following additional dependencies:
vala >= 0.10
docbook-xsl
xsltproc
automake
autoconf
libtool
During runtime you need the following dependencies:
util-linux > v2.18 (requires fsck -l, agetty -s)
sulogin (from sysvinit-tools)
gtk+ >= 2.20
libcap
PAM >= 1.1.2 (optional)
plymouth (optional)
dracut (optional)
Bugs:
* somehow some /etc/fstab supplied mount params are never applied to api fs
https://bugzilla.redhat.com/show_bug.cgi?id=663108
* isolate multi-user.target doesn't start a getty@tty1 if we run it from graphical.target
* when plymouth is disabled the console password entry stuff seems to be borked
https://bugzilla.redhat.com/show_bug.cgi?id=655538
* exclude java hsp files by default
https://bugzilla.redhat.com/show_bug.cgi?id=527425
Features:
* PID heuristik bei Type=forking ausmachbar machen
* Make use of UnknownInterface, UnknownObject
* maybe introduce ExecRestartPre=
* increase password timeout
* reload PID file after reload, allow dynamically changing main PIDs
* look up crypto partition mount points via fstab to show to the user when prompting for a password
* figure out what happened to bluez patch
* Maybe store in unit files whether a service should be enabled by default on package installation
* perhaps add "systemctl reenable" as combination of "systemctl disable" and "systemctl enable"
* introduce StandardOutput=syslog+console and StandardOutput=kmsg+console to support fsck output at boot
* need a way to apply mount options of api vfs from systemd unit files
(or some other modern source?) instead of fstab
* maybe introduce ExecRestartPre=
* figure out what happened to bluez patch
* Patch systemd-fsck to use -C and pass console fd to it
......@@ -31,26 +38,18 @@ Features:
* support caching password questions in plymouth and on the console
https://bugzilla.redhat.com/show_bug.cgi?id=655538
* exclude java hsp files by default
https://bugzilla.redhat.com/show_bug.cgi?id=527425
* load EnvironmentFile= when starting services, not when reloading configuration
https://bugzilla.redhat.com/show_bug.cgi?id=661282
* support globs in systemd-tmpfiles
* drop IN_ATTRIB from inotify watches for .path units where possible to avoid
lots of wakeups due to /dev changing when we watch a subdir of /dev.
* Support ProcessNeededForShutdown=true to allow stuff like mdmon
to be killed very late after the rootfs is read only
to be killed very late after the rootfs is read only (?)
* Integrate "mdadm --wait-clean". Maybe just let SIGTERM to mdmon trigger the
needed action
* oneshot services which do not remain: 'exited' instead of 'dead'?
it should be visible in 'systemctl' that they have been run?
* dot output for --test showing the 'initial transaction'
* calendar time support in timer, iCalendar semantics for the timer stuff (RFC2445)
......@@ -105,24 +104,14 @@ Features:
* readahead: btrfs/LVM SSD detection
* when processes remain in a service even though the start command failed enter active
* add seperate man page for [Install] settings
* only add quotacheck deps to .mount units which mention grpquota/usrquota in the mount flags
* systemctl condrestart should return 0 if service isn't running
* tmpfiles: allow specification of .conf files on cmdline
* allow runtime changing of log level and target
* automatically determine TERM= based on tty name even for /dev/console
http://git.kernel.org/?p=linux/kernel/git/gregkh/tty-2.6.git;a=commitdiff;h=fbc92a3455577ab17615cbcb91826399061bd789
http://git.kernel.org/?p=linux/kernel/git/gregkh/tty-2.6.git;a=commitdiff;h=b7b8de087384cc1954a8cd075af3f9e5977caa2e
* global defaults for StandardOuput=xxx
Fedora:
* chkconfig → systemd enable/daemon-reload glue
......@@ -131,6 +120,14 @@ Fedora:
External:
* udisks should not use udisks-part-id, instead use blkid. also not probe /dev/loopxxx
* snd-seq should go, https://bugzilla.redhat.com/show_bug.cgi?id=676095
* mount.tmpfs should be optimized, https://bugzilla.redhat.com/show_bug.cgi?id=676100
* gnome-shell python script/glxinfo/is-accelerated wech
* make cryptsetup lower --iter-time
* patch kernel for xattr support in /dev, /proc/, /sys and /sys/fs/cgroup.
......@@ -138,8 +135,6 @@ External:
* patch kernel for cpu feature modalias for autoloading aes/kvm/...
http://git.kernel.org/?p=linux/kernel/git/ak/linux-misc-2.6.git;a=shortlog;h=refs/heads/cpuid-match
* place /etc/inittab with explaining blurb.
* procps, psmisc, sysvinit-tools, hostname → util-linux-ng
https://bugzilla.redhat.com/show_bug.cgi?id=614245 -- plymouth
......
......@@ -17,7 +17,7 @@
AC_PREREQ(2.63)
AC_INIT([systemd],[17],[systemd-devel@lists.freedesktop.org])
AC_INIT([systemd],[18],[systemd-devel@lists.freedesktop.org])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
......@@ -118,15 +118,12 @@ AC_SUBST(DBUS_LIBS)
have_selinux=no
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
if test "x$enable_selinux" != "xno"; then
# not using PKG_CHECK_MODULES as for some reason libselinux didn't
# install any pkg-config modules here
AC_SEARCH_LIBS([getcon], [selinux],
[AC_DEFINE(HAVE_SELINUX, 1, [Define if SELINUX is available]) have_selinux=yes],
have_selinux=no)
PKG_CHECK_MODULES(SELINUX, [ libselinux ],
[AC_DEFINE(HAVE_SELINUX, 1, [Define if SELinux is available]) have_selinux=yes], have_selinux=no)
AC_SUBST(SELINUX_CFLAGS)
AC_SUBST(SELINUX_LIBS)
if test "x$have_selinux" = xno -a "x$enable_selinux" = xyes; then
AC_MSG_ERROR([*** selinux support requested but libraries not found])
AC_MSG_ERROR([*** SELinux support requested but libraries not found])
fi
fi
AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
......@@ -236,7 +233,7 @@ if test "x$enable_libcryptsetup" != "xno"; then
AC_SUBST(LIBCRYPTSETUP_CFLAGS)
AC_SUBST(LIBCRYPTSETUP_LIBS)
if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then
AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
fi
fi
AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
......@@ -272,21 +269,22 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
AC_PATH_PROG([M4], [m4])
AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware or other]))
AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux or other]))
if test "z$with_distro" = "z"; then
if test "$cross_compiling" = yes; then
AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
else
AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
test -f "/etc/redhat-release" && with_distro="fedora"
test -f "/etc/SuSE-release" && with_distro="suse"
test -f "/etc/debian_version" && with_distro="debian"
test -f "/etc/arch-release" && with_distro="arch"
test -f "/etc/gentoo-release" && with_distro="gentoo"
test -f "/etc/slackware-version" && with_distro="slackware"
test -f "/etc/frugalware-release" && with_distro="frugalware"
test -f "/etc/altlinux-release" && with_distro="altlinux"
if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then
with_distro="ubuntu"
fi
AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
fi
if test "z$with_distro" = "z"; then
with_distro=`uname -s`
......@@ -321,11 +319,13 @@ case $with_distro in
SPECIAL_SYSLOG_SERVICE=rsyslog.service
AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
M4_DISTRO_FLAG=-DTARGET_FEDORA=1
have_plymouth=true
;;
suse)
SYSTEM_SYSVRCND_PATH=/etc/init.d
AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE])
M4_DISTRO_FLAG=-DTARGET_SUSE=1
have_plymouth=true
;;
debian)
SYSTEM_SYSVRCND_PATH=/etc
......@@ -365,6 +365,12 @@ case $with_distro in
AC_DEFINE(TARGET_FRUGALWARE, [], [Target is Frugalware])
M4_DISTRO_FLAG=-DTARGET_FRUGALWARE=1
;;
altlinux)
SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
SYSTEM_SYSVRCND_PATH=/etc/rc.d
AC_DEFINE(TARGET_ALTLINUX, [], [Target is ALTLinux])
M4_DISTRO_FLAG=-DTARGET_ALTLINUX=1
;;
other)
AS_IF([test "x$with_syslog_service" = "x"],
[AC_MSG_ERROR([With --distro=other, you must pass --with-syslog-service= to configure])])
......@@ -421,6 +427,9 @@ AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
AM_CONDITIONAL(HAVE_PLYMOUTH, test -n "$have_plymouth")
AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
......
......@@ -4,13 +4,13 @@ saved_LIBS="$LIBS"
LIBS="$LIBS -lwrap"
AC_MSG_CHECKING([for tcpwrap library and headers])
AC_LINK_IFELSE(
AC_LANG_PROGRAM(
[AC_LANG_PROGRAM(
[#include <tcpd.h>
#include <syslog.h>
int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING;],
[struct request_info *req;
return hosts_access (req);]),
return hosts_access (req);])],
[AC_DEFINE(HAVE_LIBWRAP, [], [Have tcpwrap?])
LIBWRAP_LIBS="-lwrap"
AC_MSG_RESULT(yes)],
......
......@@ -39,7 +39,7 @@ AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [
AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]),
[ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $1"
AC_COMPILE_IFELSE([int a;],
AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a;])],
[eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"],
[eval "AS_TR_SH([cc_cv_cflags_$1])='no'"])
CFLAGS="$ac_save_CFLAGS"
......@@ -147,7 +147,7 @@ AC_DEFUN([CC_CHECK_ATTRIBUTE], [
AS_TR_SH([cc_cv_attribute_$1]),
[ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $cc_cv_werror"
AC_COMPILE_IFELSE([$3],
AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])],
[eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"],
[eval "AS_TR_SH([cc_cv_attribute_$1])='no'"])
CFLAGS="$ac_save_CFLAGS"
......@@ -271,11 +271,11 @@ AC_DEFUN([CC_FUNC_EXPECT], [
[cc_cv_func_expect],
[ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $cc_cv_werror"
AC_COMPILE_IFELSE(
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[int some_function() {
int a = 3;
return (int)__builtin_expect(a, 3);
}],
}])],
[cc_cv_func_expect=yes],
[cc_cv_func_expect=no])
CFLAGS="$ac_save_CFLAGS"
......@@ -295,11 +295,11 @@ AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
[ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $cc_cv_werror"
for cc_attribute_align_try in 64 32 16 8 4 2; do
AC_COMPILE_IFELSE([
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
int main() {
static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0;
return c;
}], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
}])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
done
CFLAGS="$ac_save_CFLAGS"
])
......
......@@ -202,17 +202,43 @@
</varlistentry>
<varlistentry>
<term><option>keep-root=</option></term>
<term><option>kill-only-users=</option></term>
<listitem><para>Takes a boolean
argument. If true, all processes
created by the root user (UID 0) during his
session and from his session will be
kept around after he logged out. This
option allows cancelling the effect of
<option>kill-session=1</option> and
<option>kill-user=1</option> for the
root user.</para></listitem>
<listitem><para>Takes a comma
separated list of user names or
numeric user ids as argument. If this
option is used the effect of the
<option>kill-session=</option> and
<option>kill-user=</option> options
will apply only to the listed
users. If this option is not used the
option applies to all local
users. Note that
<option>kill-exclude-users=</option>
takes precedence over this list and is
hence subtracted from the list
specified here.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>kill-exclude-users=</option></term>
<listitem><para>Takes a comma
separated list of user names or
numeric user ids as argument. Users
listed in this argument will not be
subject to the effect of
<option>kill-session=</option> or
<option>kill-user=</option>. Note
that that this option takes precedence
over
<option>kill-only-users=</option>, and
hence whatever is listed for
<option>kill-exclude-users=</option>
is guaranteed to never be killed by
this PAM module, independent of any
other configuration
setting.</para></listitem>
</varlistentry>
<varlistentry>
......@@ -222,17 +248,30 @@
separated list of cgroup controllers
in which hierarchies a user/session
cgroup will be created by default for
each user logging in. If ommited,
defaults to 'cpu', meaning that in
addition to creating per-user and
per-session cgroups in systemd's own
hierarchy, groups are created in the
'cpu' hierarchy, on order to ensure
that every use and every sessions gets
an equal amount of CPU time,
regardless how many processes a user
or session might
own.</para></listitem>
each user logging in, in addition to
the cgroup in the named 'name=systemd'
hierarchy. If ommited, defaults to an
empty list. This may be used to move
user sessions into their own groups in
the 'cpu' hierarchy which ensures that
every logged in user gets an equal
amount of CPU time regardless how many
processes he has
started.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>reset-controllers=</option></term>
<listitem><para>Takes a comma
separated list of cgroup controllers
in which hierarchies the logged in
processes will be reset to the root
cgroup. If ommited, defaults to 'cpu',
meaning that a 'cpu' cgroup grouping
inherited from the login manager will
be reset for the processes of the
logged in user.</para></listitem>
</varlistentry>
</variablelist>
......@@ -245,7 +284,10 @@
<option>create-session=1</option>,
<option>kill-session=0</option>,
<option>kill-user=0</option>,
<option>keep-root=1</option>.</para>
<option>keep-root=1</option>,
<option>reset-controllers=cpu</option>,
<option>kill-only-users=</option>,
<option>kill-exclude-users=root</option>.</para>
</refsect1>
<refsect1>
......
......@@ -126,6 +126,15 @@
they are set or not.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--failed</option></term>
<listitem><para>When listing units,
show only failed units. Do not confuse
with
<option>--fail</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--full</option></term>
......@@ -144,7 +153,24 @@
unfinished job, fail the command. If
this is not specified the requested
operation will replace the pending job,
if necessary.</para></listitem>
if necessary. Do not confuse
with
<option>--failed</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--ignore-dependencies</option></term>
<listitem><para>When enqueuing a new
job ignore all its dependencies and
execute it immediately. If passed no
required units of the unit passed will
be pulled in, and no ordering
dependencies will be honoured. This is
mostly a debugging and rescue tool for
the administrator and should not be
used by
applications.</para></listitem>
</varlistentry>
<varlistentry>
......
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!--
This file is part of systemd.
Copyright 2010 Lennart Poettering
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.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="systemd-tmpfiles">
<refentryinfo>
<title>systemd-tmpfiles</title>
<productname>systemd</productname>
<authorgroup>
<author>
<contrib>Developer</contrib>
<firstname>Lennart</firstname>
<surname>Poettering</surname>
<email>lennart@poettering.net</email>
</author>
</authorgroup>
</refentryinfo>
<refmeta>
<refentrytitle>systemd-tmpfiles</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
<refnamediv>
<refname>systemd-tmpfiles</refname>
<refpurpose>Creates, deletes and cleans up volatile
and temporary files and directories.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>systemd-tmpfiles <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">CONFIGURATION FILE</arg></command>
</cmdsynopsis>