diff options
| author | toni <matzeton@googlemail.com> | 2016-07-29 16:27:16 +0200 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2016-07-29 16:27:16 +0200 |
| commit | 4fdda7f0ec6efd185f8cc8f88accdfef84d8c0f1 (patch) | |
| tree | a5b426542e50d9af3ea2b03b7e3acc3c024b72f4 | |
| parent | 78e05eba11d08be64460a829e452d99da91800d7 (diff) | |
bar
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | scripts/naskpass.initscript | 3 | ||||
| -rw-r--r-- | src/ui_nask.c | 2 |
6 files changed, 15 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index c30f244..7e2711d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ SUBDIRS = src install-exec-local: - /bin/mkdir -p '$(prefix)/lib/cryptsetup' - /usr/bin/install -c src/naskpass '$(prefix)/lib/cryptsetup/naskpass' - /usr/bin/install -c src/naskshell '$(prefix)/lib/cryptsetup/naskshell' - /usr/bin/install -c src/naskpass_check '$(prefix)/lib/cryptsetup/naskpass_check' + install -d -m755 '$(prefix)/lib/cryptsetup' + install -c src/naskpass '$(prefix)/lib/cryptsetup/naskpass' + install -c src/naskshell '$(prefix)/lib/cryptsetup/naskshell' + install -c src/naskpass_check '$(prefix)/lib/cryptsetup/naskpass_check' rm '$(prefix)/bin/naskpass' rm '$(prefix)/bin/naskshell' rm '$(prefix)/bin/naskpass_check' diff --git a/Makefile.in b/Makefile.in index 29304f2..0191ae4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -753,10 +753,10 @@ uninstall-am: install-exec-local: - /bin/mkdir -p '$(prefix)/lib/cryptsetup' - /usr/bin/install -c src/naskpass '$(prefix)/lib/cryptsetup/naskpass' - /usr/bin/install -c src/naskshell '$(prefix)/lib/cryptsetup/naskshell' - /usr/bin/install -c src/naskpass_check '$(prefix)/lib/cryptsetup/naskpass_check' + install -d -m755 '$(prefix)/lib/cryptsetup' + install -c src/naskpass '$(prefix)/lib/cryptsetup/naskpass' + install -c src/naskshell '$(prefix)/lib/cryptsetup/naskshell' + install -c src/naskpass_check '$(prefix)/lib/cryptsetup/naskpass_check' rm '$(prefix)/bin/naskpass' rm '$(prefix)/bin/naskshell' rm '$(prefix)/bin/naskpass_check' @@ -22,6 +22,8 @@ note ======== Plymouth may not like naskpass (never verified). <br /> Do not use debian and dropbear during boot (broken initscript). <br /> +<br /> +It's possible to disable naskpass temporary by adding a kernel command line paramter (`cryptfallback`). <br /> screenshots ======== diff --git a/debian/rules b/debian/rules index ef7e2b5..a135e91 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ install: build dh_installchangelogs dh_installdebconf $(MAKE) install-strip prefix=$(CURDIR)/debian/naskpass - mkdir -p $(CURDIR)/debian/naskpass/usr/share/naskpass + install -d -m755 $(CURDIR)/debian/naskpass/usr/share/naskpass install -D -m755 ./scripts/naskconf $(CURDIR)/debian/naskpass/usr/share/naskpass/ install -D -m755 ./scripts/naskpass.inithook $(CURDIR)/debian/naskpass/usr/share/naskpass/ install -D -m755 ./scripts/naskpass.initscript $(CURDIR)/debian/naskpass/usr/share/naskpass/ diff --git a/scripts/naskpass.initscript b/scripts/naskpass.initscript index 5f2c919..4158aba 100755 --- a/scripts/naskpass.initscript +++ b/scripts/naskpass.initscript @@ -312,8 +312,9 @@ setup_mapping() continue fi else - /lib/cryptsetup/naskpass.pre + [ -z ${NASK_FAIL} ] && /lib/cryptsetup/naskpass.pre if ! $cryptkeyscript -c "/sbin/cryptsetup -T 1 open $cryptsource $crypttarget"; then + NASK_FAIL=1 message "naskpass: failed" continue else diff --git a/src/ui_nask.c b/src/ui_nask.c index f1a571d..597e42a 100644 --- a/src/ui_nask.c +++ b/src/ui_nask.c @@ -97,8 +97,10 @@ passwd_input_cb(WINDOW *wnd, void *data, int key) while (ui_wgetchtest(1500, '\n') != DOUI_KEY) { }; } + ui_thrd_suspend(); set_txtwindow_active(infownd, false); activate_input(pw_input); + ui_thrd_resume(); break; case UIKEY_BACKSPACE: del_input(wnd, a); |