[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-647-g4931cf6

[Aron Xu]

The following commit has been merged in the master branch:
commit 4931cf6f4ec6ca2285e73287f6611bfb36de7993
Author: Aron Xu <aron at debian.org>
Date:   Fri Nov 6 23:43:20 2015 +0800

    Make the debconf note visible

diff --git a/debian/zfs-dkms.config b/debian/zfs-dkms.config
index 2620df4..ad7e160 100644
--- a/debian/zfs-dkms.config
+++ b/debian/zfs-dkms.config
@@ -5,7 +5,8 @@ set -e
 # Source debconf library
 . /usr/share/debconf/confmodule
 
-db_input high zfs-dkms/note-incompatible-licenses || true
+db_input critical zfs-dkms/note-incompatible-licenses || true
+db_go
 
 kernelbits=unknown
 if [ -r /proc/kallsyms ]; then
diff --git a/debian/zfs-dkms.postinst b/debian/zfs-dkms.postinst
index 47d13cb..cb87e1c 100644
--- a/debian/zfs-dkms.postinst
+++ b/debian/zfs-dkms.postinst
@@ -4,8 +4,6 @@ set -e
 # Source debconf library (see dh_installdebconf(1) and #106070 #626312)
 . /usr/share/debconf/confmodule
 
-db_input high zfs-dkms/note-incompatible-licenses || true
-
 kernelbits=unknown
 if [ -r /proc/kallsyms ]; then
 	addrlen=$(head -1 /proc/kallsyms|awk '{print $1}'|wc -c)

-- 
OpenZFS on Linux