FAI config: well-tested Debian Edu 10 minimal + MATE workstation installation

4 files changed, 30 insertions, 7 deletions

diff --git a/fai/config/scripts/EDU/10-update-debian-edu-config b/fai/config/scripts/EDU/10-update-debian-edu-config
index 4cf18d7..ce05a89 100755
--- a/fai/config/scripts/EDU/10-update-debian-edu-config
+++ b/fai/config/scripts/EDU/10-update-debian-edu-config
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-if [ -f /etc/debian-edu/config ] && [ -x /usr/share/doc/debian-edu-install ]; then
-	sed -i /etc/debian-edu/config -e "s/^VERSION=.*$/VERSION=\"$(/usr/lib/debian-edu-install/version)\"/"
+if [ -f $target/etc/debian-edu/config ] && [ -x $target/usr/share/doc/debian-edu-install ]; then
+	sed -i $target/etc/debian-edu/config -e "s/^VERSION=.*$/VERSION=\"$(head -n1 $target/usr/lib/debian-edu-install/version)\"/"
 fi
-
diff --git a/fai/config/scripts/EDU/40-cfengine-install-workstation b/fai/config/scripts/EDU/40-cfengine-debian-edu-postinstall
index 9a1ff13..90ae237 100755
--- a/fai/config/scripts/EDU/40-cfengine-install-workstation
+++ b/fai/config/scripts/EDU/40-cfengine-debian-edu-postinstall
@@ -1,7 +1,5 @@
 #! /bin/bash
 
-set -x
-
 # Let's make sure that we have correct http proxy settings.
 if [ -x $target/usr/share/debian-edu-config/tools/update-proxy-from-wpad ]; then 
 	chroot $target /usr/share/debian-edu-config/tools/update-proxy-from-wpad
@@ -21,7 +19,21 @@ echo http_proxy=$http_proxy
 echo https_proxy=$https_proxy
 echo ftp_proxy=$ftp_proxy
 
+# d-e-c/cf.finalize expects this directory to exist for prep'ing desktop-profiles
+# (FIXME: file d-e-c-bug)
+mkdir -p $target/etc/xdg/menus
+
+# d-e-c/cf.workarounds expects /etc/xdg/xfce4/panel/ to exist (FIXME: file d-e-c bug)
+mkdir -p $target/etc/xdg/xfce4/panel/
+
 # Do the conversion of the vanilla Debian system to a Debian Edu system
-chroot $target strace -f /usr/sbin/cf-agent -I -D installation
+chroot $target /usr/sbin/cf-agent -I -D installation
+
+# fetch LDAP certs
+chroot $target /etc/init.d/fetch-ldap-cert start
 
-set +x
+sed -i $target/etc/wgetrc \
+    -e "s@^http_proxy\s*=.*@http_proxy = $http_proxy@" \
+    -e "s@^https_proxy\s*=.*@https_proxy = $https_proxy@" \
+    -e "s@^ftp_proxy\s*=.*@ftp_proxy = $ftp_proxy@" \
+    ${NULL}
diff --git a/fai/config/scripts/EDU/98-drop-fai-aptproxy b/fai/config/scripts/EDU/98-drop-fai-aptproxy
new file mode 100755
index 0000000..b7b5c77
--- /dev/null
+++ b/fai/config/scripts/EDU/98-drop-fai-aptproxy
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# drop the APT http proxy configuration put
+# here by FAI. We will use Debian Edu APT
+# http proxy configuration...
+rm $target/etc/apt/apt.conf.d/02proxy
diff --git a/fai/config/scripts/EDU/99-proxy-from-wpad b/fai/config/scripts/EDU/99-proxy-from-wpad
new file mode 100755
index 0000000..258ca2b
--- /dev/null
+++ b/fai/config/scripts/EDU/99-proxy-from-wpad
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Let's make really sure that we have correct http proxy settings.
+if [ -x $target/usr/share/debian-edu-config/tools/update-proxy-from-wpad ]; then
+	chroot $target /usr/share/debian-edu-config/tools/update-proxy-from-wpad
+fi