diff -Nru casper-1.426/debian/changelog casper-1.427/debian/changelog --- casper-1.426/debian/changelog 2019-10-15 14:08:34.000000000 +0000 +++ casper-1.427/debian/changelog 2019-10-17 09:38:07.000000000 +0000 @@ -1,3 +1,10 @@ +casper (1.427) eoan; urgency=medium + + * Setup machine-id, because without it it seems like machine-id setup is + racy. LP: #1848404 + + -- Dimitri John Ledkov Thu, 17 Oct 2019 10:38:07 +0100 + casper (1.426) eoan; urgency=medium * Just like in Disco, overlayfs squashfs is tripped up with an empty diff -Nru casper-1.426/scripts/casper-bottom/25adduser casper-1.427/scripts/casper-bottom/25adduser --- casper-1.426/scripts/casper-bottom/25adduser 2019-10-15 14:07:01.000000000 +0000 +++ casper-1.427/scripts/casper-bottom/25adduser 2019-10-17 09:38:07.000000000 +0000 @@ -138,6 +138,18 @@ #systemd-sysusers.service fails to open /etc/.pwd.lock with kernel errors rm -f /root/etc/.pwd.lock + +# Ends up being corrupted on subiquity rm -f /root/etc/machine-id +# it seems like without machine-id, machine-id setup is racy and +# breaks dbus and hence the world and we need proc & sys, to setup KVM +# based machine-id otherwise dhcp client-id will be unstable and will +# break in CI +mount -o bind /proc /root/proc +mount -o bind /sys /root/sys +chroot /root systemd-machine-id-setup +ln -s /etc/machine-id /root/var/lib/dbus/machine-id +umount /root/proc +umount /root/sys log_end_msg