x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Support update_grub flags.

Browse Source
This commit is contained in:
Ian Gulliver
2016-04-22 21:11:58 +00:00
parent 45b03b1bc3
commit 5de9a8d2c6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/fetch_and_update.sh
View File

@@ -9,7 +9,10 @@ mkdir -p "${IMAGES}"
BOOT="/isodevice" BOOT="/isodevice"
FLAGS="$(cat /icon/config/fetcher.flags)" FETCHER_FLAGS="$(cat /icon/config/fetcher.flags)"
if -f /icon/config/update_grub.flags; then
UPDATE_GRUB_FLAGS="$(cat /icon/config/update_grub.flags)"
fi
CA_CERT="/icon/config/ca.image.cert.pem" CA_CERT="/icon/config/ca.image.cert.pem"
HTTPS_CLIENT_KEY="/systemid/$(hostname).www.key.pem" HTTPS_CLIENT_KEY="/systemid/$(hostname).www.key.pem"
@@ -23,5 +26,5 @@ if test -e "${HTTPS_CA_CERT}"; then
HTTPS_CA_FLAGS="--https-ca-cert=${HTTPS_CA_CERT}" HTTPS_CA_FLAGS="--https-ca-cert=${HTTPS_CA_CERT}"
fi fi
"${BASE}/fetcher.py" --image-dir="${IMAGES}" --ca-cert="${CA_CERT}" ${FLAGS} ${HTTPS_CLIENT_FLAGS} ${HTTPS_CA_FLAGS} "${BASE}/fetcher.py" --image-dir="${IMAGES}" --ca-cert="${CA_CERT}" ${FETCHER_FLAGS} ${HTTPS_CLIENT_FLAGS} ${HTTPS_CA_FLAGS}
"${BASE}/update_grub.py" --image-dir="${IMAGES}" --boot-dir="${BOOT}" > "${BOOT}/grub/grub.cfg.tmp" && mv "${BOOT}/grub/grub.cfg.tmp" "${BOOT}/grub/grub.cfg" "${BASE}/update_grub.py" --image-dir="${IMAGES}" --boot-dir="${BOOT}" ${UPDATE_GRUB_FLAGS} > "${BOOT}/grub/grub.cfg.tmp" && mv "${BOOT}/grub/grub.cfg.tmp" "${BOOT}/grub/grub.cfg"