← Back to branch summary

~ubuntu-branches/ubuntu/trusty/systemd/trusty

« back to all changes in this revision

Viewing changes to src/dbus-mount.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl, Michael Biebl, Michael Stapelberg, Daniel Schaal, Ondrej Balaz
  • Date: 2013-09-12 00:13:11 UTC
  • mfrom: (1.1.11) (9.1.2 experimental)
  • mto: This revision was merged to the branch mainline in revision 53.
  • Revision ID: package-import@ubuntu.com-20130912001311-dz35it34wr2lbday
Tags: 204-3
http://bugs.debian.org/719444
http://bugs.debian.org/721347
http://bugs.debian.org/722180
http://bugs.debian.org/709780
http://bugs.debian.org/711245
[ Michael Biebl ]
* Upload to unstable.
* Use /bin/bash in debug-shell.service as Debian doesn't have /sbin/sushell.
* Only import net.ifaces cmdline property for network devices.
* Generate strict dependencies between the binary packages using a
  shlibs.local file and add an explicit versioned dependency on
  libsystemd-login0 to systemd to ensure packages are upgraded in sync.
  Closes: #719444
* Drop obsolete Replaces: libudev0 from udev package.
* Use correct paths for various binaries, like /sbin/quotaon, which are
  installed in / and not /usr in Debian.  Closes: #721347
* Don't install kernel-install(8) man page since we don't install the
  corresponding binary either.  Closes: #722180
* Cherry-pick upstream fixes to make switching runlevels and starting
  reboot via ctrl-alt-del more robust.
* Cherry-pick upstream fix to properly apply ACLs to Journal files.

[ Michael Stapelberg ]
* Make systemctl enable|disable call update-rc.d for SysV init scripts.
  Closes: #709780
* Don't mount /tmp as tmpfs by default and make it possible to enable this
  feature via "systemctl enable tmp.mount".

[ Daniel Schaal ]
* Add bug-script to systemd and udev.  Closes: #711245

[ Ondrej Balaz ]
* Recognize discard option in /etc/crypttab.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dbus-mount.c
1
 
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
2
 
 
3
 
/***
4
 
  This file is part of systemd.
5
 
 
6
 
  Copyright 2010 Lennart Poettering
7
 
 
8
 
  systemd is free software; you can redistribute it and/or modify it
9
 
  under the terms of the GNU General Public License as published by
10
 
  the Free Software Foundation; either version 2 of the License, or
11
 
  (at your option) any later version.
12
 
 
13
 
  systemd is distributed in the hope that it will be useful, but
14
 
  WITHOUT ANY WARRANTY; without even the implied warranty of
15
 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16
 
  General Public License for more details.
17
 
 
18
 
  You should have received a copy of the GNU General Public License
19
 
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
20
 
***/
21
 
 
22
 
#include <errno.h>
23
 
 
24
 
#include "dbus-unit.h"
25
 
#include "dbus-mount.h"
26
 
#include "dbus-execute.h"
27
 
#include "dbus-common.h"
28
 
 
29
 
#define BUS_MOUNT_INTERFACE                                             \
30
 
        " <interface name=\"org.freedesktop.systemd1.Mount\">\n"        \
31
 
        "  <property name=\"Where\" type=\"s\" access=\"read\"/>\n"     \
32
 
        "  <property name=\"What\" type=\"s\" access=\"read\"/>\n"      \
33
 
        "  <property name=\"Options\" type=\"s\" access=\"read\"/>\n"   \
34
 
        "  <property name=\"Type\" type=\"s\" access=\"read\"/>\n"      \
35
 
        "  <property name=\"TimeoutUSec\" type=\"t\" access=\"read\"/>\n" \
36
 
        BUS_EXEC_COMMAND_INTERFACE("ExecMount")                         \
37
 
        BUS_EXEC_COMMAND_INTERFACE("ExecUnmount")                       \
38
 
        BUS_EXEC_COMMAND_INTERFACE("ExecRemount")                       \
39
 
        BUS_EXEC_CONTEXT_INTERFACE                                      \
40
 
        "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
41
 
        "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
42
 
        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
43
 
        " </interface>\n"
44
 
 
45
 
#define INTROSPECTION                                                   \
46
 
        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                       \
47
 
        "<node>\n"                                                      \
48
 
        BUS_UNIT_INTERFACE                                              \
49
 
        BUS_MOUNT_INTERFACE                                             \
50
 
        BUS_PROPERTIES_INTERFACE                                        \
51
 
        BUS_PEER_INTERFACE                                              \
52
 
        BUS_INTROSPECTABLE_INTERFACE                                    \
53
 
        "</node>\n"
54
 
 
55
 
#define INTERFACES_LIST                              \
56
 
        BUS_UNIT_INTERFACES_LIST                     \
57
 
        "org.freedesktop.systemd1.Mount\0"
58
 
 
59
 
const char bus_mount_interface[] _introspect_("Mount") = BUS_MOUNT_INTERFACE;
60
 
 
61
 
const char bus_mount_invalidating_properties[] =
62
 
        "What\0"
63
 
        "Options\0"
64
 
        "Type\0"
65
 
        "ExecMount\0"
66
 
        "ExecUnmount\0"
67
 
        "ExecRemount\0"
68
 
        "ControlPID\0"
69
 
        "Result\0";
70
 
 
71
 
static int bus_mount_append_what(DBusMessageIter *i, const char *property, void *data) {
72
 
        Mount *m = data;
73
 
        const char *d;
74
 
 
75
 
        assert(i);
76
 
        assert(property);
77
 
        assert(m);
78
 
 
79
 
        if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.what)
80
 
                d = m->parameters_proc_self_mountinfo.what;
81
 
        else if (m->from_fragment && m->parameters_fragment.what)
82
 
                d = m->parameters_fragment.what;
83
 
        else if (m->from_etc_fstab && m->parameters_etc_fstab.what)
84
 
                d = m->parameters_etc_fstab.what;
85
 
        else
86
 
                d = "";
87
 
 
88
 
        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
89
 
                return -ENOMEM;
90
 
 
91
 
        return 0;
92
 
}
93
 
 
94
 
static int bus_mount_append_options(DBusMessageIter *i, const char *property, void *data) {
95
 
        Mount *m = data;
96
 
        const char *d;
97
 
 
98
 
        assert(i);
99
 
        assert(property);
100
 
        assert(m);
101
 
 
102
 
        if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.options)
103
 
                d = m->parameters_proc_self_mountinfo.options;
104
 
        else if (m->from_fragment && m->parameters_fragment.options)
105
 
                d = m->parameters_fragment.options;
106
 
        else if (m->from_etc_fstab && m->parameters_etc_fstab.options)
107
 
                d = m->parameters_etc_fstab.options;
108
 
        else
109
 
                d = "";
110
 
 
111
 
        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
112
 
                return -ENOMEM;
113
 
 
114
 
        return 0;
115
 
}
116
 
 
117
 
static int bus_mount_append_type(DBusMessageIter *i, const char *property, void *data) {
118
 
        Mount *m = data;
119
 
        const char *d;
120
 
 
121
 
        assert(i);
122
 
        assert(property);
123
 
        assert(m);
124
 
 
125
 
        if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.fstype)
126
 
                d = m->parameters_proc_self_mountinfo.fstype;
127
 
        else if (m->from_fragment && m->parameters_fragment.fstype)
128
 
                d = m->parameters_fragment.fstype;
129
 
        else if (m->from_etc_fstab && m->parameters_etc_fstab.fstype)
130
 
                d = m->parameters_etc_fstab.fstype;
131
 
        else
132
 
                d = "";
133
 
 
134
 
        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
135
 
                return -ENOMEM;
136
 
 
137
 
        return 0;
138
 
}
139
 
 
140
 
static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_mount_append_mount_result, mount_result, MountResult);
141
 
 
142
 
static const BusProperty bus_mount_properties[] = {
143
 
        { "Where",         bus_property_append_string, "s", offsetof(Mount, where),    true },
144
 
        { "What",          bus_mount_append_what,      "s", 0 },
145
 
        { "Options",       bus_mount_append_options,   "s", 0 },
146
 
        { "Type",          bus_mount_append_type,      "s", 0 },
147
 
        { "TimeoutUSec",   bus_property_append_usec,   "t", offsetof(Mount, timeout_usec)   },
148
 
        BUS_EXEC_COMMAND_PROPERTY("ExecMount",   offsetof(Mount, exec_command[MOUNT_EXEC_MOUNT]),   false),
149
 
        BUS_EXEC_COMMAND_PROPERTY("ExecUnmount", offsetof(Mount, exec_command[MOUNT_EXEC_UNMOUNT]), false),
150
 
        BUS_EXEC_COMMAND_PROPERTY("ExecRemount", offsetof(Mount, exec_command[MOUNT_EXEC_REMOUNT]), false),
151
 
        { "ControlPID",    bus_property_append_pid,    "u", offsetof(Mount, control_pid)    },
152
 
        { "DirectoryMode", bus_property_append_mode,   "u", offsetof(Mount, directory_mode) },
153
 
        { "Result",        bus_mount_append_mount_result, "s", offsetof(Mount, result)      },
154
 
        { NULL, }
155
 
};
156
 
 
157
 
DBusHandlerResult bus_mount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
158
 
        Mount *m = MOUNT(u);
159
 
 
160
 
        const BusBoundProperties bps[] = {
161
 
                { "org.freedesktop.systemd1.Unit",  bus_unit_properties,         u },
162
 
                { "org.freedesktop.systemd1.Mount", bus_mount_properties,        m },
163
 
                { "org.freedesktop.systemd1.Mount", bus_exec_context_properties, &m->exec_context },
164
 
                { NULL, }
165
 
        };
166
 
 
167
 
        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps );
168
 
}