mirror of
https://github.com/systemd/systemd
synced 2024-10-06 16:21:34 +00:00
ukify: move to /usr/bin and mark as non non-experimental
The notice in the man page is removed and the tool is moved into the $PATH. A compat symlink is provided. It is fairly widely used now, and realistically we need to keep backwards compat or people will be very unhappy.
This commit is contained in:
parent
d3f8b754d4
commit
f65aa477d9
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
<refsynopsisdiv>
|
<refsynopsisdiv>
|
||||||
<cmdsynopsis>
|
<cmdsynopsis>
|
||||||
<command>/usr/lib/systemd/ukify</command>
|
<command>ukify</command>
|
||||||
<arg choice="opt" rep="repeat">OPTIONS</arg>
|
<arg choice="opt" rep="repeat">OPTIONS</arg>
|
||||||
<arg choice="plain">build</arg>
|
<arg choice="plain">build</arg>
|
||||||
</cmdsynopsis>
|
</cmdsynopsis>
|
||||||
|
@ -44,9 +44,6 @@
|
||||||
<refsect1>
|
<refsect1>
|
||||||
<title>Description</title>
|
<title>Description</title>
|
||||||
|
|
||||||
<para>Note: this command is experimental for now. While it is intended to become a regular component of
|
|
||||||
systemd, it might still change in behaviour and interface.</para>
|
|
||||||
|
|
||||||
<para><command>ukify</command> is a tool whose primary purpose is to combine components (usually a
|
<para><command>ukify</command> is a tool whose primary purpose is to combine components (usually a
|
||||||
kernel, an initrd, and a UEFI boot stub) to create a
|
kernel, an initrd, and a UEFI boot stub) to create a
|
||||||
<ulink url="https://uapi-group.org/specifications/specs/unified_kernel_image/">Unified Kernel Image (UKI)</ulink>
|
<ulink url="https://uapi-group.org/specifications/specs/unified_kernel_image/">Unified Kernel Image (UKI)</ulink>
|
||||||
|
@ -493,7 +490,7 @@
|
||||||
<example>
|
<example>
|
||||||
<title>All the bells and whistles</title>
|
<title>All the bells and whistles</title>
|
||||||
|
|
||||||
<programlisting>$ /usr/lib/systemd/ukify build \
|
<programlisting>$ ukify build \
|
||||||
--linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
|
--linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
|
||||||
--initrd=early_cpio \
|
--initrd=early_cpio \
|
||||||
--initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img \
|
--initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img \
|
||||||
|
@ -552,7 +549,7 @@ Phases=enter-initrd:leave-initrd
|
||||||
enter-initrd:leave-initrd:sysinit
|
enter-initrd:leave-initrd:sysinit
|
||||||
enter-initrd:leave-initrd:sysinit:ready
|
enter-initrd:leave-initrd:sysinit:ready
|
||||||
|
|
||||||
$ /usr/lib/systemd/ukify -c ukify.conf build \
|
$ ukify -c ukify.conf build \
|
||||||
--linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
|
--linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
|
||||||
--initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img
|
--initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img
|
||||||
</programlisting>
|
</programlisting>
|
||||||
|
@ -588,7 +585,7 @@ $ /usr/lib/systemd/ukify -c ukify.conf build \
|
||||||
<xi:include href="uki.conf.example" parse="text" />EOF</programlisting>
|
<xi:include href="uki.conf.example" parse="text" />EOF</programlisting>
|
||||||
|
|
||||||
<para>Next, we can generate the certificate and keys:</para>
|
<para>Next, we can generate the certificate and keys:</para>
|
||||||
<programlisting># /usr/lib/systemd/ukify genkey --config=/etc/kernel/uki.conf
|
<programlisting># ukify genkey --config=/etc/kernel/uki.conf
|
||||||
Writing SecureBoot private key to /etc/kernel/secure-boot.key.pem
|
Writing SecureBoot private key to /etc/kernel/secure-boot.key.pem
|
||||||
Writing SecureBoot certificate to /etc/kernel/secure-boot.cert.pem
|
Writing SecureBoot certificate to /etc/kernel/secure-boot.cert.pem
|
||||||
Writing private key for PCR signing to /etc/kernel/pcr-initrd.key.pem
|
Writing private key for PCR signing to /etc/kernel/pcr-initrd.key.pem
|
||||||
|
@ -601,7 +598,7 @@ Writing public key for PCR signing to /etc/kernel/pcr-system.pub.pem
|
||||||
to <filename>/etc/kernel/</filename>.)</para>
|
to <filename>/etc/kernel/</filename>.)</para>
|
||||||
|
|
||||||
<para>Subsequent invocations of using the config file
|
<para>Subsequent invocations of using the config file
|
||||||
(<command>/usr/lib/systemd/ukify build --config=/etc/kernel/uki.conf</command>)
|
(<command>ukify build --config=/etc/kernel/uki.conf</command>)
|
||||||
will use this certificate and key files. Note that the
|
will use this certificate and key files. Note that the
|
||||||
<citerefentry><refentrytitle>kernel-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
<citerefentry><refentrytitle>kernel-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||||
plugin <filename>60-ukify.install</filename> uses <filename>/etc/kernel/uki.conf</filename>
|
plugin <filename>60-ukify.install</filename> uses <filename>/etc/kernel/uki.conf</filename>
|
||||||
|
|
|
@ -2417,9 +2417,13 @@ ukify = custom_target(
|
||||||
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
|
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
|
||||||
install : want_ukify,
|
install : want_ukify,
|
||||||
install_mode : 'rwxr-xr-x',
|
install_mode : 'rwxr-xr-x',
|
||||||
install_dir : libexecdir)
|
install_dir : bindir)
|
||||||
if want_ukify
|
if want_ukify
|
||||||
public_programs += ukify
|
public_programs += ukify
|
||||||
|
|
||||||
|
meson.add_install_script(sh, '-c',
|
||||||
|
ln_s.format(bindir / 'ukify',
|
||||||
|
libexecdir / 'ukify'))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
|
@ -34,7 +34,7 @@ except (KeyError, ValueError):
|
||||||
VERBOSE = False
|
VERBOSE = False
|
||||||
|
|
||||||
# Override location of ukify and the boot stub for testing and debugging.
|
# Override location of ukify and the boot stub for testing and debugging.
|
||||||
UKIFY = os.getenv('KERNEL_INSTALL_UKIFY', '/usr/lib/systemd/ukify')
|
UKIFY = os.getenv('KERNEL_INSTALL_UKIFY', 'ukify')
|
||||||
BOOT_STUB = os.getenv('KERNEL_INSTALL_BOOT_STUB')
|
BOOT_STUB = os.getenv('KERNEL_INSTALL_BOOT_STUB')
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue