starlingx/integ
Code Issues Proposed changes

debian: initramfs-ostree: add support to skip eject operation

Browse Source 
In special cases, the installation media does not support "eject"
operation. Add "skip-eject" option on parameter INSTPOST to avoid
"eject" operation.

Test Plan:
Pass: build-pkgs -c -p initramfs-ostree

Story: 2010643
Task: 48708

Change-Id: Ic2c0bf491780cd99d9e584ea7a80e7dc04b4fb70
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
This commit is contained in:
Zhang Xiao 2023-08-31 13:42:40 +08:00
parent a140a14ee4
commit 3f9b08eedc
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ostree/initramfs-ostree/debian/patches/0016-init-ostree-install.sh-skip-eject-operation-through-.patch Normal file
View File

@ -0,0 +1,39 @@
From c87892bae32dfc4fbb2cbb0fb4479f947e1d5a42 Mon Sep 17 00:00:00 2001
From: Zhang Xiao <xiao.zhang@windriver.com>
Date: Mon, 28 Aug 2023 19:43:11 -0700
Subject: [PATCH] init-ostree-install.sh: skip eject operation through INSTPOST
In special cases the installation media does not support "eject"
operation. Add "skip-eject" option on parameter INSTPOST to avoid
"eject" operation.
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
---
init-ostree-install.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/init-ostree-install.sh b/init-ostree-install.sh
index 6494253..0f523bc 100644
--- a/init-ostree-install.sh
+++ b/init-ostree-install.sh
@@ -58,6 +58,7 @@ OPTIONAL:
instpost=halt - Halt at the end of install vs reboot
instpost=exit - exit at the end of install vs reboot
instpost=shell - shell at the end of install vs reboot
+ instpost=skip-eject - Do not eject boot media at the end of install
instos=OSTREE_OS_NAME - Use alternate OS name vs @OSTREE_OSNAME@
instsbd=1 - Turn on the skip-boot-diff configuration
instsf=1 - Skip fat partition format
@@ -1734,7 +1735,9 @@ echo 3 > /proc/sys/vm/drop_caches
# Eject installer ISO image if available
isodev=$(blkid --label ${ISO_INSTLABEL} -o device)
if [ $? -eq 0 ]; then
- eject $isodev
+ if [ "$INSTPOST" != "skip-eject" ] ; then
+ eject $isodev
+ fi
fi
if [ "$INSTPOST" = "halt" ] ; then
--
2.40.0

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

@ -13,3 +13,4 @@
0013-Rsync-the-ostree-repo-before-pulling.patch
0014-init-ostree-install.sh-support-boot-option-inst.ks-f.patch
0015-Support-driver-switch-in-installer.patch
0016-init-ostree-install.sh-skip-eject-operation-through-.patch