Backport #933 and #938 to 0.21.2 #937
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes #938 Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com>
|
Backport only tests #943 |
dragonchaser
approved these changes
Dec 7, 2021
| fi | ||
| } | ||
|
|
||
| installer_cleanup2() |
There was a problem hiding this comment.
can we have a bit more descriptive name here?
There was a problem hiding this comment.
that's not really new code here, I'd try to keep the changes stick to the patch backport, or we might introduce new bugs
There was a problem hiding this comment.
here is the real diff between the two cos.sh:
--- packages/installer/cos.sh 2021-12-07 15:27:19.112633623 +0100
+++ cos.sh 2021-12-07 15:29:08.209264737 +0100
@@ -198,6 +198,12 @@ prepare_passive() {
part_probe() {
local dev=$1
+
+ # Don't require udevadm necessarly, but run it best-effort
+ if hash udevadm 2>/dev/null; then
+ udevadm settle
+ fi
+
partprobe ${dev} 2>/dev/null || true
sync
@@ -240,8 +246,11 @@ do_format()
if [ "$BOOTFLAG" == "esp" ]; then
parted -s ${DEVICE} mkpart primary fat32 0% 50MB # efi
parted -s ${DEVICE} set 1 ${BOOTFLAG} on
+
+ part_probe $DEVICE
+
PREFIX=${DEVICE}
- if [ ! -e ${PREFIX}${STATE_NUM} ]; then
+ if [ ! -e ${PREFIX}1 ]; then
PREFIX=${DEVICE}p
fi
BOOT=${PREFIX}1
@@ -250,6 +259,7 @@ do_format()
elif [ "$BOOTFLAG" == "bios_grub" ]; then
parted -s ${DEVICE} mkpart primary 0% 1MB # BIOS boot partition for GRUB
parted -s ${DEVICE} set 1 ${BOOTFLAG} on
+ part_probe $DEVICE
fi
yip -s partitioning $COS_PARTITION_LAYOUT
Itxaka
approved these changes
Dec 7, 2021
|
Basic installation tests seems to pass in #943, altought the full suite can't run as it was created afterwards, and is already testing features that aren't in 0.21.x. Merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a multi-fold PR:
cc @johnliu55tw @bk201
Signed-off-by: Ettore Di Giacinto edigiacinto@suse.com