Skip to content

osguard: fix usr-a/b repart.d types to match image #14470

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

Draft
wants to merge 2 commits into
base: 3.0-dev
Choose a base branch
from
+3 −10
Draft

osguard: fix usr-a/b repart.d types to match image #14470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd7510
generate-repartd: preserve partition's type
christopherco Aug 10, 2025
84b35f7
osguard: fix usr-a/b repart.d types to match image
christopherco Aug 10, 2025
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
2 changes: 1 addition & 1 deletion toolkit/imageconfigs/files/osguard/repart.d/12-usr-a.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Partition]
Type=usr
Type=linux-generic
Label=usr-a
SizeMinBytes=1G
SizeMaxBytes=1G
2 changes: 1 addition & 1 deletion toolkit/imageconfigs/files/osguard/repart.d/16-usr-b.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Partition]
Type=usr
Type=linux-generic
Label=usr-b
SizeMinBytes=1G
SizeMaxBytes=1G
9 changes: 1 addition & 8 deletions toolkit/scripts/generate-repartd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@ rm -f "$REPART_DIR"/*.conf

emit_partition() {
local num="$1" part="$2" type="$3" label="$4" size="$5"
# Set Type for root and root-hash partitions
if [[ "$part" =~ ^usr-(a|b)$ ]]; then
type_out="usr"
elif [[ "$part" =~ ^usr-hash-(a|b)$ ]]; then
type_out="usr-verity"
else
type_out="$type"
fi
type_out="$type"

# Ensure label is never null
if [[ -z "$label" || "$label" == "null" ]]; then
Expand Down
Loading