diff options
| author | toni <matzeton@googlemail.com> | 2016-03-19 17:14:39 +0100 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2016-03-19 17:14:39 +0100 |
| commit | 6e5817332883a2bf5555a7a63b33fd7221482e12 (patch) | |
| tree | aa05d6f2603f3b35240a2e5800ed4eed794f4eec | |
| parent | 0c79886240b68ae9ed144cce5bd2167996859239 (diff) | |
fixed missing makefile.am object and initscript conditional plymouth msg
| -rwxr-xr-x | scripts/naskpass.initscript | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/naskpass.initscript b/scripts/naskpass.initscript index 5540667..98fd1dc 100755 --- a/scripts/naskpass.initscript +++ b/scripts/naskpass.initscript @@ -303,7 +303,9 @@ setup_mapping() if [ ! -e "$NEWROOT" ]; then if [ -x /bin/plymouth ] && plymouth --ping || [ $askpass_fallback -ne 0 ]; then - message "naskpass does not work with playmouth, falling back to default askpass .." + if [ $askpass_fallback -eq 0 ]; then + message "naskpass does not work with plymouth, falling back to default askpass .." + fi if ! crypttarget="$crypttarget" cryptsource="$cryptsource" \ $cryptkeyscript "$cryptkey" | $cryptopen; then message "cryptsetup: cryptsetup failed, bad password or options?" diff --git a/src/Makefile.am b/src/Makefile.am index 305406e..e6f5c91 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ bin_PROGRAMS=naskpass naskpass_check -naskpass_SOURCES=main.c opt.c status.c ui_ani.c ui.c ui_elements.c ui_input.c ui_ipc.c ui_txtwindow.c ui_statusbar.c +naskpass_SOURCES=main.c log.c opt.c status.c ui_ani.c ui.c ui_elements.c ui_input.c ui_ipc.c ui_txtwindow.c ui_statusbar.c naskpass_check_SOURCES=check/check.c |