systemd: change path of switch-root.conf

we do not have to clean it up for /etc/switch-root.conf
This commit is contained in:
Harald Hoyer 2013-02-21 12:18:21 +01:00
parent 7d4d3f8da6
commit 9c65c125a9
2 changed files with 3 additions and 4 deletions

View File

@ -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"

View File

@ -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