From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 11 Sep 2008 12:50:27 +0000 (+0200)
Subject: Commented tftpboot at rootfile
X-Git-Tag: v2.3-beta4~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c2b766cf1abc07346f365204cfbbf8a610d47b1;p=ipfire-2.x.git

Commented tftpboot at rootfile
---

diff --git a/config/rootfiles/packages/tftp-hpa b/config/rootfiles/packages/tftp-hpa
index 98e78d800d..5df1809084 100644
--- a/config/rootfiles/packages/tftp-hpa
+++ b/config/rootfiles/packages/tftp-hpa
@@ -3,4 +3,4 @@ etc/init.d/tftpd
 #usr/man/man8/in.tftpd.8
 #usr/man/man8/tftpd.8
 usr/sbin/tftpd
-var/tftpboot
+#var/tftpboot
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 5ae3c76601..742605123a 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -35,6 +35,7 @@
 * alsa-lib-1.0.17
 * alsa-lib-1.0.17-kmod
 * amavisd-new-2.5.2
+* apcupsd-3.14.4
 * applejuice-0.30
 * arping-2.05
 * arptables-v0.0.3-3
diff --git a/lfs/linux b/lfs/linux
index 34e0e11e3e..c92959ae6c 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -100,6 +100,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Add devolo MicroLink ADSL Fun USB ID's to ueagle-atm
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.23-ueagle-atm-devolo_usb_id.patch
 
+	# Fix crash on Twinhead H12Y notebooks
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
+
 	# Openswan
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch