[Piuparts-commits] [piuparts] 05/06: exception for corekeeper to not modify core file settings in the running kernel
Holger Levsen
holger at layer-acht.org
Tue Oct 3 22:50:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit f95eeaeb734c563c0fa9e6b1eb8929a396dcce5b
Author: Andreas Beckmann <anbe at debian.org>
Date: Tue Oct 3 03:14:44 2017 +0200
exception for corekeeper to not modify core file settings in the running kernel
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
custom-scripts/scripts/post_test_exceptions | 6 ++++++
custom-scripts/scripts/pre_test_exceptions | 8 ++++++++
debian/changelog | 2 ++
3 files changed, 16 insertions(+)
diff --git a/custom-scripts/scripts/post_test_exceptions b/custom-scripts/scripts/post_test_exceptions
index 6a7627c..35fa358 100755
--- a/custom-scripts/scripts/post_test_exceptions
+++ b/custom-scripts/scripts/post_test_exceptions
@@ -7,6 +7,12 @@ log_debug() {
# clean up from pre_test_exceptions
case ${PIUPARTS_OBJECTS%%=*} in
+ corekeeper)
+ log_debug
+ rm -fv /etc/sysctl.d/corekeeper.conf /etc/sysctl.d/corekeeper.conf.distrib
+ dpkg-divert --remove --rename /etc/sysctl.d/corekeeper.conf
+ rmdir /etc/sysctl.d 2>/dev/null || true
+ ;;
fai-nfsroot)
log_debug
rm -fv /.THIS_IS_THE_FAI_NFSROOT
diff --git a/custom-scripts/scripts/pre_test_exceptions b/custom-scripts/scripts/pre_test_exceptions
index 08198fa..2bb611c 100755
--- a/custom-scripts/scripts/pre_test_exceptions
+++ b/custom-scripts/scripts/pre_test_exceptions
@@ -6,6 +6,14 @@ log_debug() {
}
case ${PIUPARTS_OBJECTS%%=*} in
+ corekeeper)
+ # installing corekeeper reconfigures /proc/sys/kernel/core_pattern
+ log_debug
+ echo "Disabling /etc/sysctl.d/corekeeper.conf"
+ dpkg-divert --rename /etc/sysctl.d/corekeeper.conf
+ mkdir -p /etc/sysctl.d
+ echo "# disabled" > /etc/sysctl.d/corekeeper.conf
+ ;;
fai-nfsroot)
# fai-nfsroot refuses installation unless this file exists
log_debug
diff --git a/debian/changelog b/debian/changelog
index 22fd0d3..5d7763c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ piuparts (0.81) UNRELEASED; urgency=medium
* Separate scripts-lenny/ from scripts-squeeze/.
* scripts-squeeze/post_{setup,distupgrade}_squeeze-fake-essential:
- Treat install-info as fake-essential for all tests ending in squeeze.
+ * scripts/{pre,post}_test_exceptions: Add exception to prevent testing
+ corekeeper from changing the core file settings in the running kernel.
* master-bin/detect_piuparts_issues: Detect another way of 'apt-cache show'
failing. (Closes: #877417)
* master-bin/distill_alternatives_log: Parse piuparts.conf to find the
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list