Ubuntu Pastebin

Paste from ogra at Mon, 5 Sep 2016 15:41:05 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
diff -Nru initramfs-tools-ubuntu-core-0.7.43+ppa9/debian/changelog initramfs-tools-ubuntu-core-0.7.43+ppa10/debian/changelog
--- initramfs-tools-ubuntu-core-0.7.43+ppa9/debian/changelog	2016-08-10 10:03:37.000000000 +0200
+++ initramfs-tools-ubuntu-core-0.7.43+ppa10/debian/changelog	2016-09-05 17:40:19.000000000 +0200
@@ -1,3 +1,10 @@
+initramfs-tools-ubuntu-core (0.7.43+ppa10) xenial; urgency=medium
+
+  * create /etc/machine-id in teh writable space if it does not exist and bind
+    mount it so that systemd and dbus can find it on boot
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 05 Sep 2016 17:39:21 +0200
+
 initramfs-tools-ubuntu-core (0.7.43+ppa9) xenial; urgency=medium
 
   * remove old snappy_ab code
diff -Nru initramfs-tools-ubuntu-core-0.7.43+ppa9/scripts/ubuntu-core-rootfs initramfs-tools-ubuntu-core-0.7.43+ppa10/scripts/ubuntu-core-rootfs
--- initramfs-tools-ubuntu-core-0.7.43+ppa9/scripts/ubuntu-core-rootfs	2016-08-10 10:02:45.000000000 +0200
+++ initramfs-tools-ubuntu-core-0.7.43+ppa10/scripts/ubuntu-core-rootfs	2016-09-05 17:39:18.000000000 +0200
@@ -341,6 +341,12 @@
 	mkdir -p "${rootmnt}/writable/system-data/etc/systemd/system"
 	mount -o bind "${rootmnt}/writable/system-data/etc/systemd/system" "${rootmnt}/etc/systemd/system"
 
+	# create "machine-id" if it does not exist and bind mount it (LP: #1619721)
+	if [ ! -e ${rootmnt}/writable/system-data/etc/machine-id ]; then
+		cat /proc/sys/kernel/random/uuid|tr -d - >${rootmnt}/writable/system-data/etc/machine-id
+	fi
+	mount -o bind "${rootmnt}/writable/system-data/etc/machine-id" "${rootmnt}/etc/machine-id"
+
 	# Apply customized content
 	for user in "${rootmnt}"/writable/user-data/*
 	do
Download as text