summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-05-22 11:56:43 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-06-03 18:46:49 +0000
commitf9fe9773ec1873b9476eda0c4d374cd286b085eb (patch)
treedbf6a76a14967cb2a8d0cce195865011ced74785
parentReleasing debian version 20170510-1. (diff)
downloadopen-infrastructure-compute-tools-f9fe9773ec1873b9476eda0c4d374cd286b085eb.tar.xz
open-infrastructure-compute-tools-f9fe9773ec1873b9476eda0c4d374cd286b085eb.zip
Merging upstream version 20170522.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--CHANGELOG.txt8
-rw-r--r--VERSION.txt2
-rwxr-xr-xlib/container/start2
-rwxr-xr-xshare/scripts/debconf10
4 files changed, 10 insertions, 12 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cc595a3..21fda43 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2017-05-22 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20170522.
+
+ [ Daniel Baumann ]
+ * Correcting bind-ro option handling to actually work.
+ * Reverting "Purging packages that got removed/replaced during container creation.", not needed anymore.
+
2017-05-10 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20170510.
diff --git a/VERSION.txt b/VERSION.txt
index 05d952c..f0ba7e8 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20170510
+20170522
diff --git a/lib/container/start b/lib/container/start
index 014e859..88f2ea6 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -238,7 +238,7 @@ then
for DIRECTORIES in ${BINDS_RO}
do
- BIND_RO="${BIND_RO} --bind ${DIRECTORIES}"
+ BIND_RO="${BIND_RO} --bind-ro ${DIRECTORIES}"
done
fi
diff --git a/share/scripts/debconf b/share/scripts/debconf
index dee4dcd..c90e851 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -187,16 +187,6 @@ Cleanup_system ()
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"