Skip to content

Commit

Permalink
deploy: Ensure that we can deploy using only /usr/lib/ostree-boot
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cgwalters committed Dec 1, 2014
1 parent 1a3f2cc commit 37a0599
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libostree/ostree-sysroot-deploy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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-"))
Expand All @@ -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);
}
}

Expand Down

0 comments on commit 37a0599

Please sign in to comment.