Disabled ipac-ng (No replacement yet, traffic counter not working)

Enabled MosChip7830 and some AGP/Direct Render Modules

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index 389522bcd5cb3424e5b84f22aaefe1107b18fb02..c083e0be3bb4a02ff0e8fce25c6c57277103f9d6 100644 (file)
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.21
-# Tue May 20 18:00:30 2008
+# Linux kernel version: 2.6.20.21-ipfire
+# Wed May 21 16:08:19 2008
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -332,6 +332,7 @@ CONFIG_MCA_LEGACY=y
 # CONFIG_MCA_PROC_FS is not set
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m
+CONFIG_K8_NB=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -1325,7 +1326,7 @@ CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
 CONFIG_AMD8111E_NAPI=y
 CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
+# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
 CONFIG_B44=m
@@ -1776,17 +1777,27 @@ CONFIG_RTC=y
 # CONFIG_APPLICOM is not set
 # CONFIG_SONYPI is not set
 CONFIG_AGP=m
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_ATI is not set
-# CONFIG_AGP_AMD is not set
-# CONFIG_AGP_AMD64 is not set
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
 CONFIG_AGP_INTEL=m
-# CONFIG_AGP_NVIDIA is not set
-# CONFIG_AGP_SIS is not set
-# CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
-# CONFIG_AGP_EFFICEON is not set
-# CONFIG_DRM is not set
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 
 #
 # PCMCIA character devices
@@ -2346,7 +2357,7 @@ CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_KARMA is not set
+CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2395,7 +2406,7 @@ CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
-# CONFIG_USB_NET_MCS7830 is not set
+CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_ALI_M5632=y

diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index 0ae0cd971c9615973cef29ec74835a75fe3923ed..752ee4c1e4352abfb3933428f47cc9954be62289 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.20.21
-# Tue May 20 18:05:28 2008
+# Linux kernel version: 2.6.20.21-ipfire
+# Wed May 21 16:08:48 2008
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -334,6 +334,7 @@ CONFIG_MCA_LEGACY=y
 # CONFIG_MCA_PROC_FS is not set
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m
+CONFIG_K8_NB=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -1324,7 +1325,7 @@ CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
 CONFIG_AMD8111E_NAPI=y
 CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
+# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
 CONFIG_B44=m
@@ -1775,17 +1776,27 @@ CONFIG_RTC=y
 # CONFIG_APPLICOM is not set
 # CONFIG_SONYPI is not set
 CONFIG_AGP=m
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_ATI is not set
-# CONFIG_AGP_AMD is not set
-# CONFIG_AGP_AMD64 is not set
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
 CONFIG_AGP_INTEL=m
-# CONFIG_AGP_NVIDIA is not set
-# CONFIG_AGP_SIS is not set
-# CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
-# CONFIG_AGP_EFFICEON is not set
-# CONFIG_DRM is not set
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 
 #
 # PCMCIA character devices
@@ -2344,7 +2355,7 @@ CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_KARMA is not set
+CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2393,7 +2404,7 @@ CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
-# CONFIG_USB_NET_MCS7830 is not set
+CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_ALI_M5632=y

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index a6775027eddd5e8c4e8c3db96f03734cbb89afb1..a4f190d529c67b6cb19e2236a895feeebd384c32 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -31,11 +31,11 @@ init_networking() {
        boot_mesg "Setting up firewall"
        /etc/rc.d/init.d/firewall start; evaluate_retval
 
-       boot_mesg "Setting up traffic accounting"
-       /etc/rc.d/helper/writeipac.pl || failed=1
-       /usr/sbin/fetchipac -S || failed=1
-       (exit ${failed})
-       evaluate_retval
+#      boot_mesg "Setting up traffic accounting"
+#      /etc/rc.d/helper/writeipac.pl || failed=1
+#      /usr/sbin/fetchipac -S || failed=1
+#      (exit ${failed})
+#      evaluate_retval
 
        boot_mesg "Setting up DMZ pinholes"
        /usr/local/bin/setdmzholes; evaluate_retval

diff --git a/src/initscripts/init.d/networking/red.up/40-ipac b/src/initscripts/init.d/networking/red.up/40-ipac
index 994dc50a279c0ac7d316c38303b032598e06d1e1..301bc3508e565494284d88b5662aa3e12090cb27 100644 (file)
--- a/src/initscripts/init.d/networking/red.up/40-ipac
+++ b/src/initscripts/init.d/networking/red.up/40-ipac
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-/etc/rc.d/helper/writeipac.pl
-/usr/sbin/fetchipac -S
+#/etc/rc.d/helper/writeipac.pl
+#/usr/sbin/fetchipac -S
 
 exit 0

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index e2df1270446e43a2557edc75c5c1246d2363a663..50a1a512c5c675bdfc3de2a4aa81547e48a50036 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -99,7 +99,7 @@ sub updatehdddata
 }
 
 ## Update ipac logs
-system ('/usr/sbin/fetchipac');
+#system ('/usr/sbin/fetchipac');
 
 my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
 system("unlink /tmp/hddstatus && touch /tmp/hddstatus");