Merge branch 'systemd/parabola' into notsystemd/premove

# Conflicts:
#	Makefile.am
#	tmpfiles.d/etc.conf.m4

1 files changed, 4 insertions, 3 deletions

diff --git a/src/shared/condition.c b/src/shared/condition.c
index 3a45ed265c..6bb42c0692 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -182,10 +182,11 @@ static int condition_test_architecture(Condition *c) {
 
         if (streq(c->parameter, "native"))
                 b = native_architecture();
-        else
+        else {
                 b = architecture_from_string(c->parameter);
-        if (b < 0)
-                return b;
+                if (b < 0) /* unknown architecture? Then it's definitely not ours */
+                        return false;
+        }
 
         return a == b;
 }