diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-07 21:18:56 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-12 09:45:16 +0100 |
commit | cf73f650890b56a59bfb713c4c82b4e29daa7316 (patch) | |
tree | 96127f9169940270fc64f0007600342ecdaeadb2 /man/kernel-install.xml | |
parent | 341890de866f2ee34919a47ce3fc6c8cd3c1924c (diff) | |
download | systemd-cf73f650890b56a59bfb713c4c82b4e29daa7316.tar.gz |
kernel-install: create the entry directory only if $BOOT/$MACHINE_ID exists
Things are currently fairly ugly in Fedora: we create $BOOT/$MACHINE_ID/$KERNEL_VERSION/,
and then 20-grub.install that is installed by grub2-common.rpm wants to remove that
directory before 50-dracut.install get a chance to run. 50-dracut.install
checks for the presence of that directory to decide where to install the
kernel. So let's make the creation of the directory conditional. Previous
commit changes bootctl install to create $BOOT/$MACHINE_ID, and this commit
makes kernel-install not create it. In effect, the entry directory will only be
created if 'bootctl install' or something else created the parent directory.
https://bugzilla.redhat.com/show_bug.cgi?id=1648907
Diffstat (limited to 'man/kernel-install.xml')
-rw-r--r-- | man/kernel-install.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/man/kernel-install.xml b/man/kernel-install.xml index db0a0b8256..73b582c848 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -67,17 +67,20 @@ <term><command>add <replaceable>KERNEL-VERSION</replaceable> <replaceable>KERNEL-IMAGE</replaceable> [<replaceable>INITRD-FILE</replaceable> ...]</command></term> <listitem> <para>This command expects a kernel version string and a path to a kernel image file as - arguments. <command>kernel-install</command> creates the directory - <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename> - and calls the executables from <filename>/usr/lib/kernel/install.d/*.install</filename> and + arguments. <command>kernel-install</command> calls the executables from + <filename>/usr/lib/kernel/install.d/*.install</filename> and <filename>/etc/kernel/install.d/*.install</filename> with the following arguments: <programlisting>add <replaceable>KERNEL-VERSION</replaceable> <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename> <replaceable>KERNEL-IMAGE</replaceable> [<replaceable>INITRD-FILE</replaceable> ...]</programlisting> </para> - <para>Two default plugins execute the following operations in this case:</para> + <para>Three default plugins execute the following operations in this case:</para> <itemizedlist> + <listitem><para><filename>00-entry-directory.install</filename> creates the directory + <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename> + if <filename>/boot/<replaceable>MACHINE-ID</replaceable>/</filename> already exists. + </para></listitem> <listitem><para><filename>50-depmod.install</filename> runs <citerefentry><refentrytitle>depmod</refentrytitle><manvolnum>8</manvolnum></citerefentry> for the @@ -94,7 +97,11 @@ <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>. The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is - missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para></listitem> + missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para> + + <para>If the entry directory + <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename> + does not exist, this plugin does nothing.</para></listitem> </itemizedlist> </listitem> </varlistentry> |