I would like to propose the following change: Don't set policy-rc.d in the setup script in this package.
I believe the policy-rc.d setting was added for images built using freedom-maker. But freedom-maker sets it's own policy-rc.d: https://github.com/freedombox/freedom-maker/blob/master/freedommaker/freedombox-customize#L138 So it shouldn't be needed here. I'm attaching a patch that implements this change.
From 19e55f1c7d70591f45a460be0702559140a390fe Mon Sep 17 00:00:00 2001 From: James Valleroy <[email protected]> Date: Mon, 16 Jan 2017 08:12:16 -0500 Subject: [PATCH] Don't set policy-rc.d during setup --- setup | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/setup b/setup index 0d268bd..d8c9b55 100755 --- a/setup +++ b/setup @@ -2,27 +2,6 @@ set -e # Exit on error -at_exit() { - if $policyd ; then - rm -f /usr/sbin/policy-rc.d - fi - policyd=false -} - -# Make sure configuring packages do not start any services. Also make -# sure we remove policy-rc.d only if we created it. -trap at_exit HUP INT TERM EXIT -if [ ! -e /usr/sbin/policy-rc.d ] ; then - cat > /usr/sbin/policy-rc.d <<EOF -#!/bin/sh -exit 101 -EOF - chmod a+rx /usr/sbin/policy-rc.d - policyd=true -else - policyd=false -fi - for f in /usr/lib/freedombox/setup.d/* ; do echo "running $f" $f -- 2.11.0
signature.asc
Description: OpenPGP digital signature
