base-files (6.5+6) unstable; urgency=mediumdyson/6.5+6

  * Let chown fail in install_from_default (inavlid user root:root)
  * Pre-depends on base-passwd

3 files changed, 9 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 01a119e..011a069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+base-files (6.5+6) unstable; urgency=medium
+
+  * Let chown fail in install_from_default (inavlid user root:root)
+  * Pre-depends on base-passwd
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Wed, 31 Dec 2014 10:17:49 +0000
+
 base-files (6.5+5) unstable; urgency=low
 
   * Added /etc/zfs
diff --git a/debian/control b/debian/control
index 3cba756..dc7701d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.1
 Package: base-files
 Provides: base
 Architecture: any
-Pre-Depends: awk
+Pre-Depends: awk, base-passwd
 Essential: yes
 Priority: required
 Replaces: base, miscutils, dpkg (<= 1.15.0)
diff --git a/debian/postinst.in b/debian/postinst.in
index d500df0..67ea151 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -18,7 +18,7 @@ install_from_default() {
 install_directory() {
   if [ ! -d /$1 ]; then
     mkdir /$1
-    chown root:$3 /$1
+    chown root:$3 /$1 || true
     chmod $2 /$1
   fi
 }