summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-03-21 16:49:23 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-03-21 16:49:26 +0900
commit5689e161cf3350e33a4a3f5078e088165b2763dc (patch)
treea3135c32ef025f45a391a9fbd8dbbaf0a02dd50a /src
parentfe3198df666851a69a48da0e862920aff42f801a (diff)
downloadsystemd-5689e161cf3350e33a4a3f5078e088165b2763dc.tar.gz
util: rename uki-util.[ch] -> kernel-image.[ch]
As the file contains functions not only for UKI.
Diffstat (limited to 'src')
-rw-r--r--src/boot/bootctl-uki.c2
-rw-r--r--src/shared/kernel-image.c (renamed from src/shared/uki-util.c)2
-rw-r--r--src/shared/kernel-image.h (renamed from src/shared/uki-util.h)0
-rw-r--r--src/shared/meson.build2
4 files changed, 3 insertions, 3 deletions
diff --git a/src/boot/bootctl-uki.c b/src/boot/bootctl-uki.c
index 0f17cb661d..718bac5ab2 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
index 262e90e14f..b5ea1bb2a0 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
index d1875920cc..d1875920cc 100644
--- a/src/shared/uki-util.h
+++ b/src/shared/kernel-image.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 57bea08101..9342d25273 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',