summaryrefslogtreecommitdiffstats
path: root/d-i-preseed-cfgs
diff options
context:
space:
mode:
Diffstat (limited to 'd-i-preseed-cfgs')
-rw-r--r--d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg2
-rw-r--r--d-i-preseed-cfgs/plymouthbug-get_files.sh6
-rw-r--r--d-i-preseed-cfgs/plymouthbug-kludge.sh10
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