From 203702bda9dd8320afceea20ff21d2191c1365a0 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sun, 20 Feb 2022 12:35:41 +0800 Subject: [PATCH] ostree/initramfs-ostree: upgrade to version 20220220 Add kickstart hook to create partitions and make filesystem on rootfs disk From https://github.com/Wind-River/meta-lat e794442 lat installer: add kickstart hook to make filesystem on rootfs disk 69aef5b lat installer: add kickstart hook to create partitions on rootfs disk c69260c lat installer: add kickstart hook to operate before partition a7a8f1e lat installer: no expand fluxdata partition conditionally 2b545ba lat-installer: support no fluxdata partition for kickstart 7dbad54 lat installer: correct kickstart %pre and %post parsing 75d177c lat installer: add lat-installer.hook ef9be58 lat: add package lvm2 to debian initramfs and image 0ea8a56 lat installer: correct grub partition index update e791b6f init-ostree-install.sh: calculate partition index while making fs for arm Rebase 0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch to version 20220220 Test Plan: - PASS: Download initramfs-ostree source tarball - PASS: Build package initramfs-ostree - PASS: Build ISO image - PASS: PXE ostree install over IPv4, add hooks to kickstart which created multiple partitions on rootfs disk - PASS: Boot installed image, multiple partitions mounted to rootfs Story: 2008846 Task: 44545 Signed-off-by: Hongxu Jia Change-Id: Ib088ba49999d0c4de9415302abf4a09d66a3cf9c --- ostree/initramfs-ostree/debian/meta_data.yaml | 4 +- ...S-compatible-initial-AIO-partitionin.patch | 42 +++++++++---------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/ostree/initramfs-ostree/debian/meta_data.yaml b/ostree/initramfs-ostree/debian/meta_data.yaml index 6c68286cf..851387d43 100644 --- a/ostree/initramfs-ostree/debian/meta_data.yaml +++ b/ostree/initramfs-ostree/debian/meta_data.yaml @@ -4,8 +4,8 @@ dl_hook: dl_hook dl_files: meta-lat.tar.gz: topdir: null - url: https://github.com/Wind-River/meta-lat/archive/refs/tags/20220213.tar.gz - md5sum: cb4e14179d424669082c5d451b1072f8 + url: https://github.com/Wind-River/meta-lat/archive/refs/tags/20220220.tar.gz + md5sum: f5d7bb37170f9749f43f3a4ec1c158d1 revision: dist: $STX_DIST PKG_GITREVCOUNT: true diff --git a/ostree/initramfs-ostree/debian/patches/0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch b/ostree/initramfs-ostree/debian/patches/0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch index 1570cc425..3b0765a74 100644 --- a/ostree/initramfs-ostree/debian/patches/0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch +++ b/ostree/initramfs-ostree/debian/patches/0002-debian-Add-CentOS-compatible-initial-AIO-partitionin.patch @@ -1,5 +1,5 @@ From: Robert Church -Date: Mon, 31 Jan 2022 22:47:09 -0500 +Date: Sun, 20 Feb 2022 14:50:05 +0800 Subject: debian: Add CentOS compatible initial AIO partitioning/formatting Add support for initial AIO partitioning and LVM formatting for AIO @@ -9,15 +9,18 @@ hosts. - Creates initial logical volumes for scratch-lv and log-lv Signed-off-by: Robert Church + +Rebase to meta-lat 20220220 +Signed-off-by: Hongxu Jia --- - init-ostree-install.sh | 122 +++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 119 insertions(+), 3 deletions(-) + init-ostree-install.sh | 119 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 117 insertions(+), 2 deletions(-) diff --git a/init-ostree-install.sh b/init-ostree-install.sh -index 55ece63..1d056a5 100644 +index c46650f..18af966 100644 --- a/init-ostree-install.sh +++ b/init-ostree-install.sh -@@ -82,7 +82,9 @@ OPTIONAL: +@@ -86,7 +86,9 @@ OPTIONAL: BSZ=# - MB size of boot partition RSZ=# - MB size of root partition VSZ=# - MB size of var partition (0 for auto expand) @@ -28,7 +31,7 @@ index 55ece63..1d056a5 100644 EOF } -@@ -102,7 +104,7 @@ conflict_label() { +@@ -108,7 +110,7 @@ conflict_label() { local op=$1 local 'label' 'd' 'devs' 'conflict' 'i' 'fstype' conflict=1 @@ -37,7 +40,7 @@ index 55ece63..1d056a5 100644 devs=$(blkid -t LABEL=$label -o device |grep -v $INSTDEV) if [ "$devs" != "" ] ; then i=0 -@@ -513,6 +515,8 @@ IP="" +@@ -547,6 +549,8 @@ IP="" MAX_TIMEOUT_FOR_WAITING_LOWSPEED_DEVICE=60 OSTREE_KERNEL_ARGS=${OSTREE_KERNEL_ARGS=%OSTREE_KERNEL_ARGS%} KS="" @@ -46,7 +49,7 @@ index 55ece63..1d056a5 100644 if [ "$OSTREE_KERNEL_ARGS" = "%OSTREE_KERNEL_ARGS%" ] ; then OSTREE_KERNEL_ARGS="ro rootwait" -@@ -603,6 +607,10 @@ read_args() { +@@ -643,6 +647,10 @@ read_args() { RSZ=$optarg ;; VSZ=*) VSZ=$optarg ;; @@ -57,7 +60,7 @@ index 55ece63..1d056a5 100644 esac done # defaults if not set -@@ -615,6 +623,9 @@ read_args() { +@@ -655,6 +663,9 @@ read_args() { if [ "$INSTGPG" = "" ] ; then INSTGPG=1 ; fi if [ "$INSTFLUX" = "" ] ; then INSTFLUX=1 ; fi if [ "$INSTSBD" = "" ] ; then INSTSBD=2 ; fi @@ -67,7 +70,7 @@ index 55ece63..1d056a5 100644 } shell_start() { -@@ -680,6 +691,40 @@ grub_partition() { +@@ -720,6 +731,40 @@ grub_partition() { a="" first=`sgdisk -F ${dev}|grep -v Creating` else @@ -108,11 +111,10 @@ index 55ece63..1d056a5 100644 sgdisk -Z ${dev} first=`sgdisk -F ${dev}|grep -v Creating` if [ "$BIOSPLUSEFI" = "1" ] ; then -@@ -730,6 +775,41 @@ grub_partition() { +@@ -779,6 +824,40 @@ grub_partition() { fi - a="$a -n $p:$first:$end -c $p:fluxdata" fi -+ + + ############################################ + # StarlingX: Temp partitioning compatability + if [ "$INSTSTX" = 1 ] ; then @@ -150,16 +152,7 @@ index 55ece63..1d056a5 100644 sgdisk $a -p ${dev} } -@@ -1016,7 +1096,7 @@ fi - udevadm settle --timeout=3 - - cnt=50 --while [ $cnt ] ; do -+while [ "$cnt" -gt 0 ] ; do - blockdev --rereadpt ${dev} 2> /dev/null > /dev/null && break - sleep 0.1 - cnt=$(($cnt - 1)) -@@ -1074,6 +1154,42 @@ if [ "$BL" = "grub" -a "$INSTFMT" != "0" ] ; then +@@ -1145,6 +1224,42 @@ if [ "$BL" = "grub" -a "$INSTFMT" != "0" ] ; then mkfs.ext4 -F -L fluxdata ${fs_dev}${FLUXPART} fi fi @@ -202,3 +195,6 @@ index 55ece63..1d056a5 100644 elif [ "$INSTFMT" != 0 ] ; then if [ $INSTSF = 1 ] ; then dosfslabel ${fs_dev}${p1} boot +-- +2.25.1 +