From: Ross Burton <ross.burton@intel.com>
Date: Tue, 17 Sep 2019 20:30:30 +0000 (+0100)
Subject: systemd-systemctl-native: don't care about line endings
X-Git-Tag: yocto-4.0~8759
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7aaa9200b5ba2cba92ee1ed7003d54848498b37d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

systemd-systemctl-native: don't care about line endings

It's possible for a service file to accidentally contain mixed line endings, but
the string cleanup code was assuming Unix endings.

[ YOCTO #13535 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index 8837f54e166..ebac863739a 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -57,7 +57,7 @@ class SystemdFile():
                 if skip_re.match(line):
                     continue
 
-                line = line.rstrip("\n")
+                line = line.strip()
                 m = section_re.match(line)
                 if m:
                     if m.group('section') not in self.sections: