core: drop -.slice from shipped units

Since this unit is synthesized anyway there's no point in actually shipping it
on disk. This also has the benefit that "cd /usr/lib/systemd/system ; ls *"
won't be confused by the leading dash of the file name anymore.

diff --git a/Makefile.am b/Makefile.am
index 18a5f4a82ad9563470caf00b060c6e00ddbe5173..bad6a2d18a0cd3d045ebdb1b1484aba171ddc704 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,7 +493,6 @@ dist_systemunit_DATA = \
        units/swap.target \
        units/slices.target \
        units/system.slice \
-       units/x-.slice \
        units/systemd-initctl.socket \
        units/syslog.socket \
        units/dev-hugepages.mount \
@@ -637,17 +636,6 @@ GENERAL_ALIASES += \
        $(systemunitdir)/reboot.target $(pkgsysconfdir)/system/ctrl-alt-del.target \
        $(systemunitdir)/machines.target $(pkgsysconfdir)/system/multi-user.target.wants/machines.target
 
-# automake is broken and can't handle files with a dash in front
-# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8
-units-install-hook:
-       mv $(DESTDIR)$(systemunitdir)/x-.slice $(DESTDIR)/$(systemunitdir)/-.slice
-
-units-uninstall-hook:
-       rm -f $(DESTDIR)/$(systemunitdir)/-.slice
-
-INSTALL_DATA_HOOKS += units-install-hook
-UNINSTALL_DATA_HOOKS += units-uninstall-hook
-
 dist_doc_DATA = \
        README \
        NEWS \

diff --git a/units/x-.slice b/units/x-.slice
deleted file mode 100644 (file)
index ac82c35..0000000
--- a/units/x-.slice
+++ /dev/null
@@ -1,12 +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 Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Root Slice
-Documentation=man:systemd.special(7)
-DefaultDependencies=no
-Before=slices.target