From: Harald Hoyer <harald@redhat.com>
Date: Thu, 21 Feb 2013 11:18:21 +0000 (+0100)
Subject: systemd: change path of switch-root.conf
X-Git-Tag: 026~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c65c125a919756844fdec0a44d3a80b14ef36ae;p=thirdparty%2Fdracut.git

systemd: change path of switch-root.conf

we do not have to clean it up for /etc/switch-root.conf
---

diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
index f27d2204a..0c259b1bd 100755
--- a/modules.d/98systemd/dracut-pre-pivot.sh
+++ b/modules.d/98systemd/dracut-pre-pivot.sh
@@ -29,12 +29,12 @@ for i in "$(getarg real_init=)" "$(getarg init=)"; do
     __p=$(readlink -f "${NEWROOT}/${i}")
     if [ -x "$__p" ]; then
         INIT="$i"
-        echo "NEWINIT=\"$INIT\"" > /run/initramfs/switch-root.conf
+        echo "NEWINIT=\"$INIT\"" > /etc/switch-root.conf
         break
     fi
 done
 
-echo "NEWROOT=\"$NEWROOT\"" >> /run/initramfs/switch-root.conf
+echo "NEWROOT=\"$NEWROOT\"" >> /etc/switch-root.conf
 
 getarg rd.break -d rdbreak && emergency_shell -n switch_root "Break before switch_root"
 
diff --git a/modules.d/98systemd/initrd-switch-root.service b/modules.d/98systemd/initrd-switch-root.service
index bd9fb317a..e263980a2 100644
--- a/modules.d/98systemd/initrd-switch-root.service
+++ b/modules.d/98systemd/initrd-switch-root.service
@@ -16,10 +16,9 @@ AllowIsolate=yes
 
 [Service]
 Type=oneshot
-EnvironmentFile=/run/initramfs/switch-root.conf
+EnvironmentFile=/etc/switch-root.conf
 # we have to use "--force" here, otherwise systemd would umount /run
 ExecStart=-/usr/bin/systemctl --no-block --force switch-root ${NEWROOT} ${NEWINIT}
-ExecStopPost=-/bin/rm -f /run/initramfs/switch-root.conf
 StandardInput=null
 StandardOutput=null
 StandardError=null