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

deploy: Start hardlinking kernel/initramfs on single-part again 

Commit
1810de2b51
lost an optimization where we would try hardlinks for the
kernel/initramfs in `/boot`.  This would be a noticeable space savings
on single-partition systems.

Closes: #277
Approved by: gatispaeglis
This commit is contained in:
Colin Walters 2016-04-25 15:59:36 -04:00 committed by Colin Walters (automation)
parent 542df553e2
commit 72abe62370
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/libostree/ostree-sysroot-deploy.c
View File

@ -87,6 +87,39 @@ symlink_at_replace (const char *oldpath,
return ret; return ret;
} }
/* Try a hardlink if we can, otherwise fall back to copying. Used
* right now for kernels/initramfs in /boot, where we can just
* hardlink if we're on the same partition.
*/
static gboolean
hardlink_or_copy_at (int src_dfd,
const char *src_subpath,
int dest_dfd,
const char *dest_subpath,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
if (linkat (src_dfd, src_subpath, dest_dfd, dest_subpath, 0) != 0)
{
if (errno == EMLINK || errno == EXDEV)
{
return glnx_file_copy_at (src_dfd, src_subpath, NULL, dest_dfd, dest_subpath, 0,
cancellable, error);
}
else
{
glnx_set_error_from_errno (error);
goto out;
}
}
ret = TRUE;
out:
return ret;
}
static gboolean static gboolean
dirfd_copy_attributes_and_xattrs (int src_parent_dfd, dirfd_copy_attributes_and_xattrs (int src_parent_dfd,
const char *src_name, const char *src_name,
@ -1337,9 +1370,9 @@ install_deployment_kernel (OstreeSysroot *sysroot,
glnx_set_prefix_error_from_errno (error, "fstat %s", dest_kernel_name); glnx_set_prefix_error_from_errno (error, "fstat %s", dest_kernel_name);
goto out; goto out;
} }
if (!glnx_file_copy_at (tree_boot_dfd, tree_kernel_name, NULL, if (!hardlink_or_copy_at (tree_boot_dfd, tree_kernel_name,
bootcsum_dfd, dest_kernel_name, 0, bootcsum_dfd, dest_kernel_name,
cancellable, error)) cancellable, error))
goto out; goto out;
} }
@ -1354,9 +1387,9 @@ install_deployment_kernel (OstreeSysroot *sysroot,
glnx_set_prefix_error_from_errno (error, "fstat %s", dest_initramfs_name); glnx_set_prefix_error_from_errno (error, "fstat %s", dest_initramfs_name);
goto out; goto out;
} }
if (!glnx_file_copy_at (tree_boot_dfd, tree_initramfs_name, NULL, if (!hardlink_or_copy_at (tree_boot_dfd, tree_initramfs_name,
bootcsum_dfd, dest_initramfs_name, 0, bootcsum_dfd, dest_initramfs_name,
cancellable, error)) cancellable, error))
goto out; goto out;
} }
} }