summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-12-31 11:44:15 +0000
committerIgor Pashev <pashev.igor@gmail.com>2014-12-31 11:44:15 +0000
commit8e5d86c9072fd4f10c019b71df9c097d8bb11742 (patch)
tree063793dabfbc79f520a28fd01ad729a63494a86a
parent0d1ee16a469036f8cf32b22110f95e3a4aa291c3 (diff)
downloadbase-files-8e5d86c9072fd4f10c019b71df9c097d8bb11742.tar.gz
base-files (6.5+7) unstable; urgency=mediumHEADmaster
* Let chown fail in more places * Removed Pre-depends on base-passwd (does not work on bootstrap)
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
-rw-r--r--debian/postinst.in6
3 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 011a069..9ebbf48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+base-files (6.5+7) unstable; urgency=medium
+
+ * Let chown fail in more places
+ * Removed Pre-depends on base-passwd (does not work on bootstrap)
+
+ -- Igor Pashev <pashev.igor@gmail.com> Wed, 31 Dec 2014 10:31:05 +0000
+
base-files (6.5+6) unstable; urgency=medium
* Let chown fail in install_from_default (inavlid user root:root)
diff --git a/debian/control b/debian/control
index dc7701d..3cba756 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, base-passwd
+Pre-Depends: awk
Essential: yes
Priority: required
Replaces: base, miscutils, dpkg (<= 1.15.0)
diff --git a/debian/postinst.in b/debian/postinst.in
index 67ea151..80bdbcf 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -73,18 +73,18 @@ fi
if [ ! -d /var/lib/dpkg ]; then
mkdir -m 755 -p /var/lib/dpkg
- chown root:root /var/lib/dpkg
+ chown root:root /var/lib/dpkg || true
fi
if [ ! -f /var/lib/dpkg/status ]; then
echo > /var/lib/dpkg/status
chmod 644 /var/lib/dpkg/status
- chown root:root /var/lib/dpkg/status
+ chown root:root /var/lib/dpkg/status || true
fi
if [ ! -f /usr/info/dir ] && [ ! -f /usr/share/info/dir ]; then
install_from_default /usr/share/base-files/info.dir /usr/share/info/dir
chmod 644 /usr/share/info/dir
- chown root:root /usr/share/info/dir
+ chown root:root /usr/share/info/dir || true
fi
if [ "$1" = "configure" ] && [ "$2" != "" ]; then