[systemd-devel] [PATCH 0/2] core/cryptsetup: cleaned up patches

[Lennart Poettering]

On Tue, 29.04.14 21:09, Przemek Rudy (prudy1 at o2.pl) wrote:

> Applied previous comments.
> 
> Przemek Rudy (2):
>   core/cryptsetup: Add WantsMountFor option to enable fallback to
>     password request for crypt mounts.
>   core/cryptsetup: Remove duplicated code.

Could you rebase and merge the two patches into one? First duplicating
everything and then removing them is not really useful for reviewing!

Thanks!

>  src/core/automount.c                  |  2 +-
>  src/core/dbus-unit.c                  |  3 +-
>  src/core/load-fragment-gperf.gperf.m4 |  3 +-
>  src/core/load-fragment.c              |  8 +--
>  src/core/load-fragment.h              |  2 +-
>  src/core/manager.c                    | 11 ++--
>  src/core/manager.h                    |  8 +--
>  src/core/mount.c                      | 40 +++++++-------
>  src/core/path.c                       |  2 +-
>  src/core/socket.c                     |  2 +-
>  src/core/swap.c                       |  2 +-
>  src/core/timer.c                      |  2 +-
>  src/core/unit.c                       | 99 ++++++++++++++++++++---------------
>  src/core/unit.h                       |  7 +--
>  src/cryptsetup/cryptsetup-generator.c |  3 +-
>  15 files changed, 109 insertions(+), 85 deletions(-)
> 


Lennart

-- 
Lennart Poettering, Red Hat