From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 17 Aug 2020 13:48:10 +0000 (-0400)
Subject: lib/deploy: Avoid shadowing variable
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~9^2~1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61c544df1bceeaa81e4ce98b587fad1e5198046d;p=ostree.git

lib/deploy: Avoid shadowing variable

There's already a `boot_relpath` variable in the outside scope.
---

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 89e3b8e8..0179873b 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1935,8 +1935,9 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
 
   if (kernel_layout->initramfs_namever)
     {
-      g_autofree char * boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->initramfs_namever, NULL);
-      ostree_bootconfig_parser_set (bootconfig, "initrd", boot_relpath);
+      g_autofree char * initrd_boot_relpath =
+        g_strconcat ("/", bootcsumdir, "/", kernel_layout->initramfs_namever, NULL);
+      ostree_bootconfig_parser_set (bootconfig, "initrd", initrd_boot_relpath);
     }
   else
     {