GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-06-26 16:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nand-sata-install: $1 -> "$1"

Browse source
This commit is contained in:
Anton-Latukha 2019-02-25 18:04:25 +02:00
parent df7a909284
commit 05fc98bdcf
1 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
packages/bsp/common/usr/sbin/nand-sata-install
View file

@ -70,7 +70,7 @@ mountopts[ext4]='defaults,noatime,nodiratime,commit=600,errors=remount-ro,x-gvfs
mountopts[btrfs]='defaults,noatime,nodiratime,commit=600,compress=lzo,x-gvfs-hide 0 2'
mountopts[f2fs]='defaults,noatime,nodiratime,x-gvfs-hide 0 2'
# Create boot and root file system $1 = boot, $2 = root (Example: create_armbian "/dev/nand1" "/dev/sda3")
# Create boot and root file system "$1" = boot, $2 = root (Example: create_armbian "/dev/nand1" "/dev/sda3")
create_armbian()
{
# create mount points, mount and clean
@ -81,7 +81,7 @@ create_armbian()
[[ -n $2 ]] && ( mount -o compress-force=zlib $2 "${TempDir}"/rootfs 2> /dev/null || mount $2 "${TempDir}"/rootfs )
else
[[ -n $2 ]] && ( mount -o compress-force=zlib $2 "${TempDir}"/rootfs 2> /dev/null || mount $2 "${TempDir}"/rootfs )
[[ -n $1 && $1 != "spi" ]] && mount $1 "${TempDir}"/bootfs
[[ -n $1 && $1 != "spi" ]] && mount "$1" "${TempDir}"/bootfs
fi
rm -rf "${TempDir}"/bootfs/* "${TempDir}"/rootfs/*
@ -371,7 +371,7 @@ create_armbian()
umount_device()
{
if [[ -n $1 ]]; then
device=$1;
device="$1";
for n in ${device}*; do
if [[ $device != "$n" ]]; then
if mount|grep -q ${n}; then
@ -437,7 +437,7 @@ format_emmc()
eMMCFilesystemChoosen=${FilesystemOptions[(2*$FilesystemChoices)-1]}
# deletes all partitions on eMMC drive
dd bs=1 seek=446 count=64 if=/dev/zero of=$1 >/dev/null 2>&1
dd bs=1 seek=446 count=64 if=/dev/zero of="$1" >/dev/null 2>&1
# calculate capacity and reserve some unused space to ease cloning of the installation
# to other media 'of the same size' (one sector less and cloning will fail)
QUOTED_DEVICE=$(echo "${1}" | sed 's:/:\\\/:g')
@ -451,7 +451,7 @@ format_emmc()
LASTSECTOR=$(( 32 * $(parted ${1} unit s print -sm | awk -F":" "/^${QUOTED_DEVICE}/ {printf (\"%0d\", ( \$2 * 99 / 3200))}") -1 ))
fi
parted -s $1 -- mklabel msdos
parted -s "$1" -- mklabel msdos
dialog --title "$title" --backtitle "$backtitle" --infobox "\nFormating $1 to $eMMCFilesystemChoosen ... please wait." 5 60
# we can't boot from btrfs or f2fs
if [[ $eMMCFilesystemChoosen =~ ^(btrfs|f2fs)$ ]]; then
@ -463,34 +463,34 @@ format_emmc()
grep -q swap /etc/fstab
case $? in
0)
parted -s $1 -- mkpart primary $partedFsType ${FIRSTSECTOR}s $(( ${FIRSTSECTOR} + 131071 ))s
parted -s $1 -- mkpart primary $partedFsType $(( ${FIRSTSECTOR} + 131072 ))s $(( ${FIRSTSECTOR} + 393215 ))s
parted -s $1 -- mkpart primary $partedFsType $(( ${FIRSTSECTOR} + 393216 ))s ${LASTSECTOR}s
partprobe $1
mkfs.ext4 ${mkopts[ext4]} $1"p1" >> $logfile 2>&1
mkswap $1"p2" >> $logfile 2>&1
mkfs.${eMMCFilesystemChoosen} $1"p3" ${mkopts[$eMMCFilesystemChoosen]} >> $logfile 2>&1
emmcbootuuid=$(blkid -o export $1"p1" | grep -w UUID)
emmcswapuuid=$(blkid -o export $1"p2" | grep -w UUID)
emmcuuid=$(blkid -o export $1"p3" | grep -w UUID)
parted -s "$1" -- mkpart primary $partedFsType ${FIRSTSECTOR}s $(( ${FIRSTSECTOR} + 131071 ))s
parted -s "$1" -- mkpart primary $partedFsType $(( ${FIRSTSECTOR} + 131072 ))s $(( ${FIRSTSECTOR} + 393215 ))s
parted -s "$1" -- mkpart primary $partedFsType $(( ${FIRSTSECTOR} + 393216 ))s ${LASTSECTOR}s
partprobe "$1"
mkfs.ext4 ${mkopts[ext4]} "$1"'p1' >> $logfile 2>&1
mkswap "$1"'p2' >> $logfile 2>&1
mkfs.${eMMCFilesystemChoosen} "$1"'p3' ${mkopts[$eMMCFilesystemChoosen]} >> $logfile 2>&1
emmcbootuuid=$(blkid -o export "$1"'p1' | grep -w UUID)
emmcswapuuid=$(blkid -o export "$1"'p2' | grep -w UUID)
emmcuuid=$(blkid -o export "$1"'p3' | grep -w UUID)
dest_root=$emmccheck"p3"
;;
*)
parted -s $1 -- mkpart primary $partedFsType ${FIRSTSECTOR}s $(( ${FIRSTSECTOR} + 131071 ))s
parted -s $1 -- mkpart primary $partedFsType $(( ${FIRSTSECTOR} + 131072 ))s ${LASTSECTOR}s
partprobe $1
mkfs.ext4 ${mkopts[ext4]} $1"p1" >> $logfile 2>&1
mkfs.${eMMCFilesystemChoosen} $1"p2" ${mkopts[$eMMCFilesystemChoosen]} >> $logfile 2>&1
emmcbootuuid=$(blkid -o export $1"p1" | grep -w UUID)
emmcuuid=$(blkid -o export $1"p2" | grep -w UUID)
parted -s "$1" -- mkpart primary $partedFsType ${FIRSTSECTOR}s $(( ${FIRSTSECTOR} + 131071 ))s
parted -s "$1" -- mkpart primary $partedFsType $(( ${FIRSTSECTOR} + 131072 ))s ${LASTSECTOR}s
partprobe "$1"
mkfs.ext4 ${mkopts[ext4]} "$1"'p1' >> $logfile 2>&1
mkfs.${eMMCFilesystemChoosen} "$1"'p2' ${mkopts[$eMMCFilesystemChoosen]} >> $logfile 2>&1
emmcbootuuid=$(blkid -o export "$1"'p1' | grep -w UUID)
emmcuuid=$(blkid -o export "$1"'p2' | grep -w UUID)
dest_root=$emmccheck"p2"
;;
esac
else
parted -s $1 -- mkpart primary $eMMCFilesystemChoosen ${FIRSTSECTOR}s ${LASTSECTOR}s
partprobe $1
mkfs.${eMMCFilesystemChoosen} ${mkopts[$eMMCFilesystemChoosen]} $1"p1" >> $logfile 2>&1
emmcuuid=$(blkid -o export $1"p1" | grep -w UUID)
parted -s "$1" -- mkpart primary $eMMCFilesystemChoosen ${FIRSTSECTOR}s ${LASTSECTOR}s
partprobe "$1"
mkfs.${eMMCFilesystemChoosen} ${mkopts[$eMMCFilesystemChoosen]} "$1"'p1' >> $logfile 2>&1
emmcuuid=$(blkid -o export "$1"'p1' | grep -w UUID)
emmcbootuuid=$emmcuuid
fi
}
@ -522,7 +522,7 @@ format_disk()
FilesystemChoosen=${FilesystemOptions[(2*$FilesystemChoices)-1]}
dialog --title "$title" --backtitle "$backtitle" --infobox "\nFormating $1 to $FilesystemChoosen ... please wait." 5 60
mkfs.${FilesystemChoosen} ${mkopts[$FilesystemChoosen]} $1 >> $logfile 2>&1
mkfs.${FilesystemChoosen} ${mkopts[$FilesystemChoosen]} "$1" >> $logfile 2>&1
}