jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-27 12:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkimage: use BOOTLABEL and DISKLABEL directly

Browse Source
This commit is contained in:
Tomas Kelemen (vudiq) 2018-06-01 11:52:36 +02:00
parent c2792f5dbb
commit 00f059abfd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mkimage
View File

@ -71,8 +71,6 @@ trap cleanup SIGINT
UUID_2=$(date '+%M%S') UUID_2=$(date '+%M%S')
FAT_SERIAL_NUMBER="${UUID_1}${UUID_2}" FAT_SERIAL_NUMBER="${UUID_1}${UUID_2}"
UUID_SYSTEM="${UUID_1}-${UUID_2}" UUID_SYSTEM="${UUID_1}-${UUID_2}"
FAT_VOLUME_LABEL="${DISTRO_BOOTLABEL}"
STORAGE_VOLUME_LABEL="${DISTRO_DISKLABEL}"
# create an image # create an image
echo echo
@ -129,7 +127,7 @@ fi
alias mmd="mmd -i $DISK@@$OFFSET" alias mmd="mmd -i $DISK@@$OFFSET"
if [ "$BOOTLOADER" = "syslinux" -o "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then 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 fi
sync sync
@ -277,7 +275,7 @@ fi # bootloader
# create filesystem on part2 # create filesystem on part2
echo "image: creating filesystem on part2..." echo "image: creating filesystem on part2..."
mke2fs -F -q -t ext4 -m 0 "$LE_TMP/part2.ext4" 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 e2fsck -n "$LE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
sync sync