probably. thanks for doing that! Auke
On Tue, Sep 6, 2011 at 3:10 PM, Marko Saukko <[email protected]> wrote: > Hi auke, > > I already filed a bug with the patch as attachment > > https://bugs.freedesktop.org/show_bug.cgi?id=40647 > > Is that enough? > > Regards, > Marko > > On 09/06/2011 09:07 AM, Kok, Auke-jan H wrote: >> >> Marko, can you push this change to the upstream as well? We should try >> and keep upstream synced with fixes to our specific distro changes in >> systemd. >> >> Thanks, >> >> Auke >> >> >> On Tue, Sep 6, 2011 at 2:51 PM, Marko Saukko<[email protected]> >> wrote: >>> >>> Hi, >>> I have made the following changes to systemd in project Trunk:Testing. >>> Please review and accept ASAP. >>> >>> Thank You, >>> Marko Saukko >>> >>> [This message was auto-generated] >>> >>> --- >>> >>> Request #23787: >>> >>> submit: home:marko.saukko:branches:Trunk:Testing/systemd(r4)(cleanup) >>> -> Trunk:Testing/systemd >>> >>> >>> Message: >>> * Mon Sep 05 2011 Marko Saukko<[email protected]> - 35 >>> - Added systemd-35-execstart-line-rescue-service.patch to >>> fix multiple ExecStart lines in rescue.service. >>> >>> State: new 2011-09-05T22:43:20 marko.saukko >>> Comment: None >>> >>> >>> >>> changes files: >>> -------------- >>> --- systemd.changes >>> +++ systemd.changes >>> @@ -0,0 +1,4 @@ >>> +* Mon Sep 05 2011 Marko Saukko<[email protected]> - 35 >>> +- Added systemd-35-execstart-line-rescue-service.patch to >>> + fix multiple ExecStart lines in rescue.service. >>> + >>> >>> new: >>> ---- >>> systemd-35-execstart-line-rescue-service.patch >>> >>> spec files: >>> ----------- >>> --- systemd.spec >>> +++ systemd.spec >>> @@ -11,6 +11,7 @@ >>> Source0: >>> http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2 >>> Source1: pamconsole-tmp.conf >>> Patch1: %{name}-24-fsck-disable-l-util-linux.patch >>> +Patch2: systemd-35-execstart-line-rescue-service.patch >>> BuildRequires: pkgconfig(dbus-1)>= 1.3.2 >>> BuildRequires: pkgconfig(dbus-glib-1) >>> BuildRequires: pkgconfig(gio-unix-2.0) >>> @@ -139,7 +140,7 @@ >>> %setup -q -n %{name}-%{version} >>> >>> %patch1 -p1 >>> - >>> +%patch2 -p1 >>> >>> %build >>> autoreconf >>> >>> other changes: >>> -------------- >>> >>> ++++++ systemd-35-execstart-line-rescue-service.patch (new) >>> --- systemd-35-execstart-line-rescue-service.patch >>> +++ systemd-35-execstart-line-rescue-service.patch >>> +From 8449381f7da9d8f2930b9cacfd655396a90d379b Mon Sep 17 00:00:00 2001 >>> +From: Marko Saukko<[email protected]> >>> +Date: Mon, 5 Sep 2011 21:57:59 +0300 >>> +Subject: [PATCH] In MeeGo there was more than one ExecStart lines >>> present >>> + that caused the systemd to refuse the rescue.service. >>> + >>> +--- >>> + units/rescue.service.m4 | 4 ++-- >>> + 1 files changed, 2 insertions(+), 2 deletions(-) >>> + >>> +diff --git a/units/rescue.service.m4 b/units/rescue.service.m4 >>> +index d2fd582..c49e029 100644 >>> +--- a/units/rescue.service.m4 >>> ++++ b/units/rescue.service.m4 >>> +@@ -25,10 +25,10 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"', >>> + m4_ifdef(`TARGET_MANDRIVA', >>> + `EnvironmentFile=/etc/sysconfig/init >>> + ExecStart=-/bin/bash -c "exec ${SINGLE}"', >>> +-`ExecStart=-/sbin/sulogin' >>> + m4_ifdef(`TARGET_MEEGO', >>> + `EnvironmentFile=/etc/sysconfig/init >>> +-ExecStart=-/bin/bash -c "exec ${SINGLE}"',))) >>> ++ExecStart=-/bin/bash -c "exec ${SINGLE}"', >>> ++`ExecStart=-/sbin/sulogin'))) >>> + ExecStopPost=-/bin/systemctl --fail --no-block default >>> + StandardInput=tty-force >>> + KillMode=process >>> +-- >>> +1.7.4.4 >>> + >>> >>> _______________________________________________ >>> MeeGo-commits mailing list >>> [email protected] >>> http://lists.meego.com/listinfo/meego-commits >>> > > _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
