From f982dfde03ba6b7083e4a8bacbcb0e77c3be4a2e Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 4 Mar 2019 17:47:04 +0000 Subject: [PATCH] Imported 2.525.19 No reason for CPC update specified. --- debian/changelog | 11 +++++++++-- live-build/buildd/hooks/01-policy-rc-d.binary | 13 +++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 live-build/buildd/hooks/01-policy-rc-d.binary diff --git a/debian/changelog b/debian/changelog index 783c0747..ddd49727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.525.19) bionic; urgency=medium + + * Make sure buildd images have a /usr/sbin/policy-rc.d symlink + (LP: #1815251). + + -- Colin Watson Mon, 18 Feb 2019 16:03:46 +0000 + livecd-rootfs (2.525.18) bionic; urgency=medium [ Michael Hudson-Doyle ] @@ -23,11 +30,11 @@ livecd-rootfs (2.525.18) bionic; urgency=medium livecd-rootfs (2.525.17) bionic; urgency=medium - * Add a buildd subproject. + * Add a buildd subproject (LP: #1815251). * Add a LXD image to builds for the buildd subproject. * Move buildd image building to binary hooks. - -- Colin Watson Tue, 05 Feb 2019 14:55:06 +0000 + -- Colin Watson Fri, 08 Feb 2019 22:57:59 +0000 livecd-rootfs (2.525.16) bionic; urgency=medium diff --git a/live-build/buildd/hooks/01-policy-rc-d.binary b/live-build/buildd/hooks/01-policy-rc-d.binary new file mode 100755 index 00000000..d827875f --- /dev/null +++ b/live-build/buildd/hooks/01-policy-rc-d.binary @@ -0,0 +1,13 @@ +#! /bin/sh +set -e + +# Put the /usr/sbin/policy-rc.d alternatives symlink in place. Ordinarily +# update-alternatives ought to create this when policyrcd-script-zg2 is +# installed, but that doesn't work because live-build has already installed +# a dummy one at that point. The simplest approach is to repair the +# situation by putting it in place here. +if [ -L binary/etc/alternatives/policy-rc.d ] && \ + [ ! -e binary/usr/sbin/policy-rc.d ] && \ + [ ! -L binary/usr/sbin/policy-rc.d ]; then + ln -s /etc/alternatives/policy-rc.d binary/usr/sbin/policy-rc.d +fi