Imported 2.525.19

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-03-04 17:47:04 +00:00
parent 0d477ae456
commit f982dfde03
2 changed files with 22 additions and 2 deletions

11
debian/changelog vendored
View File

@ -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 <cjwatson@ubuntu.com> Mon, 18 Feb 2019 16:03:46 +0000
livecd-rootfs (2.525.18) bionic; urgency=medium livecd-rootfs (2.525.18) bionic; urgency=medium
[ Michael Hudson-Doyle ] [ Michael Hudson-Doyle ]
@ -23,11 +30,11 @@ livecd-rootfs (2.525.18) bionic; urgency=medium
livecd-rootfs (2.525.17) 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. * Add a LXD image to builds for the buildd subproject.
* Move buildd image building to binary hooks. * Move buildd image building to binary hooks.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 05 Feb 2019 14:55:06 +0000 -- Colin Watson <cjwatson@ubuntu.com> Fri, 08 Feb 2019 22:57:59 +0000
livecd-rootfs (2.525.16) bionic; urgency=medium livecd-rootfs (2.525.16) bionic; urgency=medium

View File

@ -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