diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-25 20:37:04 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-25 20:37:04 +0200 |
| commit | 173a8d04fc3535b571fe4a0d4715c18be315a43a (patch) | |
| tree | be5461d41c7037158ffa708b814076f99945b5fe /src/dbus-manager.c | |
| parent | 9d2205426a54e4eeab18bd7d83bc2fbb43eca4a4 (diff) | |
mount: rework automatic mounting to follow the 'nofail' option in fstab
Diffstat (limited to 'src/dbus-manager.c')
| -rw-r--r-- | src/dbus-manager.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/dbus-manager.c b/src/dbus-manager.c index 557124712a..9b0a600221 100644 --- a/src/dbus-manager.c +++ b/src/dbus-manager.c @@ -141,9 +141,8 @@ " <property name=\"SysVRcndPath\" type=\"as\" access=\"read\"/>\n" \ " <property name=\"NotifySocket\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"ControlGroupHierarchy\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"MountOnPlug\" type=\"b\" access=\"read\"/>\n" \ - " <property name=\"SwapOnPlug\" type=\"b\" access=\"read\"/>\n" \ " <property name=\"MountAuto\" type=\"b\" access=\"read\"/>\n" \ + " <property name=\"SwapAuto\" type=\"b\" access=\"read\"/>\n" \ " </interface>\n" #define INTROSPECTION_BEGIN \ @@ -255,9 +254,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, { "org.freedesktop.systemd1.Manager", "SysVRcndPath", bus_property_append_strv, "as", m->lookup_paths.sysvrcnd_path }, { "org.freedesktop.systemd1.Manager", "NotifySocket", bus_property_append_string, "s", m->notify_socket }, { "org.freedesktop.systemd1.Manager", "ControlGroupHierarchy", bus_property_append_string, "s", m->cgroup_hierarchy }, - { "org.freedesktop.systemd1.Manager", "MountOnPlug", bus_property_append_bool, "b", &m->mount_on_plug }, - { "org.freedesktop.systemd1.Manager", "SwapOnPlug", bus_property_append_bool, "b", &m->swap_on_plug }, { "org.freedesktop.systemd1.Manager", "MountAuto", bus_property_append_bool, "b", &m->mount_auto }, + { "org.freedesktop.systemd1.Manager", "SwapAuto", bus_property_append_bool, "b", &m->swap_auto }, { NULL, NULL, NULL, NULL, NULL } }; |