installers: use if/elif/else to determine rootfs filename

The installer uses the regular rootfs filename or falls back to search
for a squashfs (read-only) rootfs image.
The UUU installers of eMMC-based platforms use an if/elif/else structure
to determine which file exist (in order of preference). Replicate this
structure on the rest of platforms and installers.
This avoids printing an error message if the default rootfs does not exist
but the read-only one does.
Also, reset 'rootfstype' variable if the default rootfs file exists, which
allows to install regular images over a previous read-only system.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2025-06-05 11:33:44 +02:00
parent 5271924af7
commit 5156fe26b3
18 changed files with 170 additions and 176 deletions

View File

@ -53,7 +53,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -67,14 +66,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -53,7 +53,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -67,14 +66,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -60,7 +60,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -74,14 +73,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -60,7 +60,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -74,14 +73,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -56,7 +56,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -70,16 +69,17 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then setenv rootfstype;
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
setenv rootfstype squashfs;
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
else
setenv rootfstype squashfs
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -56,7 +56,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -70,18 +69,17 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then setenv rootfstype;
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
install_abort=1; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else setenv rootfstype squashfs;
setenv rootfstype squashfs
fi
else else
setenv rootfstype echo "ERROR: Could not find any rootfs image";
install_abort=1;
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -202,7 +202,6 @@ if [ -z "${BASEFILENAME}" ]; then
fi fi
INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.ubifs" INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.ubifs"
INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs" INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs"
INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
# Verify existence of files before starting the update # Verify existence of files before starting the update
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -217,16 +216,16 @@ for f in ${FILES}; do
done; done;
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
echo "\033[31m[ERROR] Could not find file '${INSTALL_ROOTFS_FILENAME}'\033[0m" ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.squashfs" if [ -f "${ROOTFS_FILENAME}" ]; then
echo "\033[32m[INFO] Trying with file '${INSTALL_ROOTFS_FILENAME}'\033[0m" INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME}"
if [ -f "${INSTALL_ROOTFS_FILENAME}" ]; then elif [ -f "${ROOTFS_FILENAME_SQFS}" ]; then
INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME_SQFS}"
SQUASHFS=true SQUASHFS=true
else else
echo "\033[31m[ERROR] Could not find file '${INSTALL_ROOTFS_FILENAME}'\033[0m" printf "\033[31m[ERROR] Could not find any rootfs image\033[0m\n"
ABORT=true ABORT=true
fi
fi fi
[ "${ABORT}" = true ] && exit 1 [ "${ABORT}" = true ] && exit 1

View File

@ -24,7 +24,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -38,14 +37,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -24,7 +24,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -38,14 +37,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -36,7 +36,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -50,14 +49,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -36,7 +36,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -50,14 +49,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -39,7 +39,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -53,14 +52,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -39,7 +39,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -53,14 +52,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -40,16 +39,17 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then setenv rootfstype;
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
setenv rootfstype squashfs;
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
else
setenv rootfstype squashfs
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -40,18 +39,17 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then setenv rootfstype;
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
install_abort=1; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else setenv rootfstype squashfs;
setenv rootfstype squashfs
fi
else else
setenv rootfstype echo "ERROR: Could not find any rootfs image";
install_abort=1;
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -152,7 +152,6 @@ if [ -z "${BASEFILENAME}" ]; then
fi fi
INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.ubifs" INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.ubifs"
INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs" INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs"
INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
# Verify existence of files before starting the update # Verify existence of files before starting the update
FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -167,16 +166,16 @@ for f in ${FILES}; do
done; done;
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
printf "\033[31m[ERROR] Could not find file '${INSTALL_ROOTFS_FILENAME}'\033[0m\n" ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.squashfs" if [ -f "${ROOTFS_FILENAME}" ]; then
printf "\033[32m[INFO] Trying with file '${INSTALL_ROOTFS_FILENAME}'\033[0m\n" INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME}"
if [ -f "${INSTALL_ROOTFS_FILENAME}" ]; then elif [ -f "${ROOTFS_FILENAME_SQFS}" ]; then
INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME_SQFS}"
SQUASHFS=true SQUASHFS=true
else else
printf "\033[31m[ERROR] Could not find any rootfs image\033[0m\n" printf "\033[31m[ERROR] Could not find any rootfs image\033[0m\n"
ABORT=true ABORT=true
fi
fi fi
[ "${ABORT}" = true ] && exit 1 [ "${ABORT}" = true ] && exit 1

View File

@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the SD card # Check for presence of firmware files on the SD card
FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -40,14 +39,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"

View File

@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
fi fi
setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
# Check for presence of firmware files on the USB # Check for presence of firmware files on the USB
FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@ -40,14 +39,15 @@ for install_f in ${FILES}; do
fi; fi;
done done
# Verify what kind of rootfs is going to be programmed # Verify what kind of rootfs is going to be programmed
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}"; setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
else
echo "ERROR: Could not find any rootfs image";
install_abort=1; install_abort=1;
fi
fi fi
if test "${install_abort}" = "1"; then if test "${install_abort}" = "1"; then
echo "To install a different image, set variable 'image-name', e.g.:" echo "To install a different image, set variable 'image-name', e.g.:"