Browse Source

Allow custom image filename

pull/236/head
Błażej Sowa 2 years ago
committed by XECDesign
parent
commit
08405eb792
5 changed files with 8 additions and 7 deletions
  1. +1
    -0
      build.sh
  2. +1
    -1
      export-image/03-set-partuuid/00-run.sh
  3. +2
    -2
      export-image/04-finalise/01-run.sh
  4. +1
    -1
      export-image/prerun.sh
  5. +3
    -3
      export-noobs/prerun.sh

+ 1
- 0
build.sh View File

@ -144,6 +144,7 @@ fi
export USE_QEMU="${USE_QEMU:-0}"
export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}"
export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"}"
BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export SCRIPT_DIR="${BASE_DIR}/scripts"

+ 1
- 1
export-image/03-set-partuuid/00-run.sh View File

@ -1,6 +1,6 @@
#!/bin/bash -e
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}.img"
IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"

+ 2
- 2
export-image/04-finalise/01-run.sh View File

@ -1,7 +1,7 @@
#!/bin/bash -e
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
INFO_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.info"
IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}.img"
INFO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}.info"
on_chroot << EOF
/etc/init.d/fake-hwclock stop

+ 1
- 1
export-image/prerun.sh View File

@ -1,6 +1,6 @@
#!/bin/bash -e
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}.img"
unmount_image "${IMG_FILE}"

+ 3
- 3
export-noobs/prerun.sh View File

@ -1,13 +1,13 @@
#!/bin/bash -e
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}.img"
NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
unmount_image "${IMG_FILE}"
mkdir -p "${STAGE_WORK_DIR}"
cp "${WORK_DIR}/export-image/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" "${STAGE_WORK_DIR}/"
cp "${WORK_DIR}/export-image/${IMG_FILENAME}.img" "${STAGE_WORK_DIR}/"
rm -rf "${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
rm -rf "${NOOBS_DIR}"
PARTED_OUT=$(parted -s "${IMG_FILE}" unit b print)
BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \

Loading…
Cancel
Save