Revert "add initrd-fs.target and initrd-fs-pre.target"

This reverts commit 39b83cdab37623a546344622db9bbbc784c15df5.

diff --git a/Makefile.am b/Makefile.am
index 13211c45bdfe2582c1db8f50ba17f7cf30b9e9ac..f4ac471a1372b53408f83af372979136b4169c6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,8 +342,6 @@ dist_systemunit_DATA = \
        units/kexec.target \
        units/local-fs.target \
        units/local-fs-pre.target \
-       units/initrd-fs.target \
-       units/initrd-fs-pre.target \
        units/remote-fs.target \
        units/remote-fs-pre.target \
        units/network.target \

diff --git a/src/core/special.h b/src/core/special.h
index de5889dd829d37db341d7a124d52e82987ef54b0..99c0e1222e6764b9af914428bcc62b3cbd066fb5 100644 (file)
--- a/src/core/special.h
+++ b/src/core/special.h
@@ -48,8 +48,6 @@
 #define SPECIAL_SOCKETS_TARGET "sockets.target"
 #define SPECIAL_LOCAL_FS_TARGET "local-fs.target"
 #define SPECIAL_LOCAL_FS_PRE_TARGET "local-fs-pre.target"
-#define SPECIAL_INITRD_FS_TARGET "initrd-fs.target"
-#define SPECIAL_INITRD_FS_PRE_TARGET "initrd-fs-pre.target"
 #define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"       /* LSB's $remote_fs */
 #define SPECIAL_REMOTE_FS_PRE_TARGET "remote-fs-pre.target"
 #define SPECIAL_SWAP_TARGET "swap.target"

diff --git a/units/initrd-fs-pre.target b/units/initrd-fs-pre.target
deleted file mode 100644 (file)
index 9aa8061..0000000
--- a/units/initrd-fs-pre.target
+++ /dev/null
@@ -1,11 +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=Initrd File Systems (Pre)
-Documentation=man:systemd.special(7)
-ConditionPathExists=/etc/initrd-release

diff --git a/units/initrd-fs.target b/units/initrd-fs.target
deleted file mode 100644 (file)
index 6ba1758..0000000
--- a/units/initrd-fs.target
+++ /dev/null
@@ -1,13 +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=Initrd File Systems
-Documentation=man:systemd.special(7)
-OnFailure=emergency.target
-OnFailureIsolate=yes
-ConditionPathExists=/etc/initrd-release