← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/dbus-automount.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-automount.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-automount.h"
26
 
#include "dbus-common.h"
27
 
 
28
 
#define BUS_AUTOMOUNT_INTERFACE                                      \
29
 
        " <interface name=\"org.freedesktop.systemd1.Automount\">\n" \
30
 
        "  <property name=\"Where\" type=\"s\" access=\"read\"/>\n"  \
31
 
        "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
32
 
        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
33
 
        " </interface>\n"
34
 
 
35
 
#define INTROSPECTION                                                \
36
 
        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                    \
37
 
        "<node>\n"                                                   \
38
 
        BUS_UNIT_INTERFACE                                           \
39
 
        BUS_AUTOMOUNT_INTERFACE                                      \
40
 
        BUS_PROPERTIES_INTERFACE                                     \
41
 
        BUS_PEER_INTERFACE                                           \
42
 
        BUS_INTROSPECTABLE_INTERFACE                                 \
43
 
        "</node>\n"
44
 
 
45
 
#define INTERFACES_LIST                              \
46
 
        BUS_UNIT_INTERFACES_LIST                     \
47
 
        "org.freedesktop.systemd1.Automount\0"
48
 
 
49
 
const char bus_automount_interface[] _introspect_("Automount") = BUS_AUTOMOUNT_INTERFACE;
50
 
 
51
 
const char bus_automount_invalidating_properties[] =
52
 
        "Result\0";
53
 
 
54
 
static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_automount_append_automount_result, automount_result, AutomountResult);
55
 
 
56
 
static const BusProperty bus_automount_properties[] = {
57
 
        { "Where",         bus_property_append_string, "s", offsetof(Automount, where),    true },
58
 
        { "DirectoryMode", bus_property_append_mode,   "u", offsetof(Automount, directory_mode) },
59
 
        { "Result",        bus_automount_append_automount_result, "s", offsetof(Automount, result) },
60
 
        { NULL, }
61
 
};
62
 
 
63
 
DBusHandlerResult bus_automount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
64
 
        Automount *am = AUTOMOUNT(u);
65
 
        const BusBoundProperties bps[] = {
66
 
                { "org.freedesktop.systemd1.Unit",      bus_unit_properties,      u  },
67
 
                { "org.freedesktop.systemd1.Automount", bus_automount_properties, am },
68
 
                { NULL, }
69
 
        };
70
 
 
71
 
        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
72
 
}