Update kernel config for nfs 3/4 support

Finalized core 4
Added language function to pakfire functions

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1138 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index 35f674c37d328bf35349553e1aaf88014e5c664a..1ff3ce0ebdfb82146c836ce978f75fad9b2d039a 100644 (file)
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -2097,7 +2097,9 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y

diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index 4bc7b8a4de7fb7399b0ac51c6e4b7a9bad9609ba..5d92f437eddc6e1972c1d74a9e5b981813654d19 100644 (file)
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.54-ipfire
-# Thu Oct 25 20:03:33 2007
+# Linux kernel version: 2.6.16.57-ipfire-smp
+# Sun Dec 30 22:30:36 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -2100,7 +2100,9 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y

diff --git a/config/rootfiles/core/4/files b/config/rootfiles/core/4/files
index 47703c959892613a6eaeaa82cc00519af4aaec46..586d315b46af95a1eb5a82f6ce73f0685c02ac92 100644 (file)
--- a/config/rootfiles/core/4/files
+++ b/config/rootfiles/core/4/files
@@ -1,4 +1,4 @@
-etc/inid.d/firewall
+etc/init.d/firewall
 usr/local/bin/makegraphs
 var/ipfire/langs
 var/ipfire/optionsfw/settings
@@ -10,3 +10,5 @@ srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+usr/local/bin/qosctrl
+opt/pakfire/lib/functions.sh

diff --git a/config/rootfiles/core/4/update.sh b/config/rootfiles/core/4/update.sh
index 649eb261bfbf024f6496c95d219cc18f5d74e730..19c61575d46b92b4be06a7d3fb8ff025e708ee7a 100644 (file)
--- a/config/rootfiles/core/4/update.sh
+++ b/config/rootfiles/core/4/update.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 extract_files
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 21aaee22a4ffee963f854f16634c53cb756a09c8..3a4191ea89993a77a363f0394e139b21ab83916c 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -93,3 +93,10 @@ stop_service() {
                /etc/init.d/${1} stop
        fi
 }
+
+rebuild_langcache() {
+       echo "Rebuilding language cache..."
+       perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+       echo "...Finished."
+}
+