mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
mkimage: use BOOTLABEL and DISKLABEL directly
This commit is contained in:
parent
c2792f5dbb
commit
00f059abfd
@ -71,8 +71,6 @@ trap cleanup SIGINT
|
||||
UUID_2=$(date '+%M%S')
|
||||
FAT_SERIAL_NUMBER="${UUID_1}${UUID_2}"
|
||||
UUID_SYSTEM="${UUID_1}-${UUID_2}"
|
||||
FAT_VOLUME_LABEL="${DISTRO_BOOTLABEL}"
|
||||
STORAGE_VOLUME_LABEL="${DISTRO_DISKLABEL}"
|
||||
|
||||
# create an image
|
||||
echo
|
||||
@ -129,7 +127,7 @@ fi
|
||||
alias mmd="mmd -i $DISK@@$OFFSET"
|
||||
|
||||
if [ "$BOOTLOADER" = "syslinux" -o "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then
|
||||
mformat -v "$FAT_VOLUME_LABEL" -N "$FAT_SERIAL_NUMBER" ::
|
||||
mformat -v "$DISTRO_BOOTLABEL" -N "$FAT_SERIAL_NUMBER" ::
|
||||
fi
|
||||
sync
|
||||
|
||||
@ -277,7 +275,7 @@ fi # bootloader
|
||||
# create filesystem on part2
|
||||
echo "image: creating filesystem on part2..."
|
||||
mke2fs -F -q -t ext4 -m 0 "$LE_TMP/part2.ext4"
|
||||
tune2fs -L "$STORAGE_VOLUME_LABEL" -U $UUID_STORAGE "$LE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
|
||||
tune2fs -L "$DISTRO_DISKLABEL" -U $UUID_STORAGE "$LE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
|
||||
e2fsck -n "$LE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
|
||||
sync
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user