diff options
| author | Philip Hands <phil@hands.com> | 2016-11-27 00:29:45 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-11-27 00:42:53 +0100 |
| commit | eae09a37efa2f2aef67ce55684a116965cf17312 (patch) | |
| tree | bfa4c05ec15001a80a4f9bfd456727d59ae32491 /d-i-preseed-cfgs | |
| parent | 68fcb0e60993b3f086fa49c34096f9c53e378133 (diff) | |
| download | jenkins.debian.net-eae09a37efa2f2aef67ce55684a116965cf17312.tar.xz | |
debian-edu: kludge around the plymouth problem in d-i (revert in ~3 days)
Diffstat (limited to 'd-i-preseed-cfgs')
| -rw-r--r-- | d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg | 2 | ||||
| -rw-r--r-- | d-i-preseed-cfgs/plymouthbug-get_files.sh | 6 | ||||
| -rw-r--r-- | d-i-preseed-cfgs/plymouthbug-kludge.sh | 10 |
3 files changed, 18 insertions, 0 deletions
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 ded1447f..d6caffc6 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 00000000..62dd748b --- /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 00000000..b831e082 --- /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 |