Merge lp:~rcj/livecd-rootfs/xenial-proposed

7 years ago · 410703eae5
parent cf1b95b854 a623618e2c
commit 410703eae5
3 changed files with 9 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+livecd-rootfs (2.408.17~1) UNRELEASED; urgency=medium
+
+  * Install udev before calls to udevadm
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Wed, 13 Sep 2017 21:03:59 -0500
+
 livecd-rootfs (2.408.17) xenial; urgency=medium

  [ Robert C Jennings ]
--- a/live-build/ubuntu-cpc/functions
+++ b/live-build/ubuntu-cpc/functions
@ -104,6 +104,8 @@ teardown_mountpoint() {
    umount "$mountpoint/sys"
    umount "$mountpoint/proc"
    umount -R "$mountpoint/dev"
+
+    apt-get install -qqy udev
    udevadm settle
    sleep 3
    mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@ -122,6 +122,7 @@ EOF
    sync
    umount mountpoint/boot/efi
    sleep 5
+    apt-get install -qqy udev
    udevadm settle
    mount
    umount_partition mountpoint