diff -Nru irqbalance-1.1.0/debian/changelog irqbalance-1.1.0/debian/changelog --- irqbalance-1.1.0/debian/changelog 2016-01-09 10:24:25.000000000 +0000 +++ irqbalance-1.1.0/debian/changelog 2016-04-11 16:26:44.000000000 +0000 @@ -1,3 +1,9 @@ +irqbalance (1.1.0-2ubuntu1) xenial; urgency=medium + + * Do not start when inside a container (LP: #1454273) + + -- Simon Deziel Mon, 11 Apr 2016 16:22:21 +0000 + irqbalance (1.1.0-2) unstable; urgency=medium * Fix FTBFS on arm64 diff -Nru irqbalance-1.1.0/debian/irqbalance.init irqbalance-1.1.0/debian/irqbalance.init --- irqbalance-1.1.0/debian/irqbalance.init 2014-09-10 01:07:43.000000000 +0000 +++ irqbalance-1.1.0/debian/irqbalance.init 2016-04-11 16:34:56.000000000 +0000 @@ -41,6 +41,12 @@ case "$1" in start) + if [ -x /usr/bin/systemd-detect-virt ] && /usr/bin/systemd-detect-virt --quiet --container; then + log_daemon_msg "Not starting $NAME in container" + log_end_msg 0 + exit 0 + fi + log_begin_msg "Starting $DESC: $NAME" pid=$( pidofproc -p $PIDFILE $DAEMON ) @@ -63,6 +69,12 @@ log_end_msg $? ;; restart|force-reload) + if [ -x /usr/bin/systemd-detect-virt ] && /usr/bin/systemd-detect-virt --quiet --container; then + log_daemon_msg "Not restarting $NAME in container" + log_end_msg 0 + exit 0 + fi + log_begin_msg "Restarting $DESC: $NAME" start-stop-daemon --stop --retry 5 --quiet --oknodo --exec $DAEMON diff -Nru irqbalance-1.1.0/debian/irqbalance.upstart irqbalance-1.1.0/debian/irqbalance.upstart --- irqbalance-1.1.0/debian/irqbalance.upstart 2014-09-10 00:50:17.000000000 +0000 +++ irqbalance-1.1.0/debian/irqbalance.upstart 2016-04-11 16:27:08.000000000 +0000 @@ -6,7 +6,7 @@ description "CPU interrupts balancing daemon" author "Chuck Short " -start on runlevel [2345] +start on runlevel [2345] and not-container stop on runlevel [!2345] expect fork