Ubuntu Pastebin

Paste from Oliver Grawert at Mon, 24 Apr 2017 11:36:58 +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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
ogra@anubis:~/datengrab/devel/packages$ diff -ruN ubuntu-core-config-0.6.40+ppa43/ ../branches/core-build/config/
diff -ruN ubuntu-core-config-0.6.40+ppa43/debian/changelog ../branches/core-build/config/debian/changelog
--- ubuntu-core-config-0.6.40+ppa43/debian/changelog	2017-03-08 09:33:13.000000000 +0100
+++ ../branches/core-build/config/debian/changelog	2017-04-20 13:27:02.801247336 +0200
@@ -1,10 +1,13 @@
 ubuntu-core-config (0.6.40+ppa43) xenial; urgency=medium
 
-  * Add /lib/systemd/system/wpa_supplicant.service.d/snap.conf to allow
-    a system to use a wpa-supplicant coming from a snap rather than the
-    one bundled with the core snap.
+  * re-build after source setup change to make sure everything still works
+  * Remove snapd.generate-network-conf.service It predates the current
+    netplan-based solution.
+  * Remove 10-ubuntu-core-secure-path This was merged to the ubuntu sudo
+    package and can be dropped
+  * Rename snappy-set-hostname to snapd-set-hostname
 
- -- Simon Fels <simon.fels@canonical.com>  Wed, 08 Mar 2017 09:22:16 +0100
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 05 Apr 2017 13:15:53 +0200
 
 ubuntu-core-config (0.6.40+ppa42) xenial; urgency=medium
 
diff -ruN ubuntu-core-config-0.6.40+ppa43/debian/links ../branches/core-build/config/debian/links
--- ubuntu-core-config-0.6.40+ppa43/debian/links	2016-11-01 10:36:39.000000000 +0100
+++ ../branches/core-build/config/debian/links	2017-04-20 13:27:02.801247336 +0200
@@ -1,3 +1,3 @@
-/lib/systemd/system/snappy-set-hostname.service /lib/systemd/system/sysinit.target.requires/snappy-set-hostname.service
+/lib/systemd/system/snapd-set-hostname.service /lib/systemd/system/sysinit.target.requires/snapd-set-hostname.service
 /lib/systemd/system/snapd.sshd-keygen.service /lib/systemd/system/multi-user.target.wants/snapd.sshd-keygen.service
 
diff -ruN ubuntu-core-config-0.6.40+ppa43/etc/sudoers.d/10-ubuntu-core-secure-path ../branches/core-build/config/etc/sudoers.d/10-ubuntu-core-secure-path
--- ubuntu-core-config-0.6.40+ppa43/etc/sudoers.d/10-ubuntu-core-secure-path	2016-04-09 22:08:34.000000000 +0200
+++ ../branches/core-build/config/etc/sudoers.d/10-ubuntu-core-secure-path	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Defaults        secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
diff -ruN ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/snapd.generate-network-conf.service ../branches/core-build/config/lib/systemd/system/snapd.generate-network-conf.service
--- ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/snapd.generate-network-conf.service	2016-10-19 23:53:23.000000000 +0200
+++ ../branches/core-build/config/lib/systemd/system/snapd.generate-network-conf.service	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-[Unit]
-Description=Generate default network config
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/lib/snapd/generate-network-conf
diff -ruN ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/snapd-set-hostname.service ../branches/core-build/config/lib/systemd/system/snapd-set-hostname.service
--- ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/snapd-set-hostname.service	1970-01-01 01:00:00.000000000 +0100
+++ ../branches/core-build/config/lib/systemd/system/snapd-set-hostname.service	2017-04-20 13:27:02.801247336 +0200
@@ -0,0 +1,18 @@
+# Set the true hostname.
+#
+# systemd has already set the hostname when this unit executes (based on
+# the original /etc/hostname).
+#
+# However, since that file is on the read-only rootfs and the real
+# hostname is on the writable partition (/etc/writable bind-mount), it
+# is necessary to reset the hostname as soon as the true hostname file
+# is available.
+
+[Unit]
+Description=Set the hostname to the value stored on the writable partition
+After=etc-writable.mount
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/bin/hostname -F /etc/hostname
diff -ruN ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/snappy-set-hostname.service ../branches/core-build/config/lib/systemd/system/snappy-set-hostname.service
--- ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/snappy-set-hostname.service	2015-07-02 09:27:08.000000000 +0200
+++ ../branches/core-build/config/lib/systemd/system/snappy-set-hostname.service	1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-# Set the true hostname.
-#
-# systemd has already set the hostname when this unit executes (based on
-# the original /etc/hostname).
-#
-# However, since that file is on the read-only rootfs and the real
-# hostname is on the writable partition (/etc/writable bind-mount), it
-# is necessary to reset the hostname as soon as the true hostname file
-# is available.
-
-[Unit]
-Description=Set the hostname to the value stored on the writable partition
-After=etc-writable.mount
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-ExecStart=/bin/hostname -F /etc/hostname
diff -ruN ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/wpa_supplicant.service.d/snap.conf ../branches/core-build/config/lib/systemd/system/wpa_supplicant.service.d/snap.conf
--- ubuntu-core-config-0.6.40+ppa43/lib/systemd/system/wpa_supplicant.service.d/snap.conf	2017-03-08 09:33:13.000000000 +0100
+++ ../branches/core-build/config/lib/systemd/system/wpa_supplicant.service.d/snap.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-[Unit]
-ConditionPathExists=!/etc/systemd/system/snap.wpa-suplicant.wpa.service
Download as text