diff options
| author | Colin Walters <walters@verbum.org> | 2014-11-30 22:50:02 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-11-30 23:14:05 -0500 |
| commit | 37a059925f6b96d30190b65bee6bdde0ae1c6915 (patch) | |
| tree | 607aabca11bcb226666957ed59705d22732d7b94 | |
| parent | 1a3f2cce5d7d540be00f86389f3d3d551901f24a (diff) | |
| download | ostree-37a059925f6b96d30190b65bee6bdde0ae1c6915.tar.gz | |
deploy: Ensure that we can deploy using only /usr/lib/ostree-boot
rpm-ostree at least has the option to generate a tree with just that
instead of /boot, but while we were enumerating the latter, we'd still
return paths from /boot.
https://bugzilla.gnome.org/show_bug.cgi?id=740947
| -rw-r--r-- | src/libostree/ostree-sysroot-deploy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index 5cf4b2bc..40dd7b54 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -1050,7 +1050,7 @@ get_kernel_from_tree (GFile *deployroot, if (ostree_validate_structureof_checksum_string (dash + 1, NULL)) { kernel_checksum = g_strdup (dash + 1); - ret_kernel = g_file_get_child (bootdir, name); + ret_kernel = g_file_enumerator_get_child (dir_enum, file_info); } } else if (ret_initramfs == NULL && g_str_has_prefix (name, "initramfs-")) @@ -1060,7 +1060,7 @@ get_kernel_from_tree (GFile *deployroot, if (ostree_validate_structureof_checksum_string (dash + 1, NULL)) { initramfs_checksum = g_strdup (dash + 1); - ret_initramfs = g_file_get_child (bootdir, name); + ret_initramfs = g_file_enumerator_get_child (dir_enum, file_info); } } |