diff options
| -rwxr-xr-x | scripts/naskpass.inithook | 10 | ||||
| -rwxr-xr-x | scripts/naskpass.post | 2 | ||||
| -rwxr-xr-x | scripts/naskpass.pre | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/scripts/naskpass.inithook b/scripts/naskpass.inithook index 01dbf24..6bb0cc1 100755 --- a/scripts/naskpass.inithook +++ b/scripts/naskpass.inithook @@ -18,11 +18,11 @@ esac . /usr/share/initramfs-tools/hook-functions -copy_exec /lib/cryptsetup/naskpass /lib/cryptsetup -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 -cp /usr/share/naskpass/naskpass.initconf /etc/naskpass.conf +copy_exec /lib/cryptsetup/naskpass /lib/cryptsetup +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 +copy_exec /usr/share/naskpass/naskpass.initconf /etc/naskpass.conf mkdir -p ${DESTDIR}/lib/terminfo/l cp /lib/terminfo/l/linux ${DESTDIR}/lib/terminfo/l/ diff --git a/scripts/naskpass.post b/scripts/naskpass.post index f443bea..0ea24a2 100755 --- a/scripts/naskpass.post +++ b/scripts/naskpass.post @@ -1,5 +1,3 @@ #!/bin/sh -set -e . /etc/naskpass.conf -dmesg -E diff --git a/scripts/naskpass.pre b/scripts/naskpass.pre index 8a2d25d..f5acd96 100755 --- a/scripts/naskpass.pre +++ b/scripts/naskpass.pre @@ -1,21 +1,21 @@ #!/bin/sh -set -e . /etc/naskpass.conf -echo -n 'waiting for ip ...' +echo -n 'waiting for ip ' CURWAIT=$MAXWAIT if [ -x /sbin/dropbear ]; then -while ! $(ifconfig -a | grep -oE 'inet addr:'); do +while ! $(ifconfig -a | grep -qoE 'inet addr:'); do echo -n '.' if [ $CURWAIT -le 0 ]; then echo ' got no ip, continue anyway.' break fi - expr $CURWAIT - 1 + CURWAIT=$(expr $CURWAIT - 1) + sleep 1 done +echo fi -dmesg -D |