diff options
| author | toni <matzeton@googlemail.com> | 2016-07-29 16:56:22 +0200 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2016-07-29 16:56:22 +0200 |
| commit | 9a068d8833690f5b5518ed3f2721557d8e3e417a (patch) | |
| tree | b1f56f04c1ba68b1783c07d23ac115170fceff88 | |
| parent | 4fdda7f0ec6efd185f8cc8f88accdfef84d8c0f1 (diff) | |
check naskpass config syntax during update-initramfs
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | scripts/naskpass.inithook | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 7e2711d..cd39556 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS = src install-exec-local: 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' + install -m755 -c src/naskpass '$(prefix)/lib/cryptsetup/naskpass' + install -m755 -c src/naskshell '$(prefix)/lib/cryptsetup/naskshell' + install -m755 -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/scripts/naskpass.inithook b/scripts/naskpass.inithook index f2c560e..0e3d427 100755 --- a/scripts/naskpass.inithook +++ b/scripts/naskpass.inithook @@ -23,6 +23,7 @@ copy_exec /lib/cryptsetup/naskshell /bin copy_exec /lib/cryptsetup/naskpass_check /lib/cryptsetup copy_exec /usr/share/naskpass/naskpass.pre /lib/cryptsetup copy_exec /usr/share/naskpass/naskpass.post /lib/cryptsetup +dash -n /usr/share/naskpass/naskpass.initconf copy_exec /usr/share/naskpass/naskpass.initconf /etc/naskpass.conf copy_exec /usr/sbin/sshd /sbin/sshd |