From: Carsten Haitzler carsten.haitzler@arm.com
Have boot (and root) properly mounted by fstab post-boot in debian at least to have a more normal system experience.
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 4 ++-- scripts/build-morello-image.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
From: Carsten Haitzler carsten.haitzler@arm.com
Use fs labels for later mounting by label in fstab
Signed-off-by: Carsten Haitzler carsten.haitzler@arm.com --- context/make_image.sh | 4 ++-- scripts/build-morello-image.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/context/make_image.sh b/context/make_image.sh index 964f287..b803bcd 100644 --- a/context/make_image.sh +++ b/context/make_image.sh @@ -30,7 +30,7 @@ mv /morello_sw/debian_bullseye/morello-pcuabi-env /morello_sw/stage2 dd if=/dev/zero of=morello-debian.img bs=1024K count=4096
__loop_device=$(losetup -f --show morello-debian.img) -mkfs.ext4 $__loop_device +mkfs.ext4 -L MRLO-ROOT $__loop_device mkdir mnt_point mount $__loop_device ./mnt_point
@@ -52,7 +52,7 @@ cd $MORELLO_PCUABI_ENV dd if=/dev/zero of=morello-pcuabi-env.img bs=1024K count=100
__loop_device=$(losetup -f --show morello-pcuabi-env.img) -mkfs.ext4 $__loop_device +mkfs.ext4 -L MRLO-PCROOT $__loop_device mkdir mnt_point mount $__loop_device ./mnt_point
diff --git a/scripts/build-morello-image.sh b/scripts/build-morello-image.sh index 31e021e..5b29a02 100755 --- a/scripts/build-morello-image.sh +++ b/scripts/build-morello-image.sh @@ -19,7 +19,7 @@ build_morello_image() { "$MORELLO_HOME/scripts/tools/mk-part-fat" \ -o "$MORELLO_GEN/bsp/$PLATFORM/morello.esp.img" \ -s "AUTO" \ - -l "ESP" \ + -l "MRLO-ESP" \ "$MORELLO_GEN/bsp/firmware/$PLATFORM/grub.efi" "/EFI/BOOT/BOOTAA64.EFI" \ "$MORELLO_GEN/bsp/firmware/$PLATFORM/grub_$PLATFORM.cfg" "/grub/grub.cfg" \ "$MORELLO_GEN/dts/arm/morello-$PLATFORM.dtb" "/morello.dtb" \
From: Carsten Haitzler carsten.haitzler@arm.com
Mount by given label in debian rootfs
Signed-off-by: Carsten Haitzler carsten.haitzler@arm.com --- context/build_debian_image.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/context/build_debian_image.sh b/context/build_debian_image.sh index d2d23e3..e30c5a2 100755 --- a/context/build_debian_image.sh +++ b/context/build_debian_image.sh @@ -61,6 +61,9 @@ echo 'root:morello' | chpasswd
# Enable /dev/shm (required to build EDK2) echo -e "none /dev/shm tmpfs rw,nosuid,nodev,noexec 0 0" >> /etc/fstab +# Mount root and boot +echo -e "LABEL=MRLO-ROOT / ext4 rw,noatime 0 0" >> /etc/fstab +echo -e "LABEL=MRLO-ESP /boot vfat rw 0 0" >> /etc/fstab mount /dev/shm
# Enable network
https://git.morello-project.org/carhai01/morello-linux-docker/-/pipelines/12...
On 4/12/23 14:40, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@arm.com
Have boot (and root) properly mounted by fstab post-boot in debian at least to have a more normal system experience.
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 4 ++-- scripts/build-morello-image.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
On 4/12/23 14:40, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@arm.com
Have boot (and root) properly mounted by fstab post-boot in debian at least to have a more normal system experience.
I saw you posted to series on the same topic, and I have some questions: - Is there any specific order in which I should consider them? - Was this series tested as well? - If so, can you add the test results?
Thanks, Vincenzo
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 4 ++-- scripts/build-morello-image.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
On 4/12/23 15:11, Vincenzo Frascino wrote:
On 4/12/23 14:40, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@arm.com
Have boot (and root) properly mounted by fstab post-boot in debian at least to have a more normal system experience.
I saw you posted to series on the same topic, and I have some questions:
- Is there any specific order in which I should consider them?
they are independent of each other
- Was this series tested as well?
i have used both of them applied to my tree - i split them out into 2 separate MR's and sent patches because that's how you want that done.
- If so, can you add the test results?
I've built it locally. so you want me to create another branch to merge these 2 branches just to run a CI?
Thanks, Vincenzo
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 4 ++-- scripts/build-morello-image.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
linux-morello-distros@op-lists.linaro.org
-
Carsten Haitzler -
carsten.haitzler＠foss.arm.com
-
Vincenzo Frascino