diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-12-01 10:03:20 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-12-01 10:03:20 +0100 |
| commit | f05eaf4b777119cde7c9cdc2bbbfe7f9be1974ae (patch) | |
| tree | 78998e6aeaa9461944b39a891326e31b05d0ab66 | |
| parent | fa33733fc6e8050631e6e09202ca92047c98697d (diff) | |
| download | jenkins.debian.net-f05eaf4b777119cde7c9cdc2bbbfe7f9be1974ae.tar.xz | |
Revert "debian-edu: kludge around the plymouth problem in d-i (revert in ~3 days)"
This reverts commit eae09a37efa2f2aef67ce55684a116965cf17312.
| -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, 0 insertions, 18 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 d6caffc6..ded1447f 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,5 +395,3 @@ 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 deleted file mode 100644 index 62dd748b..00000000 --- a/d-i-preseed-cfgs/plymouthbug-get_files.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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 deleted file mode 100644 index b831e082..00000000 --- a/d-i-preseed-cfgs/plymouthbug-kludge.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 |