Merging upstream version 252.25.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 14 insertions, 5 deletions

diff --git a/test/units/testsuite-30.sh b/test/units/testsuite-30.sh
index 57f4666..91ee199 100755
--- a/test/units/testsuite-30.sh
+++ b/test/units/testsuite-30.sh
@@ -16,7 +16,7 @@ systemd-run --on-clock-change touch /tmp/clock-changed
 test ! -f /tmp/timezone-changed
 test ! -f /tmp/clock-changed
 
-timedatectl set-timezone Europe/Kiev
+timedatectl set-timezone Europe/Kyiv
 
 while test ! -f /tmp/timezone-changed ; do sleep .5 ; done
 
diff --git a/test/units/testsuite-45.sh b/test/units/testsuite-45.sh
index ba01daa..76124cd 100755
--- a/test/units/testsuite-45.sh
+++ b/test/units/testsuite-45.sh
@@ -55,12 +55,12 @@ test_timezone() {
     assert_in "Local time:" "$(timedatectl --no-pager)"
 
     echo 'change timezone'
-    assert_eq "$(timedatectl --no-pager set-timezone Europe/Kiev 2>&1)" ""
-    assert_eq "$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')" "Europe/Kiev"
+    assert_eq "$(timedatectl --no-pager set-timezone Europe/Kyiv 2>&1)" ""
+    assert_eq "$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')" "Europe/Kyiv"
     if [[ -f /etc/timezone ]]; then
-        assert_eq "$(cat /etc/timezone)" "Europe/Kiev"
+        assert_eq "$(cat /etc/timezone)" "Europe/Kyiv"
     fi
-    assert_in "Time zone: Europe/Kiev \(EES*T, \+0[0-9]00\)" "$(timedatectl)"
+    assert_in "Time zone: Europe/Kyiv \(EES*T, \+0[0-9]00\)" "$(timedatectl)"
 
     if [[ -n "$ORIG_TZ" ]]; then
         echo 'reset timezone to original'
diff --git a/test/units/testsuite-72.sh b/test/units/testsuite-72.sh
index 9effc98..d6c20ef 100755
--- a/test/units/testsuite-72.sh
+++ b/test/units/testsuite-72.sh
@@ -12,6 +12,15 @@ if ! test -x "$SYSUPDATE"; then
     exit 0
 fi
 
+# Loopback devices may not be supported. They are used because sfdisk cannot
+# change the sector size of a file, and we want to test both 512 and 4096 byte
+# sectors. If loopback devices are not supported, we can only test one sector
+# size, and the underlying device is likely to have a sector size of 512 bytes.
+if [[ ! -e /dev/loop-control ]]; then
+    echo "No loopback device support"
+    SECTOR_SIZES="512"
+fi
+
 export SYSTEMD_PAGER=cat
 export SYSTEMD_LOG_LEVEL=debug