chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit-status: add missing files src/exit-status.h src/exit-status.c
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 89b18431dae531d98a32711ee627c83276680c8b..ac33787e61e42c8307a3386419dcc7056b566a1d 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-1005,6
+1005,9
@@
static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
default:
assert_not_reached("Uh, control process died at wrong time.");
}
default:
assert_not_reached("Uh, control process died at wrong time.");
}
+
+ /* Notify clients about changed exit status */
+ unit_add_to_dbus_queue(u);
}
static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
}
static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
@@
-1172,7
+1175,7
@@
fail:
}
static char *fstab_node_to_udev_node(char *p) {
}
static char *fstab_node_to_udev_node(char *p) {
- char *dn, *t;
+ char *dn, *t
, *u
;
int r;
/* FIXME: to follow udev's logic 100% we need to leave valid
int r;
/* FIXME: to follow udev's logic 100% we need to leave valid
@@
-1180,7
+1183,13
@@
static char *fstab_node_to_udev_node(char *p) {
if (startswith(p, "LABEL=")) {
if (startswith(p, "LABEL=")) {
- if (!(t = xescape(p+6, "/ ")))
+ if (!(u = unquote(p+6, '"')))
+ return NULL;
+
+ t = xescape(u, "/ ");
+ free(u);
+
+ if (!t)
return NULL;
r = asprintf(&dn, "/dev/disk/by-label/%s", t);
return NULL;
r = asprintf(&dn, "/dev/disk/by-label/%s", t);
@@
-1194,7
+1203,13
@@
static char *fstab_node_to_udev_node(char *p) {
if (startswith(p, "UUID=")) {
if (startswith(p, "UUID=")) {
- if (!(t = xescape(p+5, "/ ")))
+ if (!(u = unquote(p+5, '"')))
+ return NULL;
+
+ t = xescape(u, "/ ");
+ free(u);
+
+ if (!t)
return NULL;
r = asprintf(&dn, "/dev/disk/by-uuid/%s", ascii_strlower(t));
return NULL;
r = asprintf(&dn, "/dev/disk/by-uuid/%s", ascii_strlower(t));
@@
-1557,7
+1572,9
@@
const UnitVTable mount_vtable = {
.reset_maintenance = mount_reset_maintenance,
.reset_maintenance = mount_reset_maintenance,
+ .bus_interface = "org.freedesktop.systemd1.Mount",
.bus_message_handler = bus_mount_message_handler,
.bus_message_handler = bus_mount_message_handler,
+ .bus_invalidating_properties = bus_mount_invalidating_properties,
.enumerate = mount_enumerate,
.shutdown = mount_shutdown
.enumerate = mount_enumerate,
.shutdown = mount_shutdown