From: Tobias Hunger <tobias.hunger@gmail.com>
Date: Wed, 20 May 2020 15:28:55 +0000 (+0200)
Subject: Repart: Add simple tests for Label="" and UUID=""
X-Git-Tag: v246-rc1~294^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b5cb4ceb43b89b53dc58b7a61fb1a16e928ad23;p=thirdparty%2Fsystemd.git

Repart: Add simple tests for Label="" and UUID=""

Make sure Labels and UUIDs taken from destination definitions are
taken into account when no Label/UUID is currently set already.
---

diff --git a/src/partition/test-repart.sh b/src/partition/test-repart.sh
index 58fcc797c43..e1ff357929d 100755
--- a/src/partition/test-repart.sh
+++ b/src/partition/test-repart.sh
@@ -68,8 +68,13 @@ EOF
 cat >$D/definitions/extra.conf <<EOF
 [Partition]
 Type=linux-generic
+Label=custom_label
+UUID=a0a1a2a3a4a5a6a7a8a9aaabacadaeaf
 EOF
 
+echo "Label=ignored_label" >> $D/definitions/home.conf
+echo "UUID=b0b1b2b3b4b5b6b7b8b9babbbcbdbebf" >> $D/definitions/home.conf
+
 $repart $D/zzz --dry-run=no --seed=$SEED --definitions=$D/definitions
 
 sfdisk -d $D/zzz | grep -v -e 'sector-size' -e '^$' >$D/populated2
@@ -85,7 +90,7 @@ $D/zzz1 : start=        2048, size=      591856, type=933AC7E1-2EB4-4F13-B844-0E
 $D/zzz2 : start=      593904, size=      591856, type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709, uuid=CE9C76EB-A8F1-40FF-813C-11DCA6C0A55B, name="root-x86-64"
 $D/zzz3 : start=     1185760, size=      591864, type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709, uuid=AC60A837-550C-43BD-B5C4-9CB73B884E79, name="root-x86-64-2"
 $D/zzz4 : start=     1777624, size=      131072, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F, uuid=2AA78CDB-59C7-4173-AF11-C7453737A5D1, name="swap"
-$D/zzz5 : start=     1908696, size=      188416, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=03477476-06AD-44E8-9EF4-BC2BD7771289, name="linux-generic"
+$D/zzz5 : start=     1908696, size=      188416, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=A0A1A2A3-A4A5-A6A7-A8A9-AAABACADAEAF, name="custom_label"
 EOF
 
 $repart $D/zzz --size=2G --dry-run=no --seed=$SEED --definitions=$D/definitions
@@ -103,5 +108,5 @@ $D/zzz1 : start=        2048, size=      591856, type=933AC7E1-2EB4-4F13-B844-0E
 $D/zzz2 : start=      593904, size=      591856, type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709, uuid=CE9C76EB-A8F1-40FF-813C-11DCA6C0A55B, name="root-x86-64"
 $D/zzz3 : start=     1185760, size=      591864, type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709, uuid=AC60A837-550C-43BD-B5C4-9CB73B884E79, name="root-x86-64-2"
 $D/zzz4 : start=     1777624, size=      131072, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F, uuid=2AA78CDB-59C7-4173-AF11-C7453737A5D1, name="swap"
-$D/zzz5 : start=     1908696, size=     2285568, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=03477476-06AD-44E8-9EF4-BC2BD7771289, name="linux-generic"
+$D/zzz5 : start=     1908696, size=     2285568, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=A0A1A2A3-A4A5-A6A7-A8A9-AAABACADAEAF, name="custom_label"
 EOF