keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

initramfs: Print regeneration status for pending deployment

Browse Source 
Previously, after enabling initramfs regeneration, the initramfs
command would indicate that initramfs regeneratin is disabled,
suggesting that the initramfs had not actually been enabled. This
happened because the initramfs regeneration status for the current
deployment was printed; initramfs regeneration is only enabled for a
pending deployment.

This change prints the regeneration for the pending deployment,
rather than the current, when no options are given to the initramfs
command.

Fixes: #1526

Closes: #1548
Approved by: jlebon
This commit is contained in:
Robert Fairley 2018-09-10 11:15:22 -04:00 committed by Atomic Bot
parent bce966a981
commit be7d87e4b9
2 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/rpmostree-builtin-initramfs.c
View File

@ -85,8 +85,9 @@ rpmostree_builtin_initramfs (int argc,
if (!(opt_enable || opt_disable)) if (!(opt_enable || opt_disable))
{ {
GVariantIter iter;
g_autoptr(GVariant) deployments = rpmostree_sysroot_dup_deployments (sysroot_proxy); g_autoptr(GVariant) deployments = rpmostree_sysroot_dup_deployments (sysroot_proxy);
gboolean cur_regenerate = FALSE;
g_autofree char **initramfs_args = NULL;
if (opt_reboot) if (opt_reboot)
{ {
@ -95,31 +96,18 @@ rpmostree_builtin_initramfs (int argc,
return FALSE; return FALSE;
} }
g_variant_iter_init (&iter, deployments); if (g_variant_n_children (deployments) > 1)
while (TRUE)
{ {
gboolean cur_regenerate; g_autoptr(GVariant) pending = g_variant_get_child_value (deployments, 0);
g_autoptr(GVariant) child = g_variant_iter_next_value (&iter); g_auto(GVariantDict) dict;
g_autoptr(GVariantDict) dict = NULL; g_variant_dict_init (&dict, pending);
g_autofree char **initramfs_args = NULL;
gboolean is_booted;
if (child == NULL) if (!g_variant_dict_lookup (&dict, "regenerate-initramfs", "b", &cur_regenerate))
break;
dict = g_variant_dict_new (child);
if (!g_variant_dict_lookup (dict, "booted", "b", &is_booted))
continue;
if (!is_booted)
continue;
if (!g_variant_dict_lookup (dict, "regenerate-initramfs", "b", &cur_regenerate))
cur_regenerate = FALSE; cur_regenerate = FALSE;
if (cur_regenerate) if (cur_regenerate)
{ {
g_variant_dict_lookup (dict, "initramfs-args", "^a&s", &initramfs_args); g_variant_dict_lookup (&dict, "initramfs-args", "^a&s", &initramfs_args);
}
} }
g_print ("Initramfs regeneration: %s\n", cur_regenerate ? "enabled" : "disabled"); g_print ("Initramfs regeneration: %s\n", cur_regenerate ? "enabled" : "disabled");
@ -131,7 +119,6 @@ rpmostree_builtin_initramfs (int argc,
g_print ("\n"); g_print ("\n");
} }
} }
}
else if (opt_enable && opt_disable) else if (opt_enable && opt_disable)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,

12
tests/vmcheck/test-initramfs.sh
View File

@ -42,7 +42,11 @@ fi
assert_file_has_content err.txt "reboot.*used with.*enable" assert_file_has_content err.txt "reboot.*used with.*enable"
echo "ok initramfs state" echo "ok initramfs state"
vm_rpmostree initramfs --enable vm_rpmostree initramfs --enable > initramfs.txt
assert_file_has_content initramfs.txt "Initramfs regeneration.*enabled"
vm_rpmostree initramfs > initramfs.txt
assert_file_has_content initramfs.txt "Initramfs regeneration.*enabled"
vm_assert_status_jq \ vm_assert_status_jq \
'.deployments[1].booted' \ '.deployments[1].booted' \
'.deployments[0]["regenerate-initramfs"]' \ '.deployments[0]["regenerate-initramfs"]' \
@ -64,7 +68,11 @@ fi
assert_file_has_content err.txt "already.*enabled" assert_file_has_content err.txt "already.*enabled"
echo "ok initramfs enabled" echo "ok initramfs enabled"
vm_rpmostree initramfs --disable vm_rpmostree initramfs --disable > initramfs.txt
assert_file_has_content initramfs.txt "Initramfs regeneration.*disabled"
vm_rpmostree initramfs > initramfs.txt
assert_file_has_content initramfs.txt "Initramfs regeneration.*disabled"
vm_reboot vm_reboot
vm_assert_status_jq \ vm_assert_status_jq \
'.deployments[0].booted' \ '.deployments[0].booted' \