Merge pull request #1440 from brooksytech/dev
Fix update bug and clean up vars
This commit is contained in:
commit
a807911ff9
2 changed files with 2 additions and 9 deletions
|
@ -85,7 +85,7 @@ fi
|
|||
|
||||
# update device tree
|
||||
for all_dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
|
||||
dtb=$(basename $all_dtb)
|
||||
dtb="$(basename ${all_dtb})"
|
||||
echo -n "Updating $dtb... "
|
||||
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT &>/dev/null
|
||||
echo "done"
|
||||
|
|
|
@ -72,11 +72,10 @@ if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot.ini ]; then
|
|||
-e "s/@DISK_UUID@/$DISK_UUID/" \
|
||||
-i $BOOT_ROOT/boot.ini
|
||||
fi
|
||||
fi
|
||||
|
||||
# update device tree
|
||||
for all_dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
|
||||
dtb=$(basename $all_dtb)
|
||||
dtb="$(basename ${all_dtb})"
|
||||
echo -n "Updating $dtb... "
|
||||
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT &>/dev/null
|
||||
echo "done"
|
||||
|
@ -121,12 +120,6 @@ elif [ -f $SYSTEM_ROOT/usr/share/bootloader/resource.img ]; then
|
|||
echo "done"
|
||||
fi
|
||||
|
||||
if [ -f $SYSTEM_ROOT/usr/share/bootloader/logo.bmp ]; then
|
||||
echo -n "Updating uboot logo... "
|
||||
cp -p $SYSTEM_ROOT/usr/share/bootloader/logo.bmp $BOOT_ROOT &>/dev/null
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
# mount $BOOT_ROOT r/o
|
||||
sync
|
||||
mount -o remount,ro $BOOT_ROOT &>/dev/null
|
||||
|
|
Loading…
Reference in a new issue