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
From: Carsten Haitzler carsten.haitzler@arm.com
Hadcoding 8.8.8.8 or any other DNS is a hacky workaround systemd networkd not properly setting up resolv.conf based on DHCP info. An easy solution - move to network manager. It actually gets this right. It will also handle multple network interfaces (if you plug in some USB ones) as well as Wifi (via USB) if you attach it etc. so use a better solution. Network Manager.
Signed-off-by: Carsten Haitzler carsten.haitzler@arm.com --- context/build_debian_image.sh | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/context/build_debian_image.sh b/context/build_debian_image.sh index e30c5a2..aa5eaf7 100755 --- a/context/build_debian_image.sh +++ b/context/build_debian_image.sh @@ -52,6 +52,7 @@ PACKAGES=( libncursesw5 libncurses5-dev libncursesw5-dev + network-manager )
# Install dependencies @@ -66,12 +67,8 @@ 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 -systemctl enable systemd-networkd -echo -e "[Match]\nName=e*\n[Network]\nDHCP=yes" | tee /etc/systemd/network/dhcp.network >/dev/null echo morello > /etc/hostname -echo 127.0.0.1 localhost > /etc/hosts -echo 127.0.1.1 morello >> /etc/hosts +echo 127.0.0.1 localhost morello > /etc/hosts
# Allow root access to ssh sed -i 's|#PermitRootLogin prohibit-password|PermitRootLogin yes|g' /etc/ssh/sshd_config @@ -109,21 +106,6 @@ source $MORELLO_HOME/env/morello-pcuabi-env-restore # Install Entropy generators apt-get install rng-tools haveged jitterentropy-rngd -y
-# Create /etc/resolv.conf -cat > /etc/resolv.conf << EOF -nameserver 8.8.8.8 -nameserver 8.8.4.4 -EOF - -# Create morello.network -cat > /etc/systemd/network/morello.network << EOF -[Match] -Name=enp7s0 - -[Network] -DHCP=ipv4 -EOF - # Create local service for the final system configuration cat > /etc/systemd/system/morello-config.service << EOF [Unit]
linux-morello@op-lists.linaro.org
-
carsten.haitzler＠foss.arm.com