From a86255ef536362f8584ffe9cd1f34ffb1ddb8875 Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 4 Jan 2008 15:13:53 +0000 Subject: [PATCH] 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 --- config/kernel/kernel.config.i586 | 4 +++- config/kernel/kernel.config.i586.smp | 8 +++++--- config/rootfiles/core/4/files | 4 +++- config/rootfiles/core/4/update.sh | 2 +- src/pakfire/lib/functions.sh | 7 +++++++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 35f674c37d..1ff3ce0ebd 100644 --- 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 4bc7b8a4de..5d92f437ed 100644 --- 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 47703c9598..586d315b46 100644 --- 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 649eb261bf..19c61575d4 100644 --- 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 21aaee22a4..3a4191ea89 100644 --- 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." +} + -- 2.39.2