95a9d2d699
Add two patches to update the init and lat-installer scripts to - fully parameterize ostree boot and root devices for A and B locations so that devices can be specified - add support for specifying an ostree var device that will be used for the dynamic R/W data. This was previously specified by a hard coded 'LABEL=fluxdata' partition. Rename patches 0003-0008 as former patch 0002 was removed with a previous commit. Test Plan: - PASS: BIOS AIO-SX - PASS: UEFI AIO-SX - PASS: BIOS 2+2+2 - SKIP: secure boot, not ready for Stx8.0 - PASS: AIO-SX upgrade - PASS: duplex upgrade - PASS: DC subcloud install (virtual test) Change-Id: I9fbe3fc89b05743b9c6090c05d3d011e2ba48eda Story: 2010444 Task: 46883 Signed-off-by: Robert Church <robert.church@windriver.com>
27 lines
939 B
Diff
27 lines
939 B
Diff
From: Jim Somerville <jim.somerville@windriver.com>
|
|
Date: Thu, 7 Apr 2022 18:22:07 +0000
|
|
Subject: Make /boot/efi mount as rw
|
|
|
|
Signed-off-by: Jim Somerville <jim.somerville@windriver.com>
|
|
---
|
|
init-ostree-install.sh | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/init-ostree-install.sh b/init-ostree-install.sh
|
|
index 0e5b8f3..51fb6a0 100644
|
|
--- a/init-ostree-install.sh
|
|
+++ b/init-ostree-install.sh
|
|
@@ -1540,6 +1540,12 @@ if [ -d /sys/firmware/efi/efivars ] ;then
|
|
fi
|
|
fi
|
|
|
|
+############################################
|
|
+# StarlingX: Do not mount the otaefi partition ro in fstab
|
|
+# Caution... If someone resets the /etc/fstab with OSTree this change is lost...
|
|
+echo "Removing ro from otaefi mount in fstab"
|
|
+sed -i "s:\(LABEL=otaefi.*\) ro:\1 defaults:g" ${PHYS_SYSROOT}/ostree/?/etc/fstab
|
|
+
|
|
if [ "$INSTPOST" = "shell" ] ; then
|
|
echo " Entering interactive install shell, please exit to continue when done"
|
|
shell_start
|