diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-17 14:21:56 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-17 20:40:34 +0900 |
commit | ab94d98b29ffc42d3840c5b4ffde1acbc106f88e (patch) | |
tree | 70befdf0a224e7c9dcc137559d9dfaf89c9c60d6 /src/boot/bootctl-uki.c | |
parent | 58f5f60f1a9f315de7103b69cbb1a1b318ea0e75 (diff) | |
download | systemd-ab94d98b29ffc42d3840c5b4ffde1acbc106f88e.tar.gz |
bootctl: move verb_kernel_identity()
No functional change, just for making beautify later diffs.
Diffstat (limited to 'src/boot/bootctl-uki.c')
-rw-r--r-- | src/boot/bootctl-uki.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/boot/bootctl-uki.c b/src/boot/bootctl-uki.c index 261e687e3f..c0f263d434 100644 --- a/src/boot/bootctl-uki.c +++ b/src/boot/bootctl-uki.c @@ -103,30 +103,6 @@ static bool is_uki(struct PeSectionHeader *sections, size_t scount) { find_pe_section(sections, scount, name_initrd, sizeof(name_initrd), NULL); } -int verb_kernel_identify(int argc, char *argv[], void *userdata) { - _cleanup_fclose_ FILE *uki = NULL; - _cleanup_free_ struct PeSectionHeader *sections = NULL; - size_t scount; - int r; - - uki = fopen(argv[1], "re"); - if (!uki) - return log_error_errno(errno, "Failed to open UKI file '%s': %m", argv[1]); - - r = pe_sections(uki, §ions, &scount); - if (r < 0) - return r; - - if (!sections) - puts("unknown"); - else if (is_uki(sections, scount)) - puts("uki"); - else - puts("pe"); - - return EXIT_SUCCESS; -} - static int read_pe_section( FILE *uki, const struct PeSectionHeader *section, @@ -214,6 +190,30 @@ static void inspect_uki(FILE *uki, struct PeSectionHeader *sections, size_t scou (void) inspect_osrel(osrel, osrel_size); } +int verb_kernel_identify(int argc, char *argv[], void *userdata) { + _cleanup_fclose_ FILE *uki = NULL; + _cleanup_free_ struct PeSectionHeader *sections = NULL; + size_t scount; + int r; + + uki = fopen(argv[1], "re"); + if (!uki) + return log_error_errno(errno, "Failed to open UKI file '%s': %m", argv[1]); + + r = pe_sections(uki, §ions, &scount); + if (r < 0) + return r; + + if (!sections) + puts("unknown"); + else if (is_uki(sections, scount)) + puts("uki"); + else + puts("pe"); + + return EXIT_SUCCESS; +} + int verb_kernel_inspect(int argc, char *argv[], void *userdata) { _cleanup_fclose_ FILE *uki = NULL; _cleanup_free_ struct PeSectionHeader *sections = NULL; |