[systemd-commits] 3 commits - Makefile.am src/core units/initrd-cleanup.service units/initrd-fs-pre.target units/initrd-fs.target units/initrd-parse-etc.service units/initrd-switch-root.target

[Harald Hoyer]

 Makefile.am                     |    2 --
 src/core/special.h              |    2 --
 units/initrd-cleanup.service    |    4 ++--
 units/initrd-fs-pre.target      |   11 -----------
 units/initrd-fs.target          |   13 -------------
 units/initrd-parse-etc.service  |    6 +++---
 units/initrd-switch-root.target |    4 ++--
 7 files changed, 7 insertions(+), 35 deletions(-)

New commits:
commit 248ea600d090fd9e5de3443a6b7b7194bf55f9c2
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Mar 6 11:02:35 2013 +0100

    initrd-parse-etc.servic: force start local-fs.target

diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service
index 4bfbb0f..3a71a7e 100644
--- a/units/initrd-parse-etc.service
+++ b/units/initrd-parse-etc.service
@@ -16,4 +16,5 @@ ConditionPathExists=/etc/initrd-release
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/systemctl daemon-reload
+ExecStart=/usr/bin/systemctl start local-fs.target
 ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service

commit 7fdf51751c752e8074e2d8e429d40db91ce87b95
Author: Harald Hoyer <harald at redhat.com>
Date:   Tue Mar 5 08:16:15 2013 +0100

    Revert "add initrd-fs.target and initrd-fs-pre.target"
    
    This reverts commit 39b83cdab37623a546344622db9bbbc784c15df5.

diff --git a/Makefile.am b/Makefile.am
index 13211c4..f4ac471 100644
--- 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 de5889d..99c0e12 100644
--- 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
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
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

commit fdf1848d1dc55e03b83821989bed2f8b26260236
Author: Harald Hoyer <harald at redhat.com>
Date:   Tue Mar 5 08:16:06 2013 +0100

    Revert "units/initrd-*: require initrd-fs.target rather than local-fs.target"
    
    This reverts commit 7d89ce303fb59743a4392eeb3110c00f100172ca.

diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service
index 061f803..8998696 100644
--- a/units/initrd-cleanup.service
+++ b/units/initrd-cleanup.service
@@ -10,8 +10,8 @@ Description=Cleaning Up and Shutting Down Daemons
 DefaultDependencies=no
 ConditionPathExists=/etc/initrd-release
 OnFailure=emergency.target
-Requires=initrd-fs.target swap.target
-After=initrd-fs.target swap.target
+Requires=local-fs.target swap.target
+After=local-fs.target swap.target
 
 [Service]
 Type=oneshot
diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service
index 99e8c33..4bfbb0f 100644
--- a/units/initrd-parse-etc.service
+++ b/units/initrd-parse-etc.service
@@ -8,13 +8,12 @@
 [Unit]
 Description=Reload Configuration from the Real Root
 DefaultDependencies=no
-Requires=initrd-fs.target swap.target sysroot.mount
-After=initrd-fs.target swap.target sysroot.mount
+Requires=local-fs.target swap.target
+After=local-fs.target swap.target
 OnFailure=emergency.target
 ConditionPathExists=/etc/initrd-release
 
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/systemctl daemon-reload
-ExecStart=/usr/bin/systemctl start initrd-fs.target
 ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service
diff --git a/units/initrd-switch-root.target b/units/initrd-switch-root.target
index ffadfc0..f706d29 100644
--- a/units/initrd-switch-root.target
+++ b/units/initrd-switch-root.target
@@ -12,5 +12,5 @@ DefaultDependencies=no
 Requires=initrd-switch-root.service
 Before=initrd-switch-root.service
 AllowIsolate=yes
-Wants=initrd-udevadm-cleanup-db.service initrd-fs.target swap.target systemd-journald.service
-After=initrd-udevadm-cleanup-db.service initrd-fs.target swap.target emergency.service emergency.target
+Wants=initrd-udevadm-cleanup-db.service local-fs.target swap.target systemd-journald.service
+After=initrd-udevadm-cleanup-db.service local-fs.target swap.target emergency.service emergency.target