summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2017-06-07 11:21:26 +0200
committerHolger Levsen <holger@layer-acht.org>2017-06-07 11:27:49 +0200
commit3b603ba41d8daa6c164285312e789e81997fe14e (patch)
tree575296a70ee60857890366e73005c48de823d12b
parent8c115fb094539ca8f77d5d52865fa1e6158f1dc0 (diff)
downloadjenkins.debian.net-3b603ba41d8daa6c164285312e789e81997fe14e.tar.xz
Revert "remove temporary fix, now that the systems have been fixed"
This reverts commit 18d0dcd4953cdab320cdc6c80745d5c6b304a17b. Reintroduce the fix because the link from /usr/local/bin/dsa-check-packages -> /bin/true still exists. The link must be removed in order to fix it. Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xupdate_jdn.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index 8c8d403f..b4ae0e1c 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -52,11 +52,22 @@ set_correct_date() {
}
disable_dsa_check_packages() {
+ # FIXME: remove the repair of /bin/true when all hosts has been
+ # updated
+ # ln -s /bin/true /usr/local/bin/dsa-check-packages was used which
+ # broke /bin/true by overwriting it with the perl script dsa-check-packages
+ if grep -q '/usr/bin/perl' /bin/true || grep -q '/bin/sh' /bin/true ; then
+ sudo apt-get install --reinstall coreutils
+ fi
+
+ if [ -L /usr/local/bin/dsa-check-packages ] ; then
+ rm /usr/local/bin/dsa-check-packages
+ fi
+
# disable check for outdated packages as in the future (like this)
# packages from security.d.o will appear outdated always…
echo -e "#!/bin/sh\n# disabled dsa-check by update_jdn.sh\nexit 0" | sudo tee /usr/local/bin/dsa-check-packages
sudo chmod a+rx /usr/local/bin/dsa-check-packages
-
}
echo "--------------------------------------------"