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

[Sebastien Bacher]

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

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

[Sebastien Bacher (seb128)]

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

[Colin Watson (cjwatson)]

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]

456. By Sebastien Bacher on 2015-03-10

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

[Sebastien Bacher (seb128)]

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

[Colin Watson (cjwatson)]

review: Approve

[lp:~seb128/click/initctl-not-there]

457. By Sebastien Bacher on 2015-03-10

Update the changelog version

=== modified file 'click/chroot.py'
--- click/chroot.py	2015-02-13 05:48:39 +0000
+++ click/chroot.py	2015-03-10 18:51:37 +0000
@@ -537,8 +537,10 @@
         self._generate_chroot_config(mount)
         daemon_policy = self._generate_daemon_policy(mount)
         self._make_executable(daemon_policy)
-        os.remove("%s/sbin/initctl" % mount)
-        os.symlink("%s/bin/true" % mount, "%s/sbin/initctl" % mount)
+        initctl = "%s/sbin/initctl" % mount
+        if os.path.exists(initctl):
+            os.remove(initctl)
+            os.symlink("%s/bin/true" % mount, initctl)
         self._generate_apt_proxy_file(mount, proxy)
         finish_script = self._generate_finish_script(mount, build_pkgs)
         self._make_executable(finish_script)

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-26 17:07:09 +0000
+++ debian/changelog	2015-03-10 18:51:37 +0000
@@ -1,3 +1,9 @@
+click (0.4.38.5) UNRELEASED; urgency=medium
+
+  * Don't try to replace initctl if it's not there (lp: #1430436)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 10 Mar 2015 19:47:49 +0100
+
 click (0.4.38.4) vivid; urgency=low
 
   [ Michael Vogt ]