mount: use the same fstab extension option syntax everywhere

The man page and the actual code differed, and this is now corrected
This commit is contained in:
Lennart Poettering
2012-05-22 02:00:53 +02:00
parent 2e9d6c1251
commit 92a39ae198
2 changed files with 6 additions and 9 deletions
+2 -2
View File
@@ -358,7 +358,7 @@ static int mount_add_fstab_links(Mount *m) {
nofail = !!mount_test_option(p->options, "nofail");
automount =
mount_test_option(p->options, "comment=systemd.automount") ||
mount_test_option(p->options, "x-systemd-automount");
mount_test_option(p->options, "x-systemd.automount");
if (mount_is_network(p)) {
target = SPECIAL_REMOTE_FS_TARGET;
@@ -515,7 +515,7 @@ static int mount_fix_timeouts(Mount *m) {
if ((timeout = mount_test_option(p->options, "comment=systemd.device-timeout")))
timeout += 31;
else if ((timeout = mount_test_option(p->options, "x-systemd-device-timeout")))
else if ((timeout = mount_test_option(p->options, "x-systemd.device-timeout")))
timeout += 25;
else
return 0;