Browse Source

systemd: change path of switch-root.conf

we do not have to clean it up for /etc/switch-root.conf
master
Harald Hoyer 12 years ago
parent
commit
9c65c125a9
  1. 4
      modules.d/98systemd/dracut-pre-pivot.sh
  2. 3
      modules.d/98systemd/initrd-switch-root.service

4
modules.d/98systemd/dracut-pre-pivot.sh

@ -29,12 +29,12 @@ for i in "$(getarg real_init=)" "$(getarg init=)"; do @@ -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"


3
modules.d/98systemd/initrd-switch-root.service

@ -16,10 +16,9 @@ AllowIsolate=yes @@ -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

Loading…
Cancel
Save