diff options
| author | toni <matzeton@googlemail.com> | 2015-06-09 12:17:39 +0200 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2015-06-09 12:17:39 +0200 |
| commit | 8315e840358f1ef19295a2cf899144b2faa3ad3d (patch) | |
| tree | c383777eed7c143e6316e61f284f56dee33a977e | |
| parent | 30e4c4858ce9d4be90af3a501704db0d4e93da5e (diff) | |
fixed postinst script on update/reinstall
| -rw-r--r-- | debian/postinst | 5 | ||||
| -rw-r--r-- | scripts/naskconf | 4 | ||||
| -rw-r--r-- | scripts/naskpass.initscript | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/debian/postinst b/debian/postinst index 4306174..4e658c3 100644 --- a/debian/postinst +++ b/debian/postinst @@ -9,10 +9,9 @@ set -e . /usr/share/naskpass/naskconf case "$1" in - install) - ;; - configure|upgrade) + configure) + nask_update db_input high naskpass/activate || true db_go db_get naskpass/activate diff --git a/scripts/naskconf b/scripts/naskconf index 4a4a7e0..f7c9f5d 100644 --- a/scripts/naskconf +++ b/scripts/naskconf @@ -23,9 +23,13 @@ _nask_cmd () { rm /usr/share/initramfs-tools/hooks/naskpass dpkg-divert --package naskpass --rename --remove ${ORGFILE} db_set naskpass/active false + elif [ "x$1" = "xUPDT" ] && [ "$RET" = "true" ]; then + cp /usr/share/naskpass/naskpass.script.initramfs ${ORGFILE} fi return 0 } nask_activate () { _nask_cmd "ACTV"; return $?; } nask_deactivate () { _nask_cmd "DCTV"; return $?; } +nask_update () { _nask_cmd "UPDT"; return $?; } + diff --git a/scripts/naskpass.initscript b/scripts/naskpass.initscript index a2d7e95..21ced37 100644 --- a/scripts/naskpass.initscript +++ b/scripts/naskpass.initscript @@ -310,14 +310,14 @@ setup_mapping() continue fi else - dmesg -D + dmesg -n 1 if ! $cryptkeyscript -c "cryptsetup -T 1 open $cryptsource $crypttarget"; then message "naskpass: failed" continue else message "naskpass: success" fi - dmesg -E + dmesg -n 4 fi fi |