rpms/rear
7
0
Fork 0
Code Issues Pull Requests Releases Activity

skip unsupported partition tables

Browse Source 
Resolves: RHEL-78583
This commit is contained in:
Lukáš Zaoral 2026-01-14 16:21:20 +01:00
parent cd2ac8d01f
commit 0410c0c3ac
No known key found for this signature in database
GPG Key ID: 39157506DD67752D
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rear-skip-unsupported-partition-tables-RHEL-78583.patch Normal file
View File

@ -0,0 +1,29 @@
From 825478ee27f916553938afaf5164fec22cb32732 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Tue, 10 May 2022 10:43:39 +0200
Subject: [PATCH] Update 200_partition_layout.sh
In layout/save/GNU/Linux/200_partition_layout.sh
ensure $disk_label is one of the supported partition tables, cf.
https://github.com/rear/rear/issues/2801#issuecomment-1122015129
---
usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
index b747d121c6..6e641d280e 100644
--- a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
+++ b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
@@ -115,6 +115,11 @@ extract_partitions() {
parted -s $device print > $TMP_DIR/parted
disk_label=$(grep -E "Partition Table|Disk label" $TMP_DIR/parted | cut -d ":" -f "2" | tr -d " ")
fi
+ # Ensure $disk_label is valid to determine the partition name/type in the next step at 'declare type'
+ # cf. https://github.com/rear/rear/issues/2801#issuecomment-1122015129
+ if ! [[ "$disk_label" = "msdos" || "$disk_label" = "gpt" || "$disk_label" = "gpt_sync_mbr" || "$disk_label" = "dasd" ]] ; then
+ Error "Unsupported partition table '$disk_label' (must be one of 'msdos' 'gpt' 'gpt_sync_mbr' 'dasd')"
+ fi
cp $TMP_DIR/partitions $TMP_DIR/partitions-data

4
rear.spec
View File

@ -139,6 +139,10 @@ Patch133: rear-abort-source-on-syntax-error-RHEL-104289.patch
# https://github.com/rear/rear/commit/acb19846599a5fc411fd8c288776e1af2d79c920
Patch134: rear-fix-VG-recreation-RHEL-23887.patch
# skip unsupported partition tables, e.g. sun
# https://github.com/rear/rear/commit/825478ee27f916553938afaf5164fec22cb32732
Patch135: rear-skip-unsupported-partition-tables-RHEL-78583.patch
######################
# downstream patches #
######################