clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-07 22:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

(cherry picked from commit eb5800026d)
This commit is contained in:
Michael Marineau
2015-01-16 00:56:54 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent 317f394e34
commit 10cd8af600
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fstab-generator/fstab-generator.c
+8 -2
View File
@@ -490,7 +490,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);
@@ -499,7 +499,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,