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

Merge pull request #2461 from lucab/ups/prepare-root-logging 

prepare-root: tweak log messages to clarify errors
This commit is contained in:
Colin Walters 2021-10-07 11:56:17 -04:00 committed by GitHub
parent cc70ab27fa f4be52ba24
commit f4a3837662
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,6 +189,10 @@ main(int argc, char *argv[])
err (EXIT_FAILURE, "usage: ostree-prepare-root SYSROOT"); err (EXIT_FAILURE, "usage: ostree-prepare-root SYSROOT");
root_arg = argv[1]; root_arg = argv[1];
} }
#ifdef USE_LIBSYSTEMD
sd_journal_send ("MESSAGE=preparing sysroot at %s", root_arg,
NULL);
#endif
struct stat stbuf; struct stat stbuf;
if (stat ("/proc/cmdline", &stbuf) < 0) if (stat ("/proc/cmdline", &stbuf) < 0)
@ -238,15 +242,20 @@ main(int argc, char *argv[])
*/ */
const bool sysroot_readonly = sysroot_is_configured_ro (root_arg); const bool sysroot_readonly = sysroot_is_configured_ro (root_arg);
const bool sysroot_currently_writable = !path_is_on_readonly_fs (root_arg); const bool sysroot_currently_writable = !path_is_on_readonly_fs (root_arg);
#ifdef USE_LIBSYSTEMD #ifdef USE_LIBSYSTEMD
sd_journal_send ("MESSAGE=sysroot configured read-only: %d, currently writable: %d", sd_journal_send ("MESSAGE=filesystem at %s currently writable: %d", root_arg,
(int)sysroot_readonly, (int)sysroot_currently_writable, NULL); (int)sysroot_currently_writable,
NULL);
sd_journal_send ("MESSAGE=sysroot.readonly configuration value: %d",
(int)sysroot_readonly,
NULL);
#endif #endif
if (sysroot_readonly) if (sysroot_readonly)
{ {
if (!sysroot_currently_writable) if (!sysroot_currently_writable)
errx (EXIT_FAILURE, "sysroot=readonly currently requires writable / in initramfs"); errx (EXIT_FAILURE, "sysroot.readonly=true requires %s to be writable at this point",
root_arg);
/* Now, /etc is not normally a bind mount, but if we have a readonly /* Now, /etc is not normally a bind mount, but if we have a readonly
* sysroot, we still need a writable /etc. And to avoid race conditions * sysroot, we still need a writable /etc. And to avoid race conditions
* we ensure it's writable in the initramfs, before we switchroot at all. * we ensure it's writable in the initramfs, before we switchroot at all.