Merge pull request #1136 from dedalodaelus/master

- Corrected the f2fs and btrfs emmc write, due to a missing rootfstyp…
This commit is contained in:
Igor Pečovnik 2018-10-23 07:34:22 +02:00 committed by GitHub
commit 61c8faa2a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -236,6 +236,11 @@ create_armbian()
echo "$emmcbootuuid /media/mmcboot ext4 ${mountopts[ext4]}" >> ${TempDir}/rootfs/etc/fstab
echo "/media/mmcboot/boot /boot none bind 0 0" >> ${TempDir}/rootfs/etc/fstab
fi
# if the rootfstype is not defined as cmdline argument on armbianEnv.txt
if grep -qE '^rootfstype=.*' ${TempDir}/bootfs/boot/armbianEnv.txt; then
# Add the line of type of the selected rootfstype to the file armbianEnv.txt
echo "rootfstype=$choosen_fs" >> ${TempDir}/bootfs/boot/armbianEnv.txt
fi
if [[ $eMMCFilesystemChoosen =~ ^(btrfs|f2fs)$ ]]; then
echo "$targetuuid / $choosen_fs ${mountopts[$choosen_fs]}" >> ${TempDir}/rootfs/etc/fstab