Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-4.14] OCPBUGS-35989: coreos-cryptfs: drop growpart call #1536

Merged
merged 1 commit into from
Jul 2, 2024
Merged

[release-4.14] OCPBUGS-35989: coreos-cryptfs: drop growpart call #1536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions overlay.d/05rhcos/usr/libexec/coreos-cryptfs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,10 @@ try_open() {
# this avoids the cryptsetup performance penalty.
msg "${dev} is not encrypted. Device will be mounted as device-mapper linear target."

# We inline a growpart here since it's simpler than trying to reconfigure dm-linear
local major minor devpath partition parent_path parent_device
major=$((0x$(stat -c '%t' "${dev}")))
minor=$((0x$(stat -c '%T' "${dev}")))
devpath=$(realpath "/sys/dev/block/${major}:${minor}")
partition=$(cat "$devpath/partition")
parent_path=$(dirname "$devpath")
parent_device=/dev/$(basename "${parent_path}")

# TODO: make this idempotent, and don't error out if
# we can't resize.
growpart "${parent_device}" "${partition}" || true
# Note: we used to growpart here, but don't anymore. That should only
# have been done on firstboot, not every boot. Since we don't support
# this LUKS setup anymore on new installs, we dropped it. That also
# fixes some growpart-related issues (see OCPBUGS-33124).

local dev_size=$(($(blockdev --getsize "${dev}") - "${LUKS_HEADER_OFFSET_SECTORS}"))
echo "0 ${dev_size} linear ${dev} ${LUKS_HEADER_OFFSET_SECTORS}" \
Expand Down