shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-18 10:04:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3282 from cgwalters/drop-deploy-print

Browse Source 
deploy: Log to journal for boot space, not stderr
This commit is contained in:
Colin Walters 2024-08-14 16:50:43 -04:00 committed by GitHub
commit 0d5e554b69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2629,8 +2629,9 @@ auto_early_prune_old_deployments (OstreeSysroot *self, GPtrArray *new_deployment
* *
* An alternative is working with the block size instead, which would * An alternative is working with the block size instead, which would
* be easier to handle. */ * be easier to handle. */
g_printerr ("bootcsum %s size exceeds %u; disabling auto-prune optimization\n", bootdir, ot_journal_print (LOG_WARNING,
G_MAXUINT); "bootcsum %s size exceeds %u; disabling auto-prune optimization",
bootdir, G_MAXUINT);
return TRUE; return TRUE;
} }
@ -2663,8 +2664,9 @@ auto_early_prune_old_deployments (OstreeSysroot *self, GPtrArray *new_deployment
/* see similar logic in previous loop */ /* see similar logic in previous loop */
if (bootdir_size > G_MAXUINT) if (bootdir_size > G_MAXUINT)
{ {
g_printerr ( ot_journal_print (
"deployment %s kernel layout size exceeds %u; disabling auto-prune optimization\n", LOG_WARNING,
"deployment %s kernel layout size exceeds %u; disabling auto-prune optimization",
ostree_deployment_get_csum (deployment), G_MAXUINT); ostree_deployment_get_csum (deployment), G_MAXUINT);
return TRUE; return TRUE;
} }
@ -2686,12 +2688,13 @@ auto_early_prune_old_deployments (OstreeSysroot *self, GPtrArray *new_deployment
* and old bootdirs? */ * and old bootdirs? */
if (bootfs_has_space) if (bootfs_has_space)
{ {
g_printerr ("bootfs is sufficient for calculated new size: %s\n", net_new_formatted); ot_journal_print (LOG_INFO, "bootfs is sufficient for calculated new size: %s",
net_new_formatted);
return TRUE; /* nothing to do! */ return TRUE; /* nothing to do! */
} }
} }
g_printerr ("bootfs requires additional space: %s\n", net_new_formatted); ot_journal_print (LOG_INFO, "bootfs requires additional space: %s", net_new_formatted);
/* OK, we would fail if we tried to write the new bootdirs. Is it salvageable? /* OK, we would fail if we tried to write the new bootdirs. Is it salvageable?
* First, calculate how much space we could save with the bootcsums scheduled * First, calculate how much space we could save with the bootcsums scheduled
* for removal. */ * for removal. */
@ -2704,7 +2707,7 @@ auto_early_prune_old_deployments (OstreeSysroot *self, GPtrArray *new_deployment
{ {
g_autofree char *to_remove_formated = g_format_size (bootcsum_dirs_to_remove_total_size); g_autofree char *to_remove_formated = g_format_size (bootcsum_dirs_to_remove_total_size);
g_printerr ("Size to prune from bootfs: %s\n", to_remove_formated); ot_journal_print (LOG_INFO, "Size to prune from bootfs: %s", to_remove_formated);
} }
if (net_new_bootcsum_dirs_total_size > bootcsum_dirs_to_remove_total_size) if (net_new_bootcsum_dirs_total_size > bootcsum_dirs_to_remove_total_size)
@ -2721,12 +2724,14 @@ auto_early_prune_old_deployments (OstreeSysroot *self, GPtrArray *new_deployment
{ {
/* Even if we auto-pruned, the new bootdirs wouldn't fit. Just let the /* Even if we auto-pruned, the new bootdirs wouldn't fit. Just let the
* code continue and let it hit ENOSPC. */ * code continue and let it hit ENOSPC. */
g_printerr ("Disabling auto-prune optimization; insufficient space left in bootfs\n"); ot_journal_print (LOG_WARNING,
"Disabling auto-prune optimization; insufficient space left in bootfs");
return TRUE; return TRUE;
} }
} }
g_printerr ("Insufficient space left in bootfs; updating bootloader in two steps\n"); ot_journal_print (LOG_INFO,
"Insufficient space left in bootfs; updating bootloader in two steps");
/* Auto-pruning can salvage the situation. Calculate the set of deployments in common. */ /* Auto-pruning can salvage the situation. Calculate the set of deployments in common. */
g_autoptr (GPtrArray) common_deployments = g_ptr_array_new (); g_autoptr (GPtrArray) common_deployments = g_ptr_array_new ();

3
src/switchroot/ostree-prepare-root.c
View File

@ -574,8 +574,7 @@ main (int argc, char *argv[])
/* Bind-mount /etc (at deploy path), and remount as writable. */ /* Bind-mount /etc (at deploy path), and remount as writable. */
if (mount ("etc", tmp_sysroot_etc, NULL, MS_BIND | MS_SILENT, NULL) < 0) if (mount ("etc", tmp_sysroot_etc, NULL, MS_BIND | MS_SILENT, NULL) < 0)
err (EXIT_FAILURE, "failed to prepare /etc bind-mount at /sysroot.tmp/etc"); err (EXIT_FAILURE, "failed to prepare /etc bind-mount at /sysroot.tmp/etc");
if (mount (tmp_sysroot_etc, tmp_sysroot_etc, NULL, MS_BIND | MS_REMOUNT | MS_SILENT, if (mount (tmp_sysroot_etc, tmp_sysroot_etc, NULL, MS_BIND | MS_REMOUNT | MS_SILENT, NULL)
NULL)
< 0) < 0)
err (EXIT_FAILURE, "failed to make writable /etc bind-mount at /sysroot.tmp/etc"); err (EXIT_FAILURE, "failed to make writable /etc bind-mount at /sysroot.tmp/etc");
} }