Ubuntu Pastebin

Paste from ogra at Thu, 22 Oct 2015 14:35:28 +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
31
32
33
34
35
36
37
38
39
40
diff -Nru livecd-rootfs-2.301~ppa40/debian/changelog livecd-rootfs-2.301~ppa41/debian/changelog
--- livecd-rootfs-2.301~ppa40/debian/changelog	2015-10-22 12:46:15.000000000 +0200
+++ livecd-rootfs-2.301~ppa41/debian/changelog	2015-10-22 16:34:07.000000000 +0200
@@ -1,3 +1,9 @@
+livecd-rootfs (2.301~ppa41) vivid; urgency=medium
+
+  * handle linking better for /etc/default files
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 22 Oct 2015 16:33:49 +0200
+
 livecd-rootfs (2.301~ppa40) vivid; urgency=medium
 
   * add /etc/default/watchdog and watchdog.conf to /etc/writable/default/
diff -Nru livecd-rootfs-2.301~ppa40/live-build/ubuntu-core/hooks/08-etc-writable.chroot livecd-rootfs-2.301~ppa41/live-build/ubuntu-core/hooks/08-etc-writable.chroot
--- livecd-rootfs-2.301~ppa40/live-build/ubuntu-core/hooks/08-etc-writable.chroot	2015-10-22 12:45:29.000000000 +0200
+++ livecd-rootfs-2.301~ppa41/live-build/ubuntu-core/hooks/08-etc-writable.chroot	2015-10-22 16:35:26.000000000 +0200
@@ -5,7 +5,7 @@
 
 # cloud-init needs to be able to modify hostname and has the ability to
 # set the other two.
-for f in timezone localtime hostname default/watchdog watchdog.conf; do
+for f in timezone localtime hostname watchdog.conf; do
     if [ -e /etc/$f ]; then
         echo "I: Moving /etc/$f to /etc/writable/"
         mv /etc/$f /etc/writable/$f
@@ -13,3 +13,14 @@
     echo "I: Linking /etc/$f to /etc/writable/"
     ln -s writable/$f /etc/$f
 done
+
+# do the same for /etc/default files
+for f in watchdog; do
+    if [ -e /etc/default/$f ]; then
+        echo "I: Moving /etc/default/$f to /etc/writable/default"
+        mv /etc/default/$f /etc/writable/default/$f
+    fi
+    echo "I: Linking /etc/default/$f to /etc/writable/default"
+    ln -s /etc/writable/default/$f /etc/default/$f
+done
+
Download as text