[Qa-jenkins-scm] [jenkins.debian.net] 01/01: debian-edu: kludge around the plymouth problem in d-i (revert in ~3 days)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit eae09a37efa2f2aef67ce55684a116965cf17312
Author: Philip Hands <phil at hands.com>
Date:   Sun Nov 27 00:29:45 2016 +0100

    debian-edu: kludge around the plymouth problem in d-i (revert in ~3 days)
---
 .../debian-edu_jessie-daily-netinst_standalone_preseed.cfg     |  2 ++
 d-i-preseed-cfgs/plymouthbug-get_files.sh                      |  6 ++++++
 d-i-preseed-cfgs/plymouthbug-kludge.sh                         | 10 ++++++++++
 3 files changed, 18 insertions(+)

diff --git a/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg
index ded1447..d6caffc 100644
--- a/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg
@@ -395,3 +395,5 @@ rpcbind rpcbind/loopback boolean false
 nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
 nslcd nslcd/ldap-uris string DNS
 
+# get rid of plymouth configs when they appear to fix d-i breakage (which should be fixed soon anyway)
+d-i preseed/run string plymouthbug-get_files.sh
diff --git a/d-i-preseed-cfgs/plymouthbug-get_files.sh b/d-i-preseed-cfgs/plymouthbug-get_files.sh
new file mode 100644
index 0000000..62dd748
--- /dev/null
+++ b/d-i-preseed-cfgs/plymouthbug-get_files.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+preseed_fetch plymouthbug-kludge.sh /tmp/plymouthbug-kludge.sh
+
+# drop this in the background so that it can wait for files to edit
+sh /tmp/plymouthbug-kludge.sh </dev/null >/dev/null 2>/dev/null &
diff --git a/d-i-preseed-cfgs/plymouthbug-kludge.sh b/d-i-preseed-cfgs/plymouthbug-kludge.sh
new file mode 100644
index 0000000..b831e08
--- /dev/null
+++ b/d-i-preseed-cfgs/plymouthbug-kludge.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for f in /target/etc/plymouth/plymouthd.conf /target/opt/ltsp/i386/etc/plymouth/plymouthd.conf ; do
+	# this is a joyous race condition
+	while [ ! -e $f ] ; do
+		sleep 1
+	done
+
+	rm -f $f
+done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git