summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMark Hindley <mark@hindley.org.uk>2018-11-09 12:01:13 +0000
committerMark Hindley <mark@hindley.org.uk>2018-11-09 12:04:13 +0000
commitebc2e2fcbc3339bd12fc028deef3f032e0d8c0a2 (patch)
tree2eded28d105601519784f567a49b9f283c43e924 /debian
parent7c4b18340c2dc8b5b27a1c5bf7a4c8cc95f5e807 (diff)
parentb456d06b2c4349d3cfc4af9293852ca4b6a20da3 (diff)
Merge branch 'runit_shutdown' into merge_rc2
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules2
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a24c6ecf7..0b84d3171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-elogind (239.1-1+debian1~rc1) unstable; urgency=medium
+elogind (239.1-1+debian1~rc2) unstable; urgency=medium
+
+ * Use shutdown rather than poweroff as the latter is missing on runit systems.
+
+ --
+
+elogind (239.1-1~rc1) unstable; urgency=medium
* Initial upload to Debian (closes: #905388).
* New upstream release v239.1.
diff --git a/debian/rules b/debian/rules
index b1023c94f..a45cf0fc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
# pam libs must go to /lib/*/security, same for udev rules
# - disable killing users processes by default. This is weird an unexpected
# behavior
+# - /sbin/poweroff is missing on runit systems, so use /sbin/shutdown instead
# - SELinux build is broken on 239 (fix available for 240)
# - tests disabled beacuase some of the tests seem to require elogind running.
# Need to sort out which tests could be run
@@ -16,6 +17,7 @@ CONFFLAGS = \
-Ddocdir=/usr/share/doc/elogind \
-Dudevrulesdir=/lib/udev/rules.d \
-Ddefault-kill-user-processes=false \
+ -Dpoweroff-path=/sbin/shutdown \
-Dselinux=false \
-Dtests=false