Actually include postgresql postinst changes

diff --git a/debian/changelog b/debian/changelog
index 6048b8f..db24cf9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freeradius (3.0.0git+dfsg+moonshot3-2) unstable; urgency=low
+
+  * Actually include postgresql postinst changes
+
+ -- Sam Hartman <hartmans@debian.org>  Sat, 01 Jun 2013 13:32:38 -0400
+
 freeradius (3.0.0git+dfsg+moonshot3-1) unstable; urgency=low
 
   * Pull in sql fix for non-xlat values

diff --git a/debian/freeradius-postgresql.postinst b/debian/freeradius-postgresql.postinst
index 111f39f..2dddcb1 100755 (executable)
--- a/debian/freeradius-postgresql.postinst
+++ b/debian/freeradius-postgresql.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-        for file in `find /etc/freeradius/sql/main/postgresql/ -print` 
+        for file in `find /etc/freeradius/sql/main/postgresql -type f -print` 
         do
           if ! dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --add --update root freerad 0640 $file
@@ -20,9 +20,9 @@ case "$1" in
         done
 
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-          invoke-rc.d freeradius force-reload
+          invoke-rc.d freeradius force-reload ||true
         else
-          /etc/init.d/freeradius force-reload
+          /etc/init.d/freeradius force-reload ||true
         fi
        ;;
 esac