From f92a18f5274ad506aed600b2ed8f4a560c510807 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Jun 2010 18:43:40 +0200 Subject: units: introduce and explain sysinit.target --- units/.gitignore | 2 +- units/basic.target | 14 ++++++++++++++ units/basic.target.m4 | 21 --------------------- units/dev-hugepages.automount | 2 +- units/dev-mqueue.automount | 2 +- units/proc-sys-fs-binfmt_misc.automount | 2 +- units/sys-kernel-debug.automount | 2 +- units/sys-kernel-security.automount | 2 +- units/sysinit.target.m4 | 19 +++++++++++++++++++ units/systemd-initctl.socket | 1 + units/systemd-logger.socket | 1 + 11 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 units/basic.target delete mode 100644 units/basic.target.m4 create mode 100644 units/sysinit.target.m4 (limited to 'units') diff --git a/units/.gitignore b/units/.gitignore index 7e61543864..ea85dc081e 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,7 +1,7 @@ systemd-initctl.service systemd-logger.service syslog.target -basic.target +sysinit.target graphical.target multi-user.target getty@.service diff --git a/units/basic.target b/units/basic.target new file mode 100644 index 0000000000..aa94b94ad6 --- /dev/null +++ b/units/basic.target @@ -0,0 +1,14 @@ +# 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. + +# See systemd.special(7) for details + +[Unit] +Description=Basic System +Requires=sysinit.target local-fs.target swap.target sockets.target +After=sysinit.target local-fs.target swap.target sockets.target +OnlyByDependency=yes diff --git a/units/basic.target.m4 b/units/basic.target.m4 deleted file mode 100644 index 537ad8daf7..0000000000 --- a/units/basic.target.m4 +++ /dev/null @@ -1,21 +0,0 @@ -# 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. - -# See systemd.special(7) for details - -[Unit] -Description=Basic System -Requires=local-fs.target swap.target sockets.target -After=local-fs.target swap.target sockets.target -Conflicts=emergency.service -OnlyByDependency=yes -m4_dnl -m4_ifdef(`TARGET_FEDORA', -m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit -Requires=sysinit.service -After=sysinit.service -)m4_dnl diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount index 9fef9eeb37..4e7f8ff5a9 100644 --- a/units/dev-hugepages.automount +++ b/units/dev-hugepages.automount @@ -7,7 +7,7 @@ [Unit] Description=Huge Pages File System Automount Point -Before=basic.target +Before=sysinit.target [Automount] Where=/dev/hugepages diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount index a24ffe68f5..4df53dcaa4 100644 --- a/units/dev-mqueue.automount +++ b/units/dev-mqueue.automount @@ -7,7 +7,7 @@ [Unit] Description=POSIX Message Queue File System Automount Point -Before=basic.target +Before=sysinit.target [Automount] Where=/dev/mqueue diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount index 4e9b23b938..82369c56b3 100644 --- a/units/proc-sys-fs-binfmt_misc.automount +++ b/units/proc-sys-fs-binfmt_misc.automount @@ -7,7 +7,7 @@ [Unit] Description=Arbitrary Executable File Formats File System Automount Point -Before=basic.target +Before=sysinit.target [Automount] Where=/proc/sys/fs/binfmt_misc diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount index 3d5b52d049..4da3f20531 100644 --- a/units/sys-kernel-debug.automount +++ b/units/sys-kernel-debug.automount @@ -7,7 +7,7 @@ [Unit] Description=Debug File System Automount Point -Before=basic.target +Before=sysinit.target [Automount] Where=/sys/kernel/debug diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount index 061a5a23ad..5d8356e513 100644 --- a/units/sys-kernel-security.automount +++ b/units/sys-kernel-security.automount @@ -7,7 +7,7 @@ [Unit] Description=Security File System Automount Point -Before=basic.target +Before=sysinit.target [Automount] Where=/sys/kernel/security diff --git a/units/sysinit.target.m4 b/units/sysinit.target.m4 new file mode 100644 index 0000000000..68c661ef02 --- /dev/null +++ b/units/sysinit.target.m4 @@ -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. + +# See systemd.special(7) for details + +[Unit] +Description=Systemd Initialization +Conflicts=emergency.service +OnlyByDependency=yes +m4_dnl +m4_ifdef(`TARGET_FEDORA', +m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit +Requires=sysinit.service +After=sysinit.service +)m4_dnl diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket index fdb95deddd..af5cca202e 100644 --- a/units/systemd-initctl.socket +++ b/units/systemd-initctl.socket @@ -9,6 +9,7 @@ [Unit] Description=systemd /dev/initctl Compatibility Socket +After=sysinit.target [Socket] ListenFIFO=/dev/initctl diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket index f62b582d3e..7195a9e856 100644 --- a/units/systemd-logger.socket +++ b/units/systemd-logger.socket @@ -9,6 +9,7 @@ [Unit] Description=systemd Logging Socket +After=sysinit.target [Socket] ListenStream=@/org/freedesktop/systemd1/logger -- cgit v1.2.3-54-g00ecf