From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 21 Mar 2023 07:49:23 +0000 (+0900)
Subject: util: rename uki-util.[ch] -> kernel-image.[ch]
X-Git-Tag: v254-rc1~969^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F26893%2Fhead;p=thirdparty%2Fsystemd.git

util: rename uki-util.[ch] -> kernel-image.[ch]

As the file contains functions not only for UKI.
---

diff --git a/src/boot/bootctl-uki.c b/src/boot/bootctl-uki.c
index 0f17cb661d5..718bac5ab24 100644
--- a/src/boot/bootctl-uki.c
+++ b/src/boot/bootctl-uki.c
@@ -2,7 +2,7 @@
 
 #include "alloc-util.h"
 #include "bootctl-uki.h"
-#include "uki-util.h"
+#include "kernel-image.h"
 
 int verb_kernel_identify(int argc, char *argv[], void *userdata) {
         KernelImageType t;
diff --git a/src/shared/uki-util.c b/src/shared/kernel-image.c
similarity index 99%
rename from src/shared/uki-util.c
rename to src/shared/kernel-image.c
index 262e90e14fa..b5ea1bb2a0b 100644
--- a/src/shared/uki-util.c
+++ b/src/shared/kernel-image.c
@@ -2,11 +2,11 @@
 
 #include "fd-util.h"
 #include "env-file.h"
+#include "kernel-image.h"
 #include "os-util.h"
 #include "parse-util.h"
 #include "pe-header.h"
 #include "string-table.h"
-#include "uki-util.h"
 
 #define MAX_SECTIONS 96
 
diff --git a/src/shared/uki-util.h b/src/shared/kernel-image.h
similarity index 100%
rename from src/shared/uki-util.h
rename to src/shared/kernel-image.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 57bea08101f..9342d25273c 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -91,6 +91,7 @@ shared_sources = files(
         'journal-util.c',
         'json.c',
         'kbd-util.c',
+        'kernel-image.c',
         'keyring-util.c',
         'killall.c',
         'label.c',
@@ -150,7 +151,6 @@ shared_sources = files(
         'tpm2-util.c',
         'udev-util.c',
         'uid-alloc-range.c',
-        'uki-util.c',
         'user-record-nss.c',
         'user-record-show.c',
         'user-record.c',