33 строки
1.7 KiB
Diff
33 строки
1.7 KiB
Diff
diff --git a/src/libostree/ostree-sysroot-deploy.c.old2 b/src/libostree/ostree-sysroot-deploy.c
|
|
index 976c4b5..263e2f5 100644
|
|
--- a/src/libostree/ostree-sysroot-deploy.c.old2
|
|
+++ b/src/libostree/ostree-sysroot-deploy.c
|
|
@@ -1191,15 +1191,15 @@ get_kernel_from_tree_usrlib_modules (OstreeSysroot *sysroot,
|
|
ret_layout->kernel_hmac_namever = g_strdup_printf (".%s.hmac", ret_layout->kernel_namever);
|
|
}
|
|
|
|
-/* Setting the param for Copying Photon Specific config files to sutiable location */
|
|
+/* Setting the param for Copying Mariner Specific config files to sutiable location */
|
|
if (!glnx_opendirat (deployment_dfd, "usr/lib/ostree-boot", FALSE, &ret_layout->ostree_boot_dfd, error))
|
|
return FALSE;
|
|
- if (!ot_openat_ignore_enoent (ret_layout->ostree_boot_dfd, "photon.cfg", &fd, error))
|
|
+ if (!ot_openat_ignore_enoent (ret_layout->ostree_boot_dfd, "mariner.cfg", &fd, error))
|
|
return FALSE;
|
|
if (fd != -1)
|
|
{
|
|
ret_layout->kernelcfg_srcpath = g_strdup_printf ("linux-%s.cfg",kver);
|
|
- ret_layout->kernelcfg_namever = g_strdup ("photon.cfg");
|
|
+ ret_layout->kernelcfg_namever = g_strdup ("mariner.cfg");
|
|
}
|
|
glnx_close_fd (&fd);
|
|
if (!ot_openat_ignore_enoent (ret_layout->ostree_boot_dfd, "systemd.cfg", &fd, error))
|
|
@@ -1926,7 +1926,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
|
g_ptr_array_add (overlay_initrds, g_steal_pointer (&destpath));
|
|
}
|
|
|
|
- /* Copying Photon Specific config files to sutiable location */
|
|
+ /* Copying Mariner Specific config files to sutiable location */
|
|
if (kernel_layout->kernelcfg_srcpath)
|
|
{
|
|
if (!glnx_fstatat_allow_noent (bootcsum_dfd, kernel_layout->kernelcfg_namever, &stbuf, 0, error))
|