1111---
1212 src/libostree/ostree-sysroot-deploy.c | 70 +++++++++++++++++++++++++++++++++++
1313 1 file changed, 70 insertions(+)
14- mode change 100644 => 100755 src/libostree/ostree-sysroot-deploy.c
1514
16- diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
17- old mode 100644
18- new mode 100755
19- index 3ca6c14..0744d7e
20- --- a/src/libostree/ostree-sysroot-deploy.c
15+ diff --git a/src/libostree/ostree-sysroot-deploy.c.newold b/src/libostree/ostree-sysroot-deploy.c
16+ index 6a13a41..976c4b5 100644
17+ --- a/src/libostree/ostree-sysroot-deploy.c.newold
2118+++ b/src/libostree/ostree-sysroot-deploy.c
22- @@ -876,12 +876,17 @@ ostree_sysroot_write_origin_file (OstreeSysroot *sysroot,
19+ @@ -987,6 +987,7 @@ ostree_sysroot_write_origin_file (OstreeSysroot *sysroot,
2320
2421 typedef struct {
2522 int boot_dfd;
2623+ int ostree_boot_dfd;
2724 char *kernel_srcpath;
2825 char *kernel_namever;
29- char *initramfs_srcpath;
26+ char *kernel_hmac_srcpath;
27+ @@ -995,6 +996,10 @@ typedef struct {
3028 char *initramfs_namever;
3129 char *devicetree_srcpath;
3230 char *devicetree_namever;
@@ -37,7 +35,7 @@ index 3ca6c14..0744d7e
3735 char *bootcsum;
3836 } OstreeKernelLayout;
3937 static void
40- @@ -894 ,6 +899 ,10 @@ _ostree_kernel_layout_free (OstreeKernelLayout *layout)
38+ @@ -1009 ,6 +1014 ,10 @@ _ostree_kernel_layout_free (OstreeKernelLayout *layout)
4139 g_free (layout->initramfs_namever);
4240 g_free (layout->devicetree_srcpath);
4341 g_free (layout->devicetree_namever);
@@ -48,13 +46,13 @@ index 3ca6c14..0744d7e
4846 g_free (layout->bootcsum);
4947 g_free (layout);
5048 }
51- @@ -1031,6 +1040,25 @@ get_kernel_from_tree_usrlib_modules (int deployment_dfd,
49+ @@ -1182,6 +1191,26 @@ get_kernel_from_tree_usrlib_modules (OstreeSysroot *sysroot,
50+ ret_layout->kernel_hmac_namever = g_strdup_printf (".%s.hmac", ret_layout->kernel_namever);
51+ }
5252
53- g_clear_object (&in);
54- glnx_close_fd (&fd);
5553+ /* Setting the param for Copying Photon Specific config files to sutiable location */
5654+ if (!glnx_opendirat (deployment_dfd, "usr/lib/ostree-boot", FALSE, &ret_layout->ostree_boot_dfd, error))
57- + return FALSE;
55+ + return FALSE;
5856+ if (!ot_openat_ignore_enoent (ret_layout->ostree_boot_dfd, "photon.cfg", &fd, error))
5957+ return FALSE;
6058+ if (fd != -1)
@@ -71,24 +69,24 @@ index 3ca6c14..0744d7e
7169+ ret_layout->systemdcfg_namever = g_strdup ("systemd.cfg");
7270+ }
7371+ glnx_close_fd (&fd);
74-
72+ +
7573 char hexdigest[OSTREE_SHA256_STRING_LEN+1];
7674 ot_checksum_get_hexdigest (&checksum, hexdigest, sizeof (hexdigest));
77- @@ -1686,6 +1714,35 @@ install_deployment_kernel (OstreeSysroot *sysroot,
78- }
75+ ret_layout->bootcsum = g_strdup (hexdigest);
76+ @@ -1897,6 +1926,34 @@ install_deployment_kernel (OstreeSysroot *sysroot,
77+ g_ptr_array_add (overlay_initrds, g_steal_pointer (&destpath));
7978 }
8079
81- + /* Copying Photon Specific config files to sutiable location */
80+ + /* Copying Photon Specific config files to sutiable location */
8281+ if (kernel_layout->kernelcfg_srcpath)
8382+ {
8483+ if (!glnx_fstatat_allow_noent (bootcsum_dfd, kernel_layout->kernelcfg_namever, &stbuf, 0, error))
8584+ return FALSE;
8685+ if (errno == ENOENT)
8786+ {
88- + if (!install_into_boot (sepolicy, kernel_layout->ostree_boot_dfd, kernel_layout->kernelcfg_srcpath,
89- + bootcsum_dfd, kernel_layout->kernelcfg_namever,
90- + sysroot->debug_flags,
91- + cancellable, error))
87+ + if (!install_into_boot (repo, sepolicy, kernel_layout->ostree_boot_dfd, kernel_layout->kernelcfg_srcpath,
88+ + bootcsum_dfd, kernel_layout->kernelcfg_namever,
89+ + cancellable, error))
9290+ return FALSE;
9391+ }
9492+ }
@@ -99,37 +97,33 @@ index 3ca6c14..0744d7e
9997+ return FALSE;
10098+ if (errno == ENOENT)
10199+ {
102- + if (!install_into_boot (sepolicy, kernel_layout->ostree_boot_dfd, kernel_layout->systemdcfg_srcpath,
103- + bootcsum_dfd, kernel_layout->systemdcfg_namever,
104- + sysroot->debug_flags,
105- + cancellable, error))
106- + return FALSE;
100+ + if (!install_into_boot (repo, sepolicy, kernel_layout->ostree_boot_dfd, kernel_layout->systemdcfg_srcpath,
101+ + bootcsum_dfd, kernel_layout->systemdcfg_namever,
102+ + cancellable, error))
103+ + return FALSE;
107104+ }
108105+ }
106+ +
109107+
110108 g_autofree char *contents = NULL;
111109 if (!glnx_fstatat_allow_noent (deployment_dfd, "usr/lib/os-release", &stbuf, 0, error))
112110 return FALSE;
113- @@ -1775 ,6 +1832,19 @@ install_deployment_kernel (OstreeSysroot *sysroot,
114- _ostree_kernel_args_replace_take (kargs, g_steal_pointer (&prepare_root_arg));
111+ @@ -1992 ,6 +2049,18 @@ install_deployment_kernel (OstreeSysroot *sysroot,
112+ ostree_kernel_args_replace_take (kargs, g_steal_pointer (&prepare_root_arg));
115113 }
116114
117115+ if (kernel_layout->systemdcfg_namever)
118116+ {
119- + g_autofree char * boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->systemdcfg_namever, NULL);
120- + ostree_bootconfig_parser_set (bootconfig, "systemdcfg", boot_relpath );
117+ + g_autofree char * systemdcfg_boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->systemdcfg_namever, NULL);
118+ + ostree_bootconfig_parser_set (bootconfig, "systemdcfg", systemdcfg_boot_relpath );
121119+ }
122120+
123121+ if (kernel_layout->kernelcfg_namever)
124122+ {
125- + g_autofree char * boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->kernelcfg_namever, NULL);
126- + ostree_bootconfig_parser_set (bootconfig, "kernelcfg", boot_relpath );
123+ + g_autofree char * kernelcfg_boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->kernelcfg_namever, NULL);
124+ + ostree_bootconfig_parser_set (bootconfig, "kernelcfg", kernelcfg_boot_relpath );
127125+ }
128- +
129126+
130127 if (kernel_layout->devicetree_namever)
131128 {
132- g_autofree char * boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->devicetree_namever, NULL);
133- - -
134- 2.7.4
135-
129+ g_autofree char * dt_boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->devicetree_namever, NULL);
0 commit comments