starlingx/integ
Code Issues Proposed changes

debian: Allow ISO installs to proceed without user prompts

Browse Source 
To avoid any previous ext4 file system signatures that could have been
present from previous installs, add lvcreate options to wipe signatures
and zero the first 4KiB of data in the LV. This will avoid requiring
user interaction.

 WARNING: ext4 signature detected on /dev/cgts-vg/scratch-lv at offset
 1080. Wipe it? [y/n]:

Change-Id: Ifeb0ddf193820a3e5d98006093813355d2494797
Story: 2009101
Task: 44628
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2022-02-27 00:51:50 -05:00
parent 9b0fb8e455
commit 7ba7c83297
5 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ostree/initramfs-ostree/debian/patches/0001-Prevent-auto-expansion-of-fluxdata-partition.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Robert Church <robert.church@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init-ostree.sh b/init-ostree.sh diff --git a/init-ostree.sh b/init-ostree.sh
index 1702e55..3b043ea 100644 index 6017fcf..b6eacbf 100644
--- a/init-ostree.sh --- a/init-ostree.sh
+++ b/init-ostree.sh +++ b/init-ostree.sh
@@ -32,7 +32,7 @@ ROOT_DELAY="0" @@ -32,7 +32,7 @@ ROOT_DELAY="0"

5
ostree/initramfs-ostree/debian/patches/0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Robert Church <robert.church@windriver.com>
Rebase to meta-lat 20220220 Rebase to meta-lat 20220220
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
--- ---
init-ostree-install.sh | 119 ++++++++++++++++++++++++++++++++++++++++- init-ostree-install.sh | 119 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 117 insertions(+), 2 deletions(-) 1 file changed, 117 insertions(+), 2 deletions(-)
diff --git a/init-ostree-install.sh b/init-ostree-install.sh diff --git a/init-ostree-install.sh b/init-ostree-install.sh
@ -195,6 +195,3 @@ index c46650f..0a84179 100644
elif [ "$INSTFMT" != 0 ] ; then elif [ "$INSTFMT" != 0 ] ; then
if [ $INSTSF = 1 ] ; then if [ $INSTSF = 1 ] ; then
dosfslabel ${fs_dev}${p1} boot dosfslabel ${fs_dev}${p1} boot
--
2.27.0

8
ostree/initramfs-ostree/debian/patches/0003-debian-Copy-sysroot-var-log-to-LVM-volume.patch
View File

@ -1,4 +1,3 @@
From 5598e61c3471c0cf253e6d077f09ee2b1d438ea9 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com> From: Charles Short <charles.short@windriver.com>
Date: Thu, 17 Feb 2022 15:21:03 -0500 Date: Thu, 17 Feb 2022 15:21:03 -0500
Subject: [PATCH 3/3] debian: Copy /sysroot/var/log to LVM volume Subject: [PATCH 3/3] debian: Copy /sysroot/var/log to LVM volume
@ -13,10 +12,10 @@ Signed-off-by: Charles Short <charles.short@windriver.com>
1 file changed, 9 insertions(+) 1 file changed, 9 insertions(+)
diff --git a/init-ostree-install.sh b/init-ostree-install.sh diff --git a/init-ostree-install.sh b/init-ostree-install.sh
index 57e8f2d..f56b78d 100644 index 0a84179..d777682 100644
--- a/init-ostree-install.sh --- a/init-ostree-install.sh
+++ b/init-ostree-install.sh +++ b/init-ostree-install.sh
@@ -1468,6 +1468,15 @@ if [ -d ${PHYS_SYSROOT}/ostree/1/usr/homedirs/home ] ; then @@ -1512,6 +1512,15 @@ if [ -d ${PHYS_SYSROOT}/ostree/1/usr/homedirs/home ] ; then
tar --xattrs --xattrs-include='*' -xf - -C /var1/home 2> /dev/null tar --xattrs --xattrs-include='*' -xf - -C /var1/home 2> /dev/null
fi fi
@ -32,6 +31,3 @@ index 57e8f2d..f56b78d 100644
if [ -n "${KS}" ]; then if [ -n "${KS}" ]; then
rootfs=`ls ${PHYS_SYSROOT}/ostree/? -d` rootfs=`ls ${PHYS_SYSROOT}/ostree/? -d`
if [ "$INSTAB" = 1 ] ; then if [ "$INSTAB" = 1 ] ; then
--
2.25.1

33
ostree/initramfs-ostree/debian/patches/0004-Wipe-signatures-and-zero-first-4KiB.patch Normal file
View File

@ -0,0 +1,33 @@
From: Robert Church <robert.church@windriver.com>
Date: Sat, 26 Feb 2022 22:08:52 -0500
Subject: Wipe signatures and zero first 4KiB
To avoid any previous ext4 file system signatures that could have been
present from previous installs, add lvcreate options to wipe signatures
and zero the first 4KiB of data in the LV. This will avoid requiring
user interaction.
WARNING: ext4 signature detected on /dev/cgts-vg/scratch-lv at offset
1080. Wipe it? [y/n]:
Signed-off-by: Robert Church <robert.church@windriver.com>
---
init-ostree-install.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init-ostree-install.sh b/init-ostree-install.sh
index d777682..f05f7ba 100644
--- a/init-ostree-install.sh
+++ b/init-ostree-install.sh
@@ -1241,9 +1241,9 @@ if [ "$BL" = "grub" -a "$INSTFMT" != "0" ] ; then
pi=$((pi+1))
vgcreate --yes --force cgts-vg ${fs_dev}${pi}
- lvcreate --yes -n log-lv --size "${LOG_VOL_SIZE}MB" cgts-vg
+ lvcreate -y -Wy -Zy -n log-lv --size "${LOG_VOL_SIZE}MB" cgts-vg
mkfs.ext4 -F /dev/cgts-vg/log-lv
- lvcreate -n scratch-lv --size "${SCRATCH_VOL_SIZE}MB" cgts-vg
+ lvcreate -y -Wy -Zy -n scratch-lv --size "${SCRATCH_VOL_SIZE}MB" cgts-vg
mkfs.ext4 -F /dev/cgts-vg/scratch-lv
;;

1
ostree/initramfs-ostree/debian/patches/series
View File

@ -1,3 +1,4 @@
0001-Prevent-auto-expansion-of-fluxdata-partition.patch 0001-Prevent-auto-expansion-of-fluxdata-partition.patch
0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch 0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch
0003-debian-Copy-sysroot-var-log-to-LVM-volume.patch 0003-debian-Copy-sysroot-var-log-to-LVM-volume.patch
0004-Wipe-signatures-and-zero-first-4KiB.patch