Import patches-unapplied version 2.456 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 3adf9af2a9

New changelog entries:
  * Improve teardown_mountpoint to recursively find all submounts and
    unmount them, instead of working from a hard-coded list.  This makes
    the code resilient against other submounts being added later, including
    downstream.
  * Also nuke the sleep / udevadm settle calls in the process, which should
    never be required and slow down the builds.
  [ Michael Hudson-Doyle ]
  * set a default netplan config of dhcp-on-ethernet for the server live image
impish
Steve Langasek 7 years ago committed by usd-importer
parent 3adf9af2a9
commit 62cc84825d

14
debian/changelog vendored

@ -1,3 +1,17 @@
livecd-rootfs (2.456) artful; urgency=medium
* Improve teardown_mountpoint to recursively find all submounts and
unmount them, instead of working from a hard-coded list. This makes
the code resilient against other submounts being added later, including
downstream.
* Also nuke the sleep / udevadm settle calls in the process, which should
never be required and slow down the builds.
[ Michael Hudson-Doyle ]
* set a default netplan config of dhcp-on-ethernet for the server live image
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 13 Sep 2017 22:35:03 -0700
livecd-rootfs (2.455) artful; urgency=medium
* Restore the call to 'umount -R $mountpoint' from umount_partition,

@ -95,14 +95,13 @@ teardown_mountpoint() {
# Reverse the operations from setup_mountpoint
local mountpoint="$1"
umount "$mountpoint/var/cache/apt"
umount "$mountpoint/var/lib/apt"
umount "$mountpoint/tmp"
umount "$mountpoint/sys"
umount "$mountpoint/proc"
umount -R "$mountpoint/dev"
udevadm settle
sleep 3
# ensure we have exactly one trailing slash, and escape all slashes for awk
mountpoint_match=$(echo "$mountpoint" | sed -e's,/$,,; s,/,\\/,g;')'\/'
# sort -r ensures that deeper mountpoints are unmounted first
for submount in $(awk </proc/self/mounts "\$2 ~ /$mountpoint_match/ \
{ print \$2 }" | LC_ALL=C sort -r); do
umount $submount
done
mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
}

@ -112,8 +112,6 @@ install_grub() {
rm mountpoint/tmp/device.map
sync
umount mountpoint/boot/efi
sleep 5
udevadm settle
mount
umount_partition mountpoint
rmdir mountpoint

@ -0,0 +1,13 @@
# This is the initial network config.
# It can be overwritten by cloud-init or subiquity.
network:
version: 2
ethernets:
all-en:
match:
name: "en*"
dhcp4: true
all-eth:
match:
name: "eth*"
dhcp4: true
Loading…
Cancel
Save