From e6eae6374f8e93a5d5a84f4a2314d55a372acf84 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 1 Mar 2022 14:35:28 +0800 Subject: [PATCH] debian: set default size variables in install script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although LAT adds these variables to the grub.cfg file for disk boot automatically. However for pxeboot we develop the grub menus outside of LAT. This update is in response to not wanting to put the size variables "FSZ BSZ RSZ VSZ" on the pxeboot grub command line. If don’t specify the size variables (FSZ BSZ RSZ VSZ) on the grub command line nor the --inst-flux option in the lat-disk command. Have default size variables in install script PASS: Build package initramfs-ostree PASS: PXE install without don’t specify the size variables (FSZ BSZ RSZ VSZ) on the grub command line nor the --inst-flux option in the lat-disk command. Story: 2008846 Task: 44637 Signed-off-by: Hongxu Jia Change-Id: Id7f8a015f38ce9a7840f2172093d591ec117d843 --- ...ult-size-variables-in-install-script.patch | 35 +++++++++++++++++++ ostree/initramfs-ostree/debian/patches/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 ostree/initramfs-ostree/debian/patches/0006-debian-set-default-size-variables-in-install-script.patch diff --git a/ostree/initramfs-ostree/debian/patches/0006-debian-set-default-size-variables-in-install-script.patch b/ostree/initramfs-ostree/debian/patches/0006-debian-set-default-size-variables-in-install-script.patch new file mode 100644 index 000000000..9e7e57fec --- /dev/null +++ b/ostree/initramfs-ostree/debian/patches/0006-debian-set-default-size-variables-in-install-script.patch @@ -0,0 +1,35 @@ +From 52ad1b5821b76b26db2933338a46f478fadb3fcb Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 1 Mar 2022 14:28:01 +0800 +Subject: [PATCH 5/5] debian: set default size variables in install script + +If don’t specify the size variables (FSZ BSZ RSZ VSZ) on the +grub command line nor the --inst-flux option in the lat-disk command. + +Have default size variables in install script + +Signed-off-by: Hongxu Jia +--- + init-ostree-install.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/init-ostree-install.sh b/init-ostree-install.sh +index 56f01c0..42091d4 100644 +--- a/init-ostree-install.sh ++++ b/init-ostree-install.sh +@@ -509,9 +509,9 @@ fatal() { + # default values must match ostree-settings.inc + BLM=2506 + FSZ=32 +-BSZ=200 +-RSZ=1400 +-VSZ=0 ++BSZ=512 ++RSZ=20480 ++VSZ=20480 + # end values from ostree-settings.inc + LUKS=0 + BIOSPLUSEFI=0 +-- +2.25.1 + diff --git a/ostree/initramfs-ostree/debian/patches/series b/ostree/initramfs-ostree/debian/patches/series index 2f1bdfe89..460c2e578 100644 --- a/ostree/initramfs-ostree/debian/patches/series +++ b/ostree/initramfs-ostree/debian/patches/series @@ -3,3 +3,4 @@ 0003-debian-Copy-sysroot-var-log-to-LVM-volume.patch 0004-Wipe-signatures-and-zero-first-4KiB.patch 0005-Make-boot-efi-mount-as-rw.patch +0006-debian-set-default-size-variables-in-install-script.patch