diff options
Diffstat (limited to 'satellit_upgrader')
-rw-r--r-- | satellit_upgrader/updater.template.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh index 24b4055..a1aa76b 100644 --- a/satellit_upgrader/updater.template.sh +++ b/satellit_upgrader/updater.template.sh @@ -276,10 +276,6 @@ IPXE_PID= build=false if grep -qF 'https://git.openslx.org/openslx-ng/ipxe.git' "$PATH_IPXE/.git/config"; then echo "Updating existing clone" - cd "$PATH_IPXE" - # Reset modified config, in case the files have changed upstream; will be re-applied below - failprint sudo -n -u taskmanager git checkout src/config - failprint sudo -n -u taskmanager git pull --all || pwarning "Could not update iPXE -- let's hope the old version still works." build=true elif [ -n "$TGZ_IPXE" ]; then [ -e "$TMPDIR/$TGZ_IPXE" ] || perror "$TGZ_IPXE missing from payload" @@ -292,6 +288,11 @@ elif [ -n "$TGZ_IPXE" ]; then build=true fi if $build; then + # Bring up to date either way + cd "$PATH_IPXE" + # Reset modified config, in case the files have changed upstream; will be re-applied below + failprint sudo -n -u taskmanager git checkout src/config + failprint sudo -n -u taskmanager git pull --all || pwarning "Could not update iPXE -- let's hope the old version still works." echo "Resetting pxe menu" ipxe_enable () { local var |