Skip to content

Switch to using a systemd generator for /var #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cgwalters wants to merge 8 commits into from
Closed

Switch to using a systemd generator for /var #859

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e68f409
switchroot/remount: Trim set of remounted filesystems
cgwalters May 12, 2017
89fadf2
switchroot/remount: Check mount status before remounting, be verbose
cgwalters May 15, 2017
32042d5
Switch to using a systemd generator for /var
cgwalters May 11, 2017
978aad7
fixup! Switch to using a systemd generator for /var
cgwalters May 15, 2017
17abdcb
fixup! Switch to using a systemd generator for /var
cgwalters May 15, 2017
5b211ce
fixup! Switch to using a systemd generator for /var
cgwalters May 16, 2017
7766665
fixup! Switch to using a systemd generator for /var
cgwalters May 16, 2017
102ef0d
fixup! switchroot/remount: Check mount status before remounting, be v…
cgwalters May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/switchroot/ostree-remount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ maybe_mount_tmpfs_on_var (void)
int
main(int argc, char *argv[])
{
const char *remounts[] = { "/sysroot", "/etc", "/home", "/root", "/tmp", "/var", NULL };
const char *remounts[] = { "/sysroot", "/var", NULL };
struct stat stbuf;
int i;

Expand All @@ -84,6 +84,14 @@ main(int argc, char *argv[])
*/
if (S_ISLNK (stbuf.st_mode))
continue;
/* If not a mountpoint, skip it */
struct statvfs stvfsbuf;
if (statvfs (target, &stvfsbuf) == -1)
continue;
/* If no read-only flag, skip it */
if ((stvfsbuf.f_flag & ST_RDONLY) == 0)
continue;
/* It's a mounted, read-only fs; remount it */
if (mount (target, target, NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)
{
/* Also ignore ENINVAL - if the target isn't a mountpoint
Expand All @@ -92,6 +100,7 @@ main(int argc, char *argv[])
if (errno != EINVAL)
err (EXIT_FAILURE, "failed to remount %s", target);
}
printf ("Remounted: %s\n", target);

@jlebon jlebon May 16, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe in the else instead, e.g.

if (mount (...) < 0)
  {
    ...
  }
else
  printf ("Remounted: %s\n", target);

?

@cgwalters cgwalters May 16, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We call err and abort the process if it fails.

@jlebon jlebon May 16, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it'll still print it if we get EINVAL, right? That can be misleading. (Heck, maybe we should even print a different msg in the EINVAL case).

@cgwalters cgwalters May 16, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, fixed. ⬇️

}

maybe_mount_tmpfs_on_var ();
Expand Down