summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2019-12-18 11:08:39 +0100
committerJonathan Bauer2019-12-18 11:08:39 +0100
commit9ceb05f022c50a097e487da4cbf307ec2cdde269 (patch)
tree5307ef69de971a813c81076c835be0c6f851ad04
parent[vbox-src] add vboxusers group in addon-init (diff)
downloadmltk-9ceb05f022c50a097e487da4cbf307ec2cdde269.tar.gz
mltk-9ceb05f022c50a097e487da4cbf307ec2cdde269.tar.xz
mltk-9ceb05f022c50a097e487da4cbf307ec2cdde269.zip
[rfs-s32] support predefined GPT UUID for ID44/45
-rwxr-xr-xcore/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index 70f36444..0df6ae4e 100755
--- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -191,7 +191,7 @@ get_all_with_id () {
if [ ${#ID} -le 3 ]; then
exp="$exp|ID_PART_ENTRY_(NAME=OpenSLX-ID|TYPE=0x)$ID"
else
- exp="$exp|ID_PART_ENTRY_TYPE=$ID"
+ exp="$exp|ID_PART_ENTRY_(TYPE|UUID)=$ID"
fi
done
exp=${exp:1}
@@ -214,7 +214,7 @@ done
# space, thus no normal filesystem will be incidentally deleted or
# corrupted
HAVE_TEMP=no
-for PART_DEV in $(get_all_with_id "44"); do
+for PART_DEV in $(get_all_with_id "44" "87f86132-ff94-4987-b250-444444444444"); do
# check for supported filesystem and formatter
if format_disk "$PART_DEV"; then
mount_temp "${MOUNT_OPTIONS_SET_BY_FORMAT_DISK[@]}" "$PART_DEV" || continue
@@ -236,7 +236,7 @@ done
HAVE_PARTITION_45=no
get_mount_options "ext4" mopts
# try all the ID45 partitions until one succeeds, from large to small
-for PART_DEV in $(get_all_with_id "45"); do
+for PART_DEV in $(get_all_with_id "45" "87f86132-ff94-4987-b250-454545454545"); do
mkdir -p "$MOUNT_POINT_45"
# Let's see if this is an ext4 partition and if so, whether it has the proper size
# Any fixing should happen first