Merge lp:~seb128/click/initctl-not-there into lp:click

Proposed by Sebastien Bacher on 2015-03-10
Status: Merged
Approved by: Michael Vogt on 2015-03-11
Approved revision: 457
Merged at revision: 456
Proposed branch: lp:~seb128/click/initctl-not-there
Merge into: lp:click
Diff against target: 30 lines (+10/-2)
2 files modified
click/chroot.py (+4/-2)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~seb128/click/initctl-not-there
Reviewer Review Type Date Requested Status
Colin Watson 2015-03-10 Approve on 2015-03-10
Review via email: mp+252479@code.launchpad.net

Commit message

Don't try to replace initctl if it's not there

Description of the change

Don't try to replace initctl if it's not there

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

not sure if we want to replace systemctl by /bin/true under systemd?

Colin Watson (cjwatson) wrote :

I don't think fiddling with systemctl is necessary; the other tools that do this kind of thing (debootstrap, debian-installer-utils) don't bother.

lp:~seb128/click/initctl-not-there updated on 2015-03-10
456. By Sebastien Bacher on 2015-03-10

Don't try to replace initctl if it's not there

Sebastien Bacher (seb128) wrote :

Thanks Colin, changed back to just do nothing if initctl is not there

Colin Watson (cjwatson) :
review: Approve
lp:~seb128/click/initctl-not-there updated on 2015-03-10
457. By Sebastien Bacher on 2015-03-10

Update the changelog version

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/chroot.py'
2--- click/chroot.py 2015-02-13 05:48:39 +0000
3+++ click/chroot.py 2015-03-10 18:51:37 +0000
4@@ -537,8 +537,10 @@
5 self._generate_chroot_config(mount)
6 daemon_policy = self._generate_daemon_policy(mount)
7 self._make_executable(daemon_policy)
8- os.remove("%s/sbin/initctl" % mount)
9- os.symlink("%s/bin/true" % mount, "%s/sbin/initctl" % mount)
10+ initctl = "%s/sbin/initctl" % mount
11+ if os.path.exists(initctl):
12+ os.remove(initctl)
13+ os.symlink("%s/bin/true" % mount, initctl)
14 self._generate_apt_proxy_file(mount, proxy)
15 finish_script = self._generate_finish_script(mount, build_pkgs)
16 self._make_executable(finish_script)
17
18=== modified file 'debian/changelog'
19--- debian/changelog 2015-02-26 17:07:09 +0000
20+++ debian/changelog 2015-03-10 18:51:37 +0000
21@@ -1,3 +1,9 @@
22+click (0.4.38.5) UNRELEASED; urgency=medium
23+
24+ * Don't try to replace initctl if it's not there (lp: #1430436)
25+
26+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 10 Mar 2015 19:47:49 +0100
27+
28 click (0.4.38.4) vivid; urgency=low
29
30 [ Michael Vogt ]

Subscribers

People subscribed via source and target branches