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

Merge pull request #2985 from cgwalters/cleanup-proc-cmdline

Browse Source 
switchroot,generator: Only read /proc/cmdline once
This commit is contained in:
Eric Curtin 2023-08-16 19:31:35 +01:00 committed by GitHub
commit 8712a46756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-impl-system-generator.c
View File

@ -251,12 +251,16 @@ _ostree_impl_system_generator (const char *normal_dir, const char *early_dir, co
if (unlinkat (AT_FDCWD, INITRAMFS_MOUNT_VAR, 0) == 0) if (unlinkat (AT_FDCWD, INITRAMFS_MOUNT_VAR, 0) == 0)
return TRUE; return TRUE;
g_autofree char *cmdline = read_proc_cmdline ();
if (!cmdline)
return glnx_throw (error, "Failed to read /proc/cmdline");
/* If we're installed on a system which isn't using OSTree for boot (e.g. /* If we're installed on a system which isn't using OSTree for boot (e.g.
* package installed as a dependency for flatpak or whatever), silently * package installed as a dependency for flatpak or whatever), silently
* exit so that we don't error, but at the same time work where switchroot * exit so that we don't error, but at the same time work where switchroot
* is PID 1 (and so hasn't created /run/ostree-booted). * is PID 1 (and so hasn't created /run/ostree-booted).
*/ */
autofree char *ostree_cmdline = read_proc_cmdline_key ("ostree"); g_autofree char *ostree_cmdline = find_proc_cmdline_key (cmdline, "ostree");
if (!ostree_cmdline) if (!ostree_cmdline)
return TRUE; return TRUE;

11
src/switchroot/ostree-mount-util.h
View File

@ -85,18 +85,12 @@ cleanup_free (void *p)
} }
static inline char * static inline char *
read_proc_cmdline_key (const char *key) find_proc_cmdline_key (const char *cmdline, const char *key)
{ {
char *cmdline = NULL;
const char *iter;
char *ret = NULL; char *ret = NULL;
size_t key_len = strlen (key); size_t key_len = strlen (key);
cmdline = read_proc_cmdline (); const char *iter = cmdline;
if (!cmdline)
err (EXIT_FAILURE, "failed to read /proc/cmdline");
iter = cmdline;
while (iter != NULL) while (iter != NULL)
{ {
const char *next = strchr (iter, ' '); const char *next = strchr (iter, ' ');
@ -115,7 +109,6 @@ read_proc_cmdline_key (const char *key)
iter = next_nonspc; iter = next_nonspc;
} }
free (cmdline);
return ret; return ret;
} }

5
src/switchroot/ostree-prepare-root-static.c
View File

@ -116,7 +116,10 @@ resolve_deploy_path (const char *root_mountpoint)
char destpath[PATH_MAX]; char destpath[PATH_MAX];
struct stat stbuf; struct stat stbuf;
char *deploy_path; char *deploy_path;
autofree char *ostree_cmdline = read_proc_cmdline_key ("ostree"); autofree char *kernel_cmdline = read_proc_cmdline ();
if (!kernel_cmdline)
errx (EXIT_FAILURE, "Failed to read kernel cmdline");
autofree char *ostree_cmdline = find_proc_cmdline_key (kernel_cmdline, "ostree");
if (snprintf (destpath, sizeof (destpath), "%s/%s", root_mountpoint, ostree_cmdline) < 0) if (snprintf (destpath, sizeof (destpath), "%s/%s", root_mountpoint, ostree_cmdline) < 0)
err (EXIT_FAILURE, "failed to assemble ostree target path"); err (EXIT_FAILURE, "failed to assemble ostree target path");

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

@ -160,13 +160,13 @@ get_aboot_root_slot (const char *slot_suffix)
} }
static inline char * static inline char *
get_ostree_target (void) get_ostree_target (const char *cmdline)
{ {
autofree char *slot_suffix = read_proc_cmdline_key ("androidboot.slot_suffix"); autofree char *slot_suffix = find_proc_cmdline_key (cmdline, "androidboot.slot_suffix");
if (slot_suffix) if (slot_suffix)
return get_aboot_root_slot (slot_suffix); return get_aboot_root_slot (slot_suffix);
return read_proc_cmdline_key ("ostree"); return find_proc_cmdline_key (cmdline, "ostree");
} }
static char * static char *
@ -175,7 +175,11 @@ resolve_deploy_path (const char *root_mountpoint)
char destpath[PATH_MAX]; char destpath[PATH_MAX];
struct stat stbuf; struct stat stbuf;
char *deploy_path; char *deploy_path;
autofree char *ostree_target = get_ostree_target (); g_autofree char *kernel_cmdline = read_proc_cmdline ();
if (!kernel_cmdline)
errx (EXIT_FAILURE, "Failed to read kernel cmdline");
g_autofree char *ostree_target = get_ostree_target (kernel_cmdline);
if (!ostree_target) if (!ostree_target)
errx (EXIT_FAILURE, "No ostree target"); errx (EXIT_FAILURE, "No ostree target");