Merge lp:~chipaca/snappy/use-etc-writable-for-atomics into lp:~snappy-dev/snappy/snappy-moved-to-github

Proposed by John Lenton on 2015-10-22
Status: Merged
Merged at revision: 795
Proposed branch: lp:~chipaca/snappy/use-etc-writable-for-atomics
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 29 lines (+4/-4)
1 file modified
coreconfig/config.go (+4/-4)
To merge this branch: bzr merge lp:~chipaca/snappy/use-etc-writable-for-atomics
Reviewer Review Type Date Requested Status
Michael Vogt 2015-10-22 Approve on 2015-10-22
Review via email: mp+275302@code.launchpad.net

Commit Message

Use /etc/writable from config now that config does AtomicWriteFile.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

\o/

review: Approve
Michael Vogt (mvo) wrote :

Unapproving again, as ogra points out the code should follow the link, I don't think our atomicWrite code is doing this right now though :/

Gustavo Niemeyer (niemeyer) wrote :

Hmmm.. /etc/writable is a curious artifact. On one hand it feels like the whole /etc should be writable, which is what we agreed to move towards in Budapest.. on the other hand, how do we update such a system? Something to talk about for all-snaps..

Oliver Grawert (ogra) wrote :

/etc/writable has been on the phones forever to support atomic writing of single files and to not rip extra security attack vectors and making the boot extra slow by having to sync the whole of etc every boot ...

Gustavo Niemeyer (niemeyer) wrote :

Interesting.. so why would the boot become extra slow if /etc is mounted read-write? Also, do you have a list of everything that is under /etc/writable ATM on the phones?

Thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'coreconfig/config.go'
2--- coreconfig/config.go 2015-10-20 20:00:08 +0000
3+++ coreconfig/config.go 2015-10-22 10:45:39 +0000
4@@ -39,12 +39,12 @@
5
6 const (
7 tzPathEnvironment string = "UBUNTU_CORE_CONFIG_TZ_FILE"
8- tzPathDefault string = "/etc/timezone"
9+ tzPathDefault string = "/etc/writable/timezone"
10 )
11
12 var (
13 tzZoneInfoPath = "/usr/share/zoneinfo"
14- tzZoneInfoTarget = "/etc/localtime"
15+ tzZoneInfoTarget = "/etc/writable/localtime"
16 )
17
18 const (
19@@ -58,8 +58,8 @@
20 modulesPath = "/etc/modules-load.d/ubuntu-core.conf"
21 interfacesRoot = "/etc/network/interfaces.d/"
22 pppRoot = "/etc/ppp/"
23- watchdogConfigPath = "/etc/watchdog.conf"
24- watchdogStartupPath = "/etc/default/watchdog"
25+ watchdogConfigPath = "/etc/writable/watchdog.conf"
26+ watchdogStartupPath = "/etc/writable/default/watchdog"
27 )
28
29 var (

Subscribers

People subscribed via source and target branches