From: Maanya Goenka Date: Fri, 14 Jul 2023 16:36:50 +0000 (+0000) Subject: sysext: change the table lookup string to be more verbose X-Git-Tag: v254-rc2~5^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a324d16489c379d8c1fa0d7528e4c7340e951c0;p=thirdparty%2Fsystemd.git sysext: change the table lookup string to be more verbose --- diff --git a/src/basic/os-util.c b/src/basic/os-util.c index 5d06e20871c..3046a40ebdc 100644 --- a/src/basic/os-util.c +++ b/src/basic/os-util.c @@ -23,7 +23,7 @@ static const char* const image_class_table[_IMAGE_CLASS_MAX] = { [IMAGE_MACHINE] = "machine", [IMAGE_PORTABLE] = "portable", - [IMAGE_SYSEXT] = "extension", + [IMAGE_SYSEXT] = "sysext", [IMAGE_CONFEXT] = "confext", }; diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index fc73f01cc2d..5a48dd5cbd0 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -461,7 +461,7 @@ touch /run/machines/a.raw /run/portables/b.raw /run/extensions/c.raw systemd-dissect --discover --json=short >/tmp/discover.json grep -q -F '{"name":"a","type":"raw","class":"machine","ro":false,"path":"/run/machines/a.raw"' /tmp/discover.json grep -q -F '{"name":"b","type":"raw","class":"portable","ro":false,"path":"/run/portables/b.raw"' /tmp/discover.json -grep -q -F '{"name":"c","type":"raw","class":"extension","ro":false,"path":"/run/extensions/c.raw"' /tmp/discover.json +grep -q -F '{"name":"c","type":"raw","class":"sysext","ro":false,"path":"/run/extensions/c.raw"' /tmp/discover.json rm /tmp/discover.json /run/machines/a.raw /run/portables/b.raw /run/extensions/c.raw # Check that the /sbin/mount.ddi helper works