Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-21 16:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge lp:~rcj/livecd-rootfs/trunk/

Browse Source
This commit is contained in:
Steve Langasek 2017-04-13 10:54:14 -07:00
commit e89c54b271
3 changed files with 11 additions and 9 deletions
debian
changelog
live-build/ubuntu-cpc/hooks
060-ipv6.chroot999-extras.binary

9
debian/changelog vendored

@ -1,3 +1,12 @@
livecd-rootfs (2.442) UNRELEASED; urgency=medium
[ Robert Jennings ]
* live-build/ubuntu-cpc/hooks/060-ipv6.chroot: remove faulty release
comparison prior to aa-series (LP: #1681548)
* live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 13 Apr 2017 10:38:04 -0700
livecd-rootfs (2.441) zesty; urgency=medium
[ Balint Reczey ]

9
live-build/ubuntu-cpc/hooks/060-ipv6.chroot

@ -1,15 +1,8 @@
#!/bin/bash
#
# Disable IPv6 privacy extensions on Utopic and later
# Disable IPv6 privacy extensions
#
codename=$(sh -c 'lsb_release --short --codename')
dist_ge() { [[ "$1" > "$2" || "$1" == "$2" ]]; }
if ! dist_ge "${codename}" "trusty"; then
exit 0
fi
cat << EOF > /etc/sysctl.d/99-cloudimg-ipv6.conf
# Written by the Cloud Image build process
# See https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1068756

2
live-build/ubuntu-cpc/hooks/999-extras.binary

@ -13,4 +13,4 @@ export CLOUD_IMG_STR="$IMAGE_STR"
export FS_LABEL="cloudimg-rootfs"
# Cleaner execution
/bin/run-parts --regex ".*\.binary" "${extra_d}"
/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"