fixup! Rework treecompose kernel processing

coreos · Sep 1, 2017 · 1e04920 · 1e04920
1 parent d236f65
commit 1e04920
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/docs/manual/treefile.md b/docs/manual/treefile.md
@@ -32,7 +32,7 @@ It supports the following parameters:
     possible values:
     * "both": the default, kernel data goes in /boot and /usr/lib/ostree-boot
     * "legacy": Now an alias for "both"; historically meant just "boot"
-    * "new": kernel data goes in /usr/lib/ostree-boot
+    * "new": kernel data goes in /usr/lib/ostree-boot and /usr/lib/modules
 
  * `etc-group-members`: Array of strings, optional: Unix groups in this
    list will be stored in `/etc/group` instead of `/usr/lib/group`.  Use

diff --git a/src/libpriv/rpmostree-postprocess.c b/src/libpriv/rpmostree-postprocess.c
@@ -358,7 +358,6 @@ process_kernel_and_initramfs (int            rootfs_dfd,
   /* We always tell rpmostree_finalize_kernel() to skip /boot, since we'll do a
    * full hardlink pass if needed after that for the kernel + bootloader data.
    */
-  g_autofree char *initramfs_final_path = NULL;
   if (!rpmostree_finalize_kernel (rootfs_dfd, bootdir, kver, kernel_path,
                                   &initramfs_tmpf,
                                   RPMOSTREE_FINALIZE_KERNEL_USRLIBOSTREE_BOOT,