units: move a number of units into the tarball

diff --git a/Makefile.am b/Makefile.am
index 35ecebaadda9526579451f5e5b995664ace65fb9..963c64838e7eca041b4d7fb3f6520b080107002c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,15 @@ dist_udevrules_DATA = \
 
 dist_systemunit_DATA = \
        units/emergency.service \
+       units/local-fs.target \
+       units/network.target \
+       units/nss-lookup.target \
+       units/remote-fs.target \
+       units/rtc-set.target \
+       units/shutdown.target \
+       units/sigpwr.target \
+       units/sockets.target \
+       units/swap.target \
        units/systemd-initctl.socket \
        units/systemd-logger.socket
 
@@ -298,12 +307,21 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(pkgsysconfdir)/system \
+               $(DESTDIR)$(pkgsysconfdir)/system/sockets.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
                $(DESTDIR)$(sysconfdir)/xdg/systemd \
                $(DESTDIR)/cgroup/debug
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f session && \
                $(LN_S) $(DESTDIR)$(pkgsysconfdir)/session session )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sockets.target.wants && \
+               rm -f systemd-initctl.socket systemd-logger.socket && \
+               $(LN_S) $(DESTDIR)$(systemunitdir)/systemd-logger.socket systemd-logger.socket && \
+               $(LN_S) $(DESTDIR)$(systemunitdir)/systemd-initctl.socket systemd-initctl.socket )
+       ( cd $(DESTDIR)$(sessionunitdir) && \
+               rm -f shutdown.target sockets.target && \
+               $(LN_S) ../system/shutdown.target shutdown.target && \
+               $(LN_S) ../system/sockets.target sockets.target )
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)

diff --git a/units/emergency.service b/units/emergency.service
index 3959eac2d304cd53d822e91f438ac80f6de3e08e..13fca6fc60d857c893d6161d869c55e77c6d9b9e 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -1,3 +1,20 @@
+#  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/>.
+
 [Unit]
 Description=Emergency Shell
 

diff --git a/units/local-fs.target b/units/local-fs.target
new file mode 100644 (file)
index 0000000..45259cd
--- /dev/null
+++ b/units/local-fs.target
@@ -0,0 +1,20 @@
+#  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/>.
+
+[Unit]
+Description=Local File Systems
+After=sysinit.service

diff --git a/units/network.target b/units/network.target
new file mode 100644 (file)
index 0000000..cdb1b5e
--- /dev/null
+++ b/units/network.target
@@ -0,0 +1,19 @@
+#  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/>.
+
+[Unit]
+Description=Network

diff --git a/units/nss-lookup.target b/units/nss-lookup.target
new file mode 100644 (file)
index 0000000..d1ce0a7
--- /dev/null
+++ b/units/nss-lookup.target
@@ -0,0 +1,21 @@
+#  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/>.
+
+[Unit]
+Description=Name Lookups
+Wants=network.target
+After=network.target

diff --git a/units/remote-fs.target b/units/remote-fs.target
new file mode 100644 (file)
index 0000000..0ed324e
--- /dev/null
+++ b/units/remote-fs.target
@@ -0,0 +1,21 @@
+#  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/>.
+
+[Unit]
+Description=Remote File Systems
+Requires=network.target
+After=network.target

diff --git a/units/rtc-set.target b/units/rtc-set.target
new file mode 100644 (file)
index 0000000..626fa5a
--- /dev/null
+++ b/units/rtc-set.target
@@ -0,0 +1,19 @@
+#  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/>.
+
+[Unit]
+Description=RTC Set

diff --git a/units/shutdown.target b/units/shutdown.target
new file mode 100644 (file)
index 0000000..87b1be8
--- /dev/null
+++ b/units/shutdown.target
@@ -0,0 +1,19 @@
+#  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/>.
+
+[Unit]
+Description=Shutdown

diff --git a/units/sigpwr.target b/units/sigpwr.target
new file mode 100644 (file)
index 0000000..36d4d24
--- /dev/null
+++ b/units/sigpwr.target
@@ -0,0 +1,19 @@
+#  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/>.
+
+[Unit]
+Description=Power Failure

diff --git a/units/sockets.target b/units/sockets.target
new file mode 100644 (file)
index 0000000..1061030
--- /dev/null
+++ b/units/sockets.target
@@ -0,0 +1,19 @@
+#  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/>.
+
+[Unit]
+Description=Sockets

diff --git a/units/swap.target b/units/swap.target
new file mode 100644 (file)
index 0000000..aac5456
--- /dev/null
+++ b/units/swap.target
@@ -0,0 +1,19 @@
+#  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/>.
+
+[Unit]
+Description=Swap

diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 4fce847839c1ba48e118f9d4f5202c8acd50b0ca..b6d5158f12bcb99ed1541db85b3433f53892f6a2 100644 (file)
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -1,5 +1,22 @@
+#  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/>.
+
 [Unit]
-Description=systemd /dev/initctl Compatibility
+Description=systemd /dev/initctl Compatibility Daemon
 
 [Service]
 ExecStart=@pkglibexecdir@/systemd-initctl

diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index 19c444a02576869ca4e86dae5871c11686c77697..ff3dbacd30e274e46bf4e2eb1d726a065132e55f 100644 (file)
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -1,5 +1,22 @@
+#  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/>.
+
 [Unit]
-Description=systemd /dev/initctl Compatibility
+Description=systemd /dev/initctl Compatibility Socket
 
 [Socket]
 ListenFIFO=/dev/initctl

diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 55f3841ed6efce3dae16163a9a771c12b7eee97d..ba6fa479439e0667d1a0fc3856f082065b0f961c 100644 (file)
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -1,3 +1,20 @@
+#  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/>.
+
 [Unit]
 Description=systemd Logging Daemon
 

diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index 8b0a66a2dbf591d8f6001250a0db43fc87eaeca5..a1d11e8a2d5df4222a2341591f368e91e0451362 100644 (file)
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -1,3 +1,20 @@
+#  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/>.
+
 [Unit]
 Description=systemd Logging Socket