packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to the latest libgsystem

This commit is contained in:
Colin Walters 2013-01-08 07:04:29 -05:00
parent 1dcf796868
commit ecc0d1e07f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libgsystem

@ -1 +1 @@
Subproject commit fe898ee93bdc8a625c460876c8b49428c8977219 Subproject commit ba7c19cd3b44902ba1dd9bb0fba43293b43abb0b

6
src/ostree/ot-admin-builtin-update-kernel.c
View File

@ -120,7 +120,8 @@ setup_kernel (OtAdminUpdateKernel *self,
prefix = g_strndup (kernel_name, release - kernel_name); prefix = g_strndup (kernel_name, release - kernel_name);
self->kernel_path = ot_gfile_get_child_strconcat (self->boot_ostree_dir, prefix, "-", self->release, NULL); self->kernel_path = ot_gfile_get_child_strconcat (self->boot_ostree_dir, prefix, "-", self->release, NULL);
if (!gs_file_linkcopy_sync_data (src_kernel_path, self->kernel_path, cancellable, error)) if (!gs_file_linkcopy_sync_data (src_kernel_path, self->kernel_path, G_FILE_COPY_OVERWRITE,
cancellable, error))
goto out; goto out;
g_print ("ostadmin: Deploying kernel %s\n", gs_file_get_path_cached (self->kernel_path)); g_print ("ostadmin: Deploying kernel %s\n", gs_file_get_path_cached (self->kernel_path));
@ -223,7 +224,8 @@ update_initramfs (OtAdminUpdateKernel *self,
goto out; goto out;
} }
if (!gs_file_linkcopy_sync_data (initramfs_tmp_file, initramfs_file, cancellable, error)) if (!gs_file_linkcopy_sync_data (initramfs_tmp_file, initramfs_file, G_FILE_COPY_OVERWRITE,
cancellable, error))
goto out; goto out;
/* In the fuse case, we need to chown after copying */ /* In the fuse case, we need to chown after copying */