Skip to content

Commit c765f46

Browse files
louibalexlarsson
authored andcommitted
Normalize rofiles-fuse related logs.
The actual command for unmounting the rofs was not printed, as opposed to the command to mount the fs. The format of the message is also normalized for easier debugging.
1 parent c99f419 commit c765f46

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/builder-context.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ rofiles_umount_handler (int signum)
770770
NULL };
771771

772772
argv[2] = rofiles_unmount_path;
773-
g_debug ("unmounting rofiles-fuse %s", rofiles_unmount_path);
773+
g_debug ("Unmounting read-only fs: %s %s %s", argv[0], argv[1], argv[2]);
774774
g_spawn_sync (NULL, (char **)argv, NULL,
775775
G_SPAWN_SEARCH_PATH | G_SPAWN_CLOEXEC_PIPES | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
776776
NULL, NULL, NULL, NULL, NULL, NULL);
@@ -874,7 +874,7 @@ builder_context_enable_rofiles (BuilderContext *self,
874874
rofiles_dir = g_object_ref (self->rofiles_allocated_dir);
875875
argv[4] = (char *)flatpak_file_get_path_cached (rofiles_dir);
876876

877-
g_debug ("starting: rofiles-fuse %s %s", argv[3], argv[4]);
877+
g_debug ("Mounting read-only fs: %s %s %s", argv[0], argv[3], argv[4]);
878878
if (!g_spawn_sync (NULL, (char **)argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_CLOEXEC_PIPES, rofiles_child_setup, NULL, NULL, NULL, &exit_status, error))
879879
{
880880
g_prefix_error (error, "Can't spawn rofiles-fuse");

src/builder-flatpak-utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ const char *dont_mount_in_root[] = {
11731173
};
11741174

11751175
/* We don't want to export paths pointing into these, because they are readonly
1176-
(so we can't create mountpoints there) and don't match whats on the host anyway */
1176+
(so we can't create mountpoints there) and don't match what's on the host anyway */
11771177
const char *dont_export_in[] = {
11781178
"/lib", "/lib32", "/lib64", "/bin", "/sbin", "/usr", "/etc", "/app", NULL
11791179
};

0 commit comments

Comments
 (0)