lib/deploy: Avoid shadowing variable
authorJonathan Lebon <jonathan@jlebon.com>
Mon, 17 Aug 2020 13:48:10 +0000 (09:48 -0400)
committerJonathan Lebon <jonathan@jlebon.com>
Mon, 17 Aug 2020 13:48:57 +0000 (09:48 -0400)
There's already a `boot_relpath` variable in the outside scope.

src/libostree/ostree-sysroot-deploy.c

index 89e3b8e83b4e084f51275c950718191d145d4d23..0179873b8be8340360833e57710eb0ad19a28acf 100644 (file)
@@ -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
     {