~ssweeny/snappy-hwe-snaps/+git/udisks2:udisks/2.6.4

Branch merges

Propose for merging

Merged into ~snappy-hwe-team/snappy-hwe-snaps/+git/udisks2:udisks/2.6.4 at revision a346a0dd664241257388240f0263e228016f63a1

System Enablement Bot: Approve (continuous-integration) on 2017-03-22

Simon Fels: Approve on 2017-03-22

Diff: 87 lines (+33/-15)

3 files modified

.ci_tests_disabled (+0/-0)
src/udisksdaemon.c (+10/-5)
src/udisksstate.c (+23/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

62c7704... by Scott Sweeny on 2017-03-22

Add a comment about conditional creation of state directory

ca04658... by Scott Sweeny on 2017-03-17

No CI tests for this branch

c807870... by Scott Sweeny on 2016-10-26

[SNAPPY] Use $SNAP_DATA as local state dir

LP: #1635819

4f01a5b... by Vojtěch Trefný on 2017-03-14

Version 2.6.4

c5c0e7b... by Vratislav Podzimek <email address hidden> on 2017-03-09

Merge pull request #209 from vpodzime/master-crypttab_fallback

Fallback to crypttab passphrase only if none given

243522d... by Vratislav Podzimek <email address hidden> on 2017-03-06

Merge pull request #210 from coldfix/change-keyfile

Keyfile support for ChangePassphrase

73cd666... by Thomas G. on 2017-02-21

Add keyfile parameters to ChangePassphrase

80cec0e... by Vratislav Podzimek <email address hidden> on 2017-03-03

Merge pull request #214 from vpodzime/master-conf_trim_fix

Only trim ".conf" from filename if it really has it

03bac83... by Vratislav Podzimek <email address hidden> on 2017-03-01

Only trim ".conf" from filename if it really has it

If not, return NULL indicating that it was not possible to get
the desired value by trimming it.

Fixes a potential issue introduced in
a09af2b322d82ea2c3228f3777e73e0142b73cdc.

9476122... by Vratislav Podzimek <email address hidden> on 2017-02-21

Fallback to crypttab passphrase only if none given

If given a passphrase explicitly, we should use it instead of
trying to dig something up from /etc/crypttab. If we are given no
passphrase, we should report an error. But since there's no way
to pass None/NULL as a value for argument of type "s" over DBus,
we have to treat an empty string as no passphrase. However, an
empty string is a valid LUKS passphrase so we still need to
provide a way to pass it. This is now possible with the new
'keyfile_contents' optional argument we just need to mention the
trick in the documentation.

Also update the authorization checks and action descriptions
shown to users.

Please note that there's no change in behavior here because an
empty string passed as a value for the 'passphrase' argument
hasn't (ever?) been working before this change.