From 70449379def39da2a3efbd7c7da27a4745702b08 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 16 May 2010 20:49:41 +0200 Subject: [PATCH] units: move a number of units into the tarball --- Makefile.am | 18 ++++++++++++++++++ units/emergency.service | 17 +++++++++++++++++ units/local-fs.target | 20 ++++++++++++++++++++ units/network.target | 19 +++++++++++++++++++ units/nss-lookup.target | 21 +++++++++++++++++++++ units/remote-fs.target | 21 +++++++++++++++++++++ units/rtc-set.target | 19 +++++++++++++++++++ units/shutdown.target | 19 +++++++++++++++++++ units/sigpwr.target | 19 +++++++++++++++++++ units/sockets.target | 19 +++++++++++++++++++ units/swap.target | 19 +++++++++++++++++++ units/systemd-initctl.service.in | 19 ++++++++++++++++++- units/systemd-initctl.socket | 19 ++++++++++++++++++- units/systemd-logger.service.in | 17 +++++++++++++++++ units/systemd-logger.socket | 17 +++++++++++++++++ 15 files changed, 281 insertions(+), 2 deletions(-) create mode 100644 units/local-fs.target create mode 100644 units/network.target create mode 100644 units/nss-lookup.target create mode 100644 units/remote-fs.target create mode 100644 units/rtc-set.target create mode 100644 units/shutdown.target create mode 100644 units/sigpwr.target create mode 100644 units/sockets.target create mode 100644 units/swap.target diff --git a/Makefile.am b/Makefile.am index 35ecebaa..963c6483 100644 --- 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 3959eac2..13fca6fc 100644 --- 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 . + [Unit] Description=Emergency Shell diff --git a/units/local-fs.target b/units/local-fs.target new file mode 100644 index 00000000..45259cd6 --- /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 . + +[Unit] +Description=Local File Systems +After=sysinit.service diff --git a/units/network.target b/units/network.target new file mode 100644 index 00000000..cdb1b5eb --- /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 . + +[Unit] +Description=Network diff --git a/units/nss-lookup.target b/units/nss-lookup.target new file mode 100644 index 00000000..d1ce0a70 --- /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 . + +[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 index 00000000..0ed324ed --- /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 . + +[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 index 00000000..626fa5a4 --- /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 . + +[Unit] +Description=RTC Set diff --git a/units/shutdown.target b/units/shutdown.target new file mode 100644 index 00000000..87b1be8a --- /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 . + +[Unit] +Description=Shutdown diff --git a/units/sigpwr.target b/units/sigpwr.target new file mode 100644 index 00000000..36d4d24f --- /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 . + +[Unit] +Description=Power Failure diff --git a/units/sockets.target b/units/sockets.target new file mode 100644 index 00000000..10610303 --- /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 . + +[Unit] +Description=Sockets diff --git a/units/swap.target b/units/swap.target new file mode 100644 index 00000000..aac54561 --- /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 . + +[Unit] +Description=Swap diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in index 4fce8478..b6d5158f 100644 --- 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 . + [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 19c444a0..ff3dbacd 100644 --- 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 . + [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 55f3841e..ba6fa479 100644 --- 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 . + [Unit] Description=systemd Logging Daemon diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket index 8b0a66a2..a1d11e8a 100644 --- 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 . + [Unit] Description=systemd Logging Socket -- 2.39.5