~snappy-dev/snapd/+git/snapd-pawel:update-device-msg-tweak

Last commit made on 2018-12-19
Get this branch:
git clone -b update-device-msg-tweak https://git.launchpad.net/~snappy-dev/snapd/+git/snapd-pawel

Branch merges

Branch information

Name:
update-device-msg-tweak
Repository:
lp:~snappy-dev/snapd/+git/snapd-pawel

Recent commits

3ecad41... by Paweł Stołowski

Merge branch 'master' into update-device-msg-tweak

50ec77c... by Samuele Pedroni

image: do not write empty etc/cloud

The snap --prepare-image command will currently look into the
gadget and create a /etc/cloud/cloud.cfg configuration if the
gadget contains a "cloud.conf" file in cloud-init format. But
even if there is no such file an empty /etc/cloud directory is
created.

This empty directory ends up on /writable/system-data/etc/cloud
and that will block the initial boot from populating that dir
with the data from the core18 /etc/cloud directory when this
dir is in "transition" mode in the /etc/system-image/writable-paths.

As a first step we should not create this /etc/cloud directory if
there is nothing in it. This means we will be able to revert:
snapcore/core18#106

Once that is done we need to also support ds-identify.conf or
switch to a cloud.conf/ directory instead of the current file
only approach. The reason is that we do not want to merge the
cloud config from core18 and from the gadget as this is messy.
Instead it should either come from the gadget or from the core18.

f3c9121... by Samuele Pedroni

Revert "Merge pull request #6217 from sergiocazzolato/tests-reorg-prepare-restore"

48b125a... by Maciej Borzecki

Revert "Merge pull request #6217 from sergiocazzolato/tests-reorg-prepare-restore"

This reverts commit 19e5a1d7889de6d8cf9c86b57edeaffcae002a15, reversing
changes made to 6f7203b4eb1b176524c4cba9e3b9e3c2706846a1.

b795564... by Paweł Stołowski

Merge pull request #6316 from sergiocazzolato/tests-fix-snpad-state-core-18

tests: skip snapd snap on reset for core systems

de9f89a... by Samuele Pedroni

cmd/snap-discard-ns: fix umount(2) typo

d103fe0... by Paweł Stołowski

Fix missing comma.

e6dd66b... by Sergio Cazzolato

skip snapd snap on reser for core systems

400bc34... by Maciej Borzecki

Merge remote-tracking branch 'origin/master' into bboozoo/discard-ns-typo

1a6e19b... by Paweł Stołowski

for -> of.