jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix partition creation for on2 and vim3

This commit is contained in:
Dan Johansen 2019-08-06 16:13:36 +02:00
parent bb12a5e84d
commit a6aa7dee40
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manjaro-arm-installer
View File

@ -298,14 +298,14 @@ prepare_card () {
END_SECTOR=$(expr $START + $SIZE) END_SECTOR=$(expr $START + $SIZE)
parted -s $SDCARD mkpart primary ext4 "${END_SECTOR}s" 100% 1> /dev/null 2>&1 parted -s $SDCARD mkpart primary ext4 "${END_SECTOR}s" 100% 1> /dev/null 2>&1
partprobe $SDCARD 1> /dev/null 2>&1 partprobe $SDCARD 1> /dev/null 2>&1
mkfs.vfat "${SDCARD}${SDDEV}p1" -n BOOT 1> /dev/null 2>&1 mkfs.vfat "${SDCARD}${SDDEV}1" -n BOOT 1> /dev/null 2>&1
mkfs.ext4 "${SDCARD}${SDDEV}p2" -L ROOT 1> /dev/null 2>&1 mkfs.ext4 "${SDCARD}${SDDEV}2" -L ROOT 1> /dev/null 2>&1
#copy rootfs contents over to the FS #copy rootfs contents over to the FS
mkdir -p $TMPDIR/root mkdir -p $TMPDIR/root
mkdir -p $TMPDIR/boot mkdir -p $TMPDIR/boot
mount ${SDCARD}${SDDEV}p1 $TMPDIR/boot mount ${SDCARD}${SDDEV}1 $TMPDIR/boot
mount ${SDCARD}${SDDEV}p2 $TMPDIR/root mount ${SDCARD}${SDDEV}2 $TMPDIR/root
# For Khadas devices # For Khadas devices
elif [[ "$DEVICE" = "vim3" ]]; then elif [[ "$DEVICE" = "vim3" ]]; then
@ -324,14 +324,14 @@ prepare_card () {
END_SECTOR=$(expr $START + $SIZE) END_SECTOR=$(expr $START + $SIZE)
parted -s $SDCARD mkpart primary ext4 "${END_SECTOR}s" 100% 1> /dev/null 2>&1 parted -s $SDCARD mkpart primary ext4 "${END_SECTOR}s" 100% 1> /dev/null 2>&1
partprobe $SDCARD 1> /dev/null 2>&1 partprobe $SDCARD 1> /dev/null 2>&1
mkfs.vfat "${SDCARD}${SDDEV}p1" -n BOOT 1>/dev/null 2>&1 mkfs.vfat "${SDCARD}${SDDEV}1" -n BOOT 1>/dev/null 2>&1
mkfs.ext4 "${SDCARD}${SDDEV}p2" -L ROOT 1> /dev/null 2>&1 mkfs.ext4 "${SDCARD}${SDDEV}2" -L ROOT 1> /dev/null 2>&1
#copy rootfs contents over to the FS #copy rootfs contents over to the FS
mkdir -p $TMPDIR/root mkdir -p $TMPDIR/root
mkdir -p $TMPDIR/boot mkdir -p $TMPDIR/boot
mount ${SDCARD}${SDDEV}p1 $TMPDIR/boot mount ${SDCARD}${SDDEV}1 $TMPDIR/boot
mount ${SDCARD}${SDDEV}p2 $TMPDIR/root mount ${SDCARD}${SDDEV}2 $TMPDIR/root
# For pine devices # For pine devices