[systemd-bugs] [Bug 78311] daemon-reload clears bus_name_good bit, reloads kill units with BusName=

bugzilla-daemon at freedesktop.org bugzilla-daemon at freedesktop.org
Wed Jun 10 05:08:44 PDT 2015


https://bugs.freedesktop.org/show_bug.cgi?id=78311

--- Comment #5 from Werner Fink <werner at suse.de> ---
(In reply to Lennart Poettering from comment #4)
> The patch isn't right, I cannot apply this:
> 
> $ curl 'https://bugs.freedesktop.org/attachment.cgi?id=116418' | git am
>   % Total    % Received % Xferd  Average Speed   Time    Time     Time 
> Current
>                                  Dload  Upload   Total   Spent    Left  Speed
> 100  3016  100  3016    0     0   2120      0  0:00:01  0:00:01 --:--:-- 
> 2120
> Applying: Let some boolean survive a daemon-reload
> error: core/service.c: does not exist in index
> error: core/unit.c: does not exist in index
> Patch failed at 0001 Let some boolean survive a daemon-reload
> The copy of the patch that failed is found in:
>    /home/lennart/projects/systemd/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> 
> Please clone current git from github, make your change, add it with "git add
> -p" commit it with "git commit", then generate a git-format-patch formatted
> patch with "git format-patch -1", and attach this here! THanks!

Hmmm ... I've used a clone of the current git from
git://anongit.freedesktop.org/systemd/systemd

  systemd/Upstream> git pull
  Already up-to-date.

please note that my git configuration does skip the a/ and b/ from the patches
due diff.noprefix=true.

Let's try github.com

 systemd/tmp> git clone https://github.com/systemd/systemd.git .
 Cloning into '.'...
 remote: Counting objects: 139803, done.
 remote: Compressing objects: 100% (12/12), done.
 remote: Total 139803 (delta 2), reused 0 (delta 0), pack-reused 139791
 Receiving objects: 100% (139803/139803), 33.11 MiB | 715.00 KiB/s, done.
 Resolving deltas: 100% (105992/105992), done.
 Checking connectivity... done.
 Checking out files: 100% (1917/1917), done.
 systemd/tmp> git checkout src/core/unit.c src/core/service.c
 systemd/tmp> patch -p0 <
../outgoing/0001-Let-some-boolean-survive-a-daemon-reload.patch 
 patching file src/core/service.c
 patching file src/core/unit.c

... it simlpy works.

 systemd/tmp> git commit -a
 [master 5344fce] Let some boolean survive a daemon-reload
 2 files changed, 20 insertions(+)
 systemd/tmp> git format-patch -M origin/master --stdout | diff -u
../outgoing/0001-Let-some-boolean-survive-a-daemon-reload.patch -
 --- ../outgoing/0001-Let-some-boolean-survive-a-daemon-reload.patch    
2015-06-10 10:59:47.133519522 +0200
 +++ -   2015-06-10 14:05:09.574887246 +0200
 @@ -1,6 +1,6 @@
 -From deff2d3e18e831d63bf98dd4114e4e35e41966e8 Mon Sep 17 00:00:00 2001
 +From 5344fced316c465a6e9df72fe8e42d1a30ceb04a Mon Sep 17 00:00:00 2001
  From: Werner Fink <werner at suse.de>
 -Date: Wed, 10 Jun 2015 10:47:13 +0200
 +Date: Wed, 10 Jun 2015 14:00:51 +0200
  Subject: [PATCH] Let some boolean survive a daemon-reload

  Without the boolean bus_name_good services as well as cgroup_realized

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/systemd-bugs/attachments/20150610/55b95c26/attachment.html>


More information about the systemd-bugs mailing list