From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 6 Feb 2018 19:01:09 +0000 (+0100)
Subject: mkosi: rework how we reenable kernel-install snippets
X-Git-Tag: v4~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F230%2Fhead;p=thirdparty%2Fmkosi.git

mkosi: rework how we reenable kernel-install snippets

The old code doesn't really work: we can't store the list of snippets we
masked in a global variable, since we run the whole build process
multiple times and data from the first run might confuse follow-up runs
and really should not.

This reworks the logic so that we keep track precisely which snippets
are masked and return this from disable_kernel_install(). We then pass
that back into reenable_kernel_install() to undo the effect later on.
This way the information never leaks into later runs.
---

diff --git a/mkosi b/mkosi
index bb175aa8b..5160c90ad 100755
--- a/mkosi
+++ b/mkosi
@@ -904,11 +904,7 @@ def check_if_url_exists(url):
     except:
         return False
 
-kernel_install_files = ()
-
 def disable_kernel_install(args, workspace):
-    global kernel_install_files
-
     # Let's disable the automatic kernel installation done by the
     # kernel RPMs. After all, we want to built our own unified kernels
     # that include the root hash in the kernel command line and can be
@@ -917,26 +913,29 @@ def disable_kernel_install(args, workspace):
     # kernel installation beforehand.
 
     if not args.bootable:
-        return
+        return []
 
     for d in ("etc", "etc/kernel", "etc/kernel/install.d"):
         mkdir_last(os.path.join(workspace, "root", d), 0o755)
 
-    kernel_install_files = ("50-dracut.install", "51-dracut-rescue.install", "90-loaderentry.install")
+    masked = []
 
-    for f in kernel_install_files:
-        os.symlink("/dev/null", os.path.join(workspace, "root", "etc/kernel/install.d", f))
+    for f in ("50-dracut.install", "51-dracut-rescue.install", "90-loaderentry.install"):
+        path = os.path.join(workspace, "root", "etc/kernel/install.d", f)
+        os.symlink("/dev/null", path)
+        masked += [path]
 
-def reenable_kernel_install(args, workspace):
+    return masked
 
-    # Undo disable_kernel_install() so the final image can be used with
-    # scripts installing a kernel following the Bootloader Spec
+def reenable_kernel_install(args, workspace, masked):
+    # Undo disable_kernel_install() so the final image can be used
+    # with scripts installing a kernel following the Bootloader Spec
 
     if not args.bootable:
         return
 
-    for f in kernel_install_files:
-        os.unlink(os.path.join(workspace, "root", "etc/kernel/install.d", f))
+    for f in masked:
+        os.unlink(f)
 
 def invoke_dnf(args, workspace, repositories, base_packages, boot_packages, config_file):
 
@@ -1043,7 +1042,7 @@ def install_fedora(args, workspace, run_build_script):
         die('Use numerical release for Fedora, not "rawhide"\n' +
             '(rawhide was {} when this mkosi version was released)'.format(last))
 
-    disable_kernel_install(args, workspace)
+    masked = disable_kernel_install(args, workspace)
 
     gpg_key = "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%s-x86_64" % args.release
     if os.path.exists(gpg_key):
@@ -1090,10 +1089,12 @@ gpgkey={gpg_key}
                ["kernel", "systemd-udev", "binutils"],
                config_file)
 
+    reenable_kernel_install(args, workspace, masked)
+
 @complete_step('Installing Mageia')
 def install_mageia(args, workspace, run_build_script):
 
-    disable_kernel_install(args, workspace)
+    masked = disable_kernel_install(args, workspace)
 
     # Mageia does not (yet) have RPM GPG key on the web
     gpg_key = '/etc/pki/rpm-gpg/RPM-GPG-KEY-Mageia'
@@ -1137,6 +1138,8 @@ gpgkey={gpg_key}
                ["kernel-server-latest", "binutils"],
                config_file)
 
+    reenable_kernel_install(args, workspace, masked)
+
 def invoke_yum(args, workspace, repositories, base_packages, boot_packages, config_file):
 
     repos = ["--enablerepo=" + repo for repo in repositories]
@@ -1191,7 +1194,7 @@ def invoke_dnf_or_yum(args, workspace, repositories, base_packages, boot_package
 @complete_step('Installing CentOS')
 def install_centos(args, workspace, run_build_script):
 
-    disable_kernel_install(args, workspace)
+    masked = disable_kernel_install(args, workspace)
 
     gpg_key = "/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%s" % args.release
     if os.path.exists(gpg_key):
@@ -1232,6 +1235,8 @@ gpgkey={gpg_key}
                       ["kernel", "systemd-udev", "binutils"],
                       config_file)
 
+    reenable_kernel_install(args, workspace, masked)
+
 def install_debian_or_ubuntu(args, workspace, run_build_script, mirror):
     if args.repositories:
         components = ','.join(args.repositories)
@@ -3267,7 +3272,6 @@ def build_image(args, workspace, run_build_script, for_cache=False):
                     install_build_src(args, workspace.name, run_build_script, for_cache)
                     install_build_dest(args, workspace.name, run_build_script, for_cache)
                     set_root_password(args, workspace.name, run_build_script, for_cache)
-                    reenable_kernel_install(args, workspace.name)
                     run_postinst_script(args, workspace.name, run_build_script, for_cache)
 
                 reset_machine_id(args, workspace.name, run_build_script, for_cache)