Browse Source

feat: Allow filenames in VERSION (#381)

Kroese 1 year ago
parent
commit
2a98081549
2 changed files with 2 additions and 1 deletions
  1. 1 1
      Dockerfile
  2. 1 0
      src/install.sh

+ 1 - 1
Dockerfile

@@ -1,5 +1,5 @@
 FROM scratch
 FROM scratch
-COPY --from=qemux/qemu-docker:4.20 / /
+COPY --from=qemux/qemu-docker:4.21 / /
 
 
 ARG DEBCONF_NOWARNINGS "yes"
 ARG DEBCONF_NOWARNINGS "yes"
 ARG DEBIAN_FRONTEND "noninteractive"
 ARG DEBIAN_FRONTEND "noninteractive"

+ 1 - 0
src/install.sh

@@ -93,6 +93,7 @@ fi
 CUSTOM=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.iso -printf "%f\n" | head -n 1)
 CUSTOM=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.iso -printf "%f\n" | head -n 1)
 [ -z "$CUSTOM" ] && CUSTOM=$(find "$STORAGE" -maxdepth 1 -type f -iname boot.iso -printf "%f\n" | head -n 1)
 [ -z "$CUSTOM" ] && CUSTOM=$(find "$STORAGE" -maxdepth 1 -type f -iname boot.iso -printf "%f\n" | head -n 1)
 [ -z "$CUSTOM" ] && CUSTOM=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.img -printf "%f\n" | head -n 1)
 [ -z "$CUSTOM" ] && CUSTOM=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.img -printf "%f\n" | head -n 1)
+[ -z "$CUSTOM" ] && CUSTOM=$(find "$STORAGE" -maxdepth 1 -type f -iname "${VERSION/\/storage\//}" -printf "%f\n" | head -n 1)
 
 
 ESD_URL=""
 ESD_URL=""
 MACHINE="q35"
 MACHINE="q35"