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;
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;
goto clean_up;
}
- if (asprintf(&o, "%s,%s", options, options2) < 0) {
+ o = join(options, ",", options2, NULL);
+ if (!o) {
r = -ENOMEM;
goto finish;
}
.no_alias = true,
.no_instances = true,
- .show_status = true,
.init = mount_init,
.load = mount_load,
.bus_invalidating_properties = bus_mount_invalidating_properties,
.enumerate = mount_enumerate,
- .shutdown = mount_shutdown
+ .shutdown = mount_shutdown,
+
+ .status_message_formats = {
+ .starting_stopping = {
+ [0] = "Mounting %s...",
+ [1] = "Unmounting %s...",
+ },
+ .finished_start_job = {
+ [JOB_DONE] = "Mounted %s.",
+ [JOB_FAILED] = "Failed to mount %s.",
+ [JOB_DEPENDENCY] = "Dependency failed for %s.",
+ [JOB_TIMEOUT] = "Timed out mounting %s.",
+ },
+ .finished_stop_job = {
+ [JOB_DONE] = "Unmounted %s.",
+ [JOB_FAILED] = "Failed unmounting %s.",
+ [JOB_TIMEOUT] = "Timed out unmounting %s.",
+ },
+ },
};