From e955da790f318b075fd4933a8e1297ace5442511 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Mon, 6 Sep 2010 14:00:30 +0200
Subject: added console-setup preseed and build.conf for chroot

---
 auto/build                                      | 4 ++++
 config/chroot_local-hooks/05-ndis               | 6 ++++++
 config/chroot_local-hooks/ZZ_cleanup_build.conf | 3 +++
 config/chroot_local-preseed/console-setup.cfg   | 5 +++++
 4 files changed, 18 insertions(+)
 create mode 100755 config/chroot_local-hooks/ZZ_cleanup_build.conf
 create mode 100644 config/chroot_local-preseed/console-setup.cfg

diff --git a/auto/build b/auto/build
index ced2c4a..24f4a84 100755
--- a/auto/build
+++ b/auto/build
@@ -25,6 +25,10 @@ prebuild()
 			cp "cache/$(basename "$URL")" "config/chroot_local-includes/usr/src/$(basename "$URL")"
 		fi
 	fi
+
+	# make current build configuration available for hooks inside chroot
+	mkdir -p chroot/root
+	cat config/* 2>/dev/null | grep ^LH_ > chroot/root/build.conf
 }
 
 if [ "$LH_KANOTIX_TMPFS" = "true" ]; then
diff --git a/config/chroot_local-hooks/05-ndis b/config/chroot_local-hooks/05-ndis
index 306c6d5..c6bebff 100755
--- a/config/chroot_local-hooks/05-ndis
+++ b/config/chroot_local-hooks/05-ndis
@@ -1,3 +1,9 @@
 #!/bin/sh
+[ -f /root/build.conf ] && . /root/build.conf
+if [ "$LH_ARCHITECTURE" = "amd64" ]; then
 wget -qO- http://kanotix.com/files/fix/ndiswrapper/ndiswrapper64-fwlan64.tar.gz|tar zxC /etc
+else
+wget -qO- http://kanotix.com/files/fix/ndiswrapper/ndiswrapper-fwlan.tar.gz|tar zxC /etc
+#wget -qO- http://kanotix.com/files/fix/ndiswrapper/ndiswrapper-netmw225.tar.gz|tar zxC /etc
+fi
 ndiswrapper -ma
diff --git a/config/chroot_local-hooks/ZZ_cleanup_build.conf b/config/chroot_local-hooks/ZZ_cleanup_build.conf
new file mode 100755
index 0000000..80e90ab
--- /dev/null
+++ b/config/chroot_local-hooks/ZZ_cleanup_build.conf
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -f /root/build.conf
+
diff --git a/config/chroot_local-preseed/console-setup.cfg b/config/chroot_local-preseed/console-setup.cfg
new file mode 100644
index 0000000..bbbb2ab
--- /dev/null
+++ b/config/chroot_local-preseed/console-setup.cfg
@@ -0,0 +1,5 @@
+console-setup   console-setup/fontface47        select  Fixed
+console-setup   console-setup/fontsize-text47   select  16
+console-setup   console-setup/charmap47 select  UTF-8
+console-setup   console-setup/codesetcode       string  Lat15
+console-setup   console-setup/fontsize-fb47     select  16
-- 
cgit v1.0