shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

fstab-generator: Allow mount.usr without mount.usrflags, honor rw/ro

Browse Source 
There is no need to require mount.usrflags. The original implementation
assumed that a btrfs subvolume would always be needed but that is not
applicable to systems that do not use btrfs for /usr.

Similar to using rootflags= for the default of mount.usrflags=, append
the classic 'ro' and 'rw' flags to the mount options.
This commit is contained in:
Michael Marineau 2014-12-08 11:05:31 -08:00 committed by Lennart Poettering
parent 59cfa62f20
commit eb5800026d
Notes: Lennart Poettering 2014-12-09 20:49:13 +01:00 
Backport: bugfix
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fstab-generator/fstab-generator.c
View File

@ -476,7 +476,7 @@ static int add_usr_mount(void) {
return log_oom();
}
if (!arg_usr_what || !arg_usr_options)
if (!arg_usr_what)
return 0;
what = fstab_node_to_udev_node(arg_usr_what);
@ -485,7 +485,13 @@ static int add_usr_mount(void) {
return -1;
}
opts = arg_usr_options;
if (!arg_usr_options)
opts = arg_root_rw > 0 ? "rw" : "ro";
else if (!mount_test_option(arg_usr_options, "ro") &&
!mount_test_option(arg_usr_options, "rw"))
opts = strappenda(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro");
else
opts = arg_usr_options;
log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype));
return add_mount(what,