scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-11-02 05:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

initrd-flash: fix auto mount trouble

Browse Source 
Disable automount feature on OS is not longer required.

Signed-off-by: Sebastian Suesens <sebastian.suesens@baslerweb.com>
This commit is contained in:
Sebastian Suesens
2023-04-06 05:29:26 +00:00
committed by Matt Madison
parent 6bd895258b
commit 3b523a4cb0
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
recipes-bsp/tegra-binaries/tegra-helper-scripts/initrd-flash.sh
View File

@@ -220,6 +220,16 @@ run_rcm_boot() {
mount_partition() { mount_partition() {
local dev="$1" local dev="$1"
local mnt=$(cat /proc/mounts | grep "^$dev" | cut -d' ' -f2)
local i=$(echo $mnt|awk -F' ' '{print NF}')
while [ $i -ne 0 ]; do
local mnt=$(echo ${mnt} | cut -d' ' -f$i)
if ! umount "${mnt}" > /dev/null 2>&1; then
echo "ERR: unmount ${mnt} on device $dev failed" >&2
return 1
fi
i=$(expr $i - 1)
done
if udisksctl mount -b "$dev" > /dev/null; then if udisksctl mount -b "$dev" > /dev/null; then
cat /proc/mounts | grep "^$dev" | cut -d' ' -f2 cat /proc/mounts | grep "^$dev" | cut -d' ' -f2
return 0 return 0

20
recipes-bsp/tegra-binaries/tegra-helper-scripts/make-sdcard.sh
View File

@@ -150,6 +150,18 @@ copy_to_device() {
return $rc return $rc
} }
unmount_device() {
local dev="$1"
local mnt=$(cat /proc/mounts | grep "^$dev" | cut -d' ' -f2)
if [ -n "$mnt" ]; then
if ! umount "${mnt}" > /dev/null 2>&1; then
echo "ERR: unmount ${mnt} on device $dev failed" >&2
return 1
fi
fi
return 0
}
write_partitions_to_device() { write_partitions_to_device() {
local blksize partnumber partname partsize partfile partguid partfilltoend local blksize partnumber partname partsize partfile partguid partfilltoend
local i dest pline destsize filesize n_written local i dest pline destsize filesize n_written
@@ -177,6 +189,10 @@ write_partitions_to_device() {
echo "ERR: cannot locate block device $dest" >&2 echo "ERR: cannot locate block device $dest" >&2
return 1 return 1
fi fi
if ! unmount_device "$dest"; then
echo "ERR: device unmount failed" >&2
return 1
fi
destsize=$(blockdev --getsize64 "$dest" 2>/dev/null) destsize=$(blockdev --getsize64 "$dest" 2>/dev/null)
if [ $n_written -eq 0 -a -z "$destsize" ]; then if [ $n_written -eq 0 -a -z "$destsize" ]; then
sleep 1 sleep 1
@@ -201,6 +217,10 @@ write_partitions_to_device() {
fi fi
filesize=$(stat -c "%s" "$partfile") filesize=$(stat -c "%s" "$partfile")
dest="/dev/$DEVNAME$PARTSEP$partnumber" dest="/dev/$DEVNAME$PARTSEP$partnumber"
if ! unmount_device "$dest"; then
echo "ERR: device unmount failed" >&2
return 1
fi
if [ ! -b "$dest" ]; then if [ ! -b "$dest" ]; then
echo "ERR: cannot locate block device $dest" >&2 echo "ERR: cannot locate block device $dest" >&2
return 1 return 1