chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ac12cf5
)
mount: don't creat local-fs.target links for mount units when runnin in user mode
author
Lennart Poettering
<lennart@poettering.net>
Mon, 6 Jan 2014 23:25:05 +0000
(07:25 +0800)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 6 Jan 2014 23:25:05 +0000
(07:25 +0800)
src/core/mount.c
patch
|
blob
|
history
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 41185c0c1d90e3bbbf5af233a25304d4cf880987..bce50548bf3cef11577fc7a8e5984dc4c49a8d8f 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-1378,12
+1378,13
@@
static int mount_add_one(
const char *options,
const char *fstype,
bool set_flags) {
const char *options,
const char *fstype,
bool set_flags) {
- int r;
- Unit *u;
- bool delete;
- char *e, *w = NULL, *o = NULL, *f = NULL;
- MountParameters *p;
+
+ _cleanup_free_ char *e = NULL, *w = NULL, *o = NULL, *f = NULL;
bool load_extras = false;
bool load_extras = false;
+ MountParameters *p;
+ bool delete;
+ Unit *u;
+ int r;
assert(m);
assert(what);
assert(m);
assert(what);
@@
-1409,20
+1410,13
@@
static int mount_add_one(
u = manager_get_unit(m, e);
if (!u) {
u = manager_get_unit(m, e);
if (!u) {
- const char* const target =
- fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
-
delete = true;
u = unit_new(m, sizeof(Mount));
delete = true;
u = unit_new(m, sizeof(Mount));
- if (!u) {
- free(e);
+ if (!u)
return -ENOMEM;
return -ENOMEM;
- }
r = unit_add_name(u, e);
r = unit_add_name(u, e);
- free(e);
-
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-1438,20
+1432,26
@@
static int mount_add_one(
goto fail;
}
goto fail;
}
- r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
- if (r < 0)
- goto fail;
- if (should_umount(MOUNT(u))) {
- r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
+ if (m->running_as == SYSTEMD_SYSTEM) {
+ const char* target;
+
+ target = fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
+
+ r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
+
+ if (should_umount(MOUNT(u))) {
+ r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
+ if (r < 0)
+ goto fail;
+ }
}
unit_add_to_load_queue(u);
} else {
delete = false;
}
unit_add_to_load_queue(u);
} else {
delete = false;
- free(e);
if (!MOUNT(u)->where) {
MOUNT(u)->where = strdup(where);
if (!MOUNT(u)->where) {
MOUNT(u)->where = strdup(where);
@@
-1489,12
+1489,15
@@
static int mount_add_one(
free(p->what);
p->what = w;
free(p->what);
p->what = w;
+ w = NULL;
free(p->options);
p->options = o;
free(p->options);
p->options = o;
+ o = NULL;
free(p->fstype);
p->fstype = f;
free(p->fstype);
p->fstype = f;
+ f = NULL;
if (load_extras) {
r = mount_add_extras(MOUNT(u));
if (load_extras) {
r = mount_add_extras(MOUNT(u));
@@
-1507,10
+1510,6
@@
static int mount_add_one(
return 0;
fail:
return 0;
fail:
- free(w);
- free(o);
- free(f);
-
if (delete && u)
unit_free(u);
if (delete && u)
unit_free(u);