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

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
This commit is contained in:
Colin Walters 2014-11-30 22:50:02 -05:00
parent 1a3f2cce5d
commit 37a059925f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}
}