|
Michal Schmidt |
14c310 |
From a3e4e804ea93df6011a367a88190e2cb6174de9a Mon Sep 17 00:00:00 2001
|
|
Michal Schmidt |
14c310 |
From: Lennart Poettering <lennart@poettering.net>
|
|
Michal Schmidt |
14c310 |
Date: Tue, 13 Mar 2012 03:34:42 +0100
|
|
Michal Schmidt |
14c310 |
Subject: [PATCH] mount: fix assertion
|
|
Michal Schmidt |
14c310 |
|
|
Michal Schmidt |
14c310 |
https://bugzilla.redhat.com/show_bug.cgi?id=768523
|
|
Michal Schmidt |
14c310 |
(cherry picked from commit 9631c090fd61070797f3a6139f873a3cabc5d28a)
|
|
Michal Schmidt |
14c310 |
---
|
|
Michal Schmidt |
14c310 |
src/mount.c | 4 ++--
|
|
Michal Schmidt |
14c310 |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
Michal Schmidt |
14c310 |
|
|
Michal Schmidt |
14c310 |
diff --git a/src/mount.c b/src/mount.c
|
|
Michal Schmidt |
14c310 |
index ccf1e9c..bac3ad3 100644
|
|
Michal Schmidt |
14c310 |
--- a/src/mount.c
|
|
Michal Schmidt |
14c310 |
+++ b/src/mount.c
|
|
Michal Schmidt |
14c310 |
@@ -189,7 +189,7 @@ static int mount_add_mount_links(Mount *m) {
|
|
Michal Schmidt |
14c310 |
if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0)
|
|
Michal Schmidt |
14c310 |
return r;
|
|
Michal Schmidt |
14c310 |
|
|
Michal Schmidt |
14c310 |
- } else if (pm && path_startswith(pm->what, n->where)) {
|
|
Michal Schmidt |
14c310 |
+ } else if (pm && pm->what && path_startswith(pm->what, n->where)) {
|
|
Michal Schmidt |
14c310 |
|
|
Michal Schmidt |
14c310 |
if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0)
|
|
Michal Schmidt |
14c310 |
return r;
|
|
Michal Schmidt |
14c310 |
@@ -197,7 +197,7 @@ static int mount_add_mount_links(Mount *m) {
|
|
Michal Schmidt |
14c310 |
if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0)
|
|
Michal Schmidt |
14c310 |
return r;
|
|
Michal Schmidt |
14c310 |
|
|
Michal Schmidt |
14c310 |
- } else if (pn && path_startswith(pn->what, m->where)) {
|
|
Michal Schmidt |
14c310 |
+ } else if (pn && pn->what && path_startswith(pn->what, m->where)) {
|
|
Michal Schmidt |
14c310 |
|
|
Michal Schmidt |
14c310 |
if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0)
|
|
Michal Schmidt |
14c310 |
return r;
|