summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-05-09 14:42:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-05-09 14:42:40 +0000
commitebf49a23977f1ec3131e21695f379ad98de816b7 (patch)
tree07cb812f422305a03808063c2a0520f1d76250bc /share
parentReleasing debian version 20170405-1. (diff)
downloadopen-infrastructure-compute-tools-ebf49a23977f1ec3131e21695f379ad98de816b7.tar.xz
open-infrastructure-compute-tools-ebf49a23977f1ec3131e21695f379ad98de816b7.zip
Merging upstream version 20170510.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--share/procps/zz-container-tools.conf12
-rwxr-xr-xshare/scripts/debconf12
2 files changed, 23 insertions, 1 deletions
diff --git a/share/procps/zz-container-tools.conf b/share/procps/zz-container-tools.conf
new file mode 100644
index 0000000..2396dfc
--- /dev/null
+++ b/share/procps/zz-container-tools.conf
@@ -0,0 +1,12 @@
+# The default limits are set to small and eventually lead to errors like
+# the following on container start:
+# Failed to allocate directory watch: Too many open files
+
+# /proc/sys/fs/inotify/max_queued_events defaults to 16384
+fs.inotify.max_queued_events=1048576
+
+# /proc/sys/fs/inotify/max_user_instances defaults to 128
+fs.inotify.max_user_instances=1048576
+
+# /proc/sys/fs/inotify/max_user_watches defaults to 8192
+fs.inotify.max_user_watches=1048576
diff --git a/share/scripts/debconf b/share/scripts/debconf
index e4c342e..dee4dcd 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -184,9 +184,19 @@ Cleanup_system ()
{
DIRECTORY="${1}"
- Chroot "${DIRECTORY}" "apt-get --yes autoremove"
+ Chroot "${DIRECTORY}" "apt-get --yes --purge autoremove"
Chroot "${DIRECTORY}" "apt-get clean"
+ CRUFT="$(Chroot "${DIRECTORY}" "dpkg --get-selections | awk '/deinstall$/ { print $1 }'")"
+
+ if [ -n "${CRUFT}" ]
+ then
+ for PACKAGE in ${CRUFT}
+ do
+ Chroot "${DIRECTORY}" "apt-get purge ${PACKAGE}"
+ done
+ fi
+
# Cleanup
rm -f "${DIRECTORY}/etc/dpkg/dpkg.cfg.d/container-tools"
rm -f "${DIRECTORY}/usr/sbin/policy-rc.d"