diff options
| author | torben | 2018-09-07 10:50:42 +0200 |
|---|---|---|
| committer | torben | 2018-09-07 10:50:42 +0200 |
| commit | 97e9f4d39d03810b8a2f56938100ce631d425024 (patch) | |
| tree | 03b561ce479f35445af041a2b8a28c94333a40a4 | |
| parent | Release old ip before kexec. (diff) | |
| download | systemd-init-97e9f4d39d03810b8a2f56938100ce631d425024.tar.gz systemd-init-97e9f4d39d03810b8a2f56938100ce631d425024.tar.xz systemd-init-97e9f4d39d03810b8a2f56938100ce631d425024.zip | |
Improve shutdown hook.
| -rwxr-xr-x | modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh | 3 | ||||
| -rwxr-xr-x | modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh index 5df85014..3a3e9725 100755 --- a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh +++ b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh @@ -341,9 +341,10 @@ EOF --initrd "/mnt/$initramfs_file_path" \ --reuse-cmdline then + umount /mnt # NOTE: This is needed to retrieve a new ip after kexec! + systemctl stop wpa_supplicant@wireless systemctl stop systemd-networkd - umount /mnt kexec -e else bl.logging.warn \ diff --git a/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh index 8883aaa1..78644407 100755 --- a/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh +++ b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh @@ -98,9 +98,8 @@ if $SLX_ONLINE; then # Login to tty1 version, works: # TODO remove "false" if pre-caching is working. cat << EOF >"$NEWROOT/root/.bash_profile" -wget --output-document - http://..../BOOTED -if false && [ ! -f /tmp/wireless-daemon-restarted ]; then - systemctl start restart-wireless-daemon.service +wget --output-document - http://10.21.9.111/BOOTED +if [ ! -f /tmp/wireless-daemon-restarted ]; then touch /tmp/wireless-daemon-restarted fi $(cat "$NEWROOT/root/.bash_profile") |