build-vm, kernel, uboot: setup /etc/fstab for build-vm

The entry in /etc/fstab about the mount parameters of the root partition needs to be done not only for builds with u-boot. But, if the record already exists, then it will not be added. The file system type is set by the variable VM_FSTYPE.

build-vm, kernel, uboot: setup /etc/fstab for build-vm
8c68a3c5 · Anton Midyukov · 801e99b0 · 8c68a3c5 · 8c68a3c5 · 8c68a3c5
Commit 8c68a3c5 authored Nov 10, 2019 by Anton Midyukov
Showing with 5 additions and 1 deletion

50-fstab features.in/build-vm/image-scripts.d/50-fstab +4 -0

config.mk features.in/kernel/config.mk +1 -0

90-uboot-config-install features.in/uboot/image-scripts.d/90-uboot-config-install +0 -1

No files found.
--- a/features.in/build-vm/image-scripts.d/50-fstab
+++ b/features.in/build-vm/image-scripts.d/50-fstab
+#!/bin/sh
+
+grep -qe "[[:space:]]/[[:space:]]" /etc/fstab ||
+  printf "LABEL=ROOT\t/\t$GLOBAL_VM_FSTYPE\tdefaults\t1 1\n" >> /etc/fstab
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -75,3 +75,4 @@ ifeq (,$(filter-out armh,$(ARCH)))
 endif
 	@$(call xport,VM_INITRDMODULES)
 	@$(call xport,VM_INITRDFEATURES)
+	@$(call xport,VM_FSTYPE)
--- a/features.in/uboot/image-scripts.d/90-uboot-config-install
+++ b/features.in/uboot/image-scripts.d/90-uboot-config-install
@@ -16,4 +16,3 @@ done
 for KVER in $kver; do
 	/sbin/installkernel --uboot --keep-initrd "$KVER"
 done
-printf 'LABEL=ROOT\t/\text4\tdefaults\t1 1\n' >> /etc/fstab