webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kernel Update

Browse Source 
Netstatusseite mit ip-Befehlen gemacht


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@434 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-03-01 16:44:47 +00:00
parent 44254afd44
commit 376e42ce69
45 changed files with 61292 additions and 4557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/install/profile
View File

@@ -4,4 +4,4 @@ TERM=linux
LANG=en_US.UTF-8
export TERM LANG
/bin/unicode_start lat0-16
#/bin/unicode_start lat0-16

3
config/install/rc
View File

@@ -37,3 +37,6 @@ syslogd -O /dev/tty4
echo "Starting udev"
/sbin/udevstart
echo "Loading installer... Please wait!
/bin/sleep 5

341
config/kernel/kernel.config.i586
View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16
# Sat Feb 24 18:21:11 2007
# Linux kernel version: 2.6.16.42
# Tue Feb 27 18:11:07 2007
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
@@ -149,7 +149,7 @@ CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set
CONFIG_X86_CPUID=y
#
# Firmware Drivers
@@ -157,15 +157,14 @@ CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_EDD is not set
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
CONFIG_VMSPLIT_3G=y
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -177,7 +176,6 @@ CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_HIGHPTE is not set
CONFIG_MATH_EMULATION=y
# CONFIG_MTRR is not set
# CONFIG_EFI is not set
@@ -188,10 +186,8 @@ CONFIG_HZ_100=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=100
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
CONFIG_DOUBLEFAULT=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
# Power management options (ACPI, APM)
@@ -243,7 +239,44 @@ CONFIG_APM_RTC_IS_GMT=y
#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
# CPUFreq processor drivers
#
CONFIG_X86_ACPI_CPUFREQ=m
CONFIG_X86_POWERNOW_K6=m
CONFIG_X86_POWERNOW_K7=m
CONFIG_X86_POWERNOW_K7_ACPI=y
CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_POWERNOW_K8_ACPI=y
CONFIG_X86_GX_SUSPMOD=m
CONFIG_X86_SPEEDSTEP_CENTRINO=m
# CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI is not set
CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
CONFIG_X86_SPEEDSTEP_ICH=m
CONFIG_X86_SPEEDSTEP_SMI=m
CONFIG_X86_P4_CLOCKMOD=m
CONFIG_X86_CPUFREQ_NFORCE2=m
CONFIG_X86_LONGRUN=m
#
# shared options
#
# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
CONFIG_X86_SPEEDSTEP_LIB=m
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -342,9 +375,8 @@ CONFIG_NET_IPGRE_BROADCAST=y
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
# CONFIG_ARPD is not set
CONFIG_ARPD=y
CONFIG_SYN_COOKIES=y
CONFIG_IPSEC_NAT_TRAVERSAL=y
CONFIG_INET_AH=y
CONFIG_INET_ESP=y
CONFIG_INET_IPCOMP=y
@@ -425,17 +457,17 @@ CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_LAYER7=m
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
CONFIG_IP_NF_MATCH_MULTIPORT=m
# CONFIG_IP_NF_MATCH_MULTIPORT is not set
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_AH_ESP=m
# CONFIG_IP_NF_MATCH_DSCP is not set
# CONFIG_IP_NF_MATCH_AH_ESP is not set
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
CONFIG_IP_NF_MATCH_POLICY=m
# CONFIG_IP_NF_MATCH_POLICY is not set
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
@@ -456,7 +488,7 @@ CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_DSCP=m
# CONFIG_IP_NF_TARGET_DSCP is not set
CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_RAW=m
@@ -497,7 +529,6 @@ CONFIG_ATM_BR2684=m
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
# CONFIG_DECNET is not set
CONFIG_LLC=y
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
@@ -505,7 +536,7 @@ CONFIG_LLC=y
# CONFIG_LAPB is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=y
# CONFIG_WAN_ROUTER is not set
#
# QoS and/or fair queueing
@@ -529,7 +560,7 @@ CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_DSMARK=m
# CONFIG_NET_SCH_NETEM is not set
CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_INGRESS=m
#
@@ -545,7 +576,7 @@ CONFIG_NET_CLS_U32=m
# CONFIG_CLS_U32_PERF is not set
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_RSVP6=y
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -555,7 +586,7 @@ CONFIG_NET_EMATCH_META=m
CONFIG_NET_EMATCH_TEXT=m
# CONFIG_NET_CLS_ACT is not set
CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_CLS_IND is not set
CONFIG_NET_CLS_IND=y
CONFIG_NET_ESTIMATOR=y
#
@@ -579,10 +610,11 @@ CONFIG_KLIPS_ESP=y
CONFIG_KLIPS_AH=y
CONFIG_KLIPS_AUTH_HMAC_MD5=y
CONFIG_KLIPS_AUTH_HMAC_SHA1=y
# CONFIG_KLIPS_ENC_CRYPTOAPI is not set
CONFIG_KLIPS_ENC_CRYPTOAPI=y
CONFIG_KLIPS_ENC_1DES=y
CONFIG_KLIPS_ENC_3DES=y
CONFIG_KLIPS_ENC_AES=y
# CONFIG_KLIPS_ENC_NULL is not set
CONFIG_KLIPS_ENC_NULL=y
CONFIG_KLIPS_IPCOMP=y
CONFIG_KLIPS_DEBUG=y
@@ -611,7 +643,14 @@ CONFIG_CONNECTOR=m
#
# Parallel port support
#
# CONFIG_PARPORT is not set
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
# CONFIG_PARPORT_SERIAL is not set
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_1284 is not set
#
# Plug and Play support
@@ -624,7 +663,7 @@ CONFIG_PNP=y
#
CONFIG_ISAPNP=y
CONFIG_PNPBIOS=y
# CONFIG_PNPBIOS_PROC_FS is not set
CONFIG_PNPBIOS_PROC_FS=y
CONFIG_PNPACPI=y
#
@@ -632,6 +671,7 @@ CONFIG_PNPACPI=y
#
CONFIG_BLK_DEV_FD=y
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
# CONFIG_CISS_SCSI_TAPE is not set
@@ -663,7 +703,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=y
@@ -794,29 +834,16 @@ CONFIG_AIC79XX_ENABLE_RD_STRM=y
CONFIG_AIC79XX_DEBUG_MASK=0
# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
CONFIG_SCSI_DPT_I2O=m
# CONFIG_SCSI_ADVANSYS is not set
CONFIG_SCSI_IN2000=m
# CONFIG_SCSI_ARCMSR is not set
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
# CONFIG_MEGARAID_LEGACY is not set
CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_SATA=m
CONFIG_SCSI_SATA_AHCI=m
CONFIG_SCSI_SATA_SVW=m
CONFIG_SCSI_ATA_PIIX=m
CONFIG_SCSI_SATA_MV=m
CONFIG_SCSI_SATA_NV=m
# CONFIG_SCSI_PDC_ADMA is not set
CONFIG_SCSI_SATA_QSTOR=m
CONFIG_SCSI_SATA_PROMISE=m
CONFIG_SCSI_SATA_SX4=m
CONFIG_SCSI_SATA_SIL=m
# CONFIG_SCSI_SATA_SIL24 is not set
CONFIG_SCSI_SATA_SIS=m
CONFIG_SCSI_SATA_ULI=m
CONFIG_SCSI_SATA_VIA=m
CONFIG_SCSI_SATA_VITESSE=m
CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_HPTIOP is not set
CONFIG_SCSI_BUSLOGIC=m
# CONFIG_SCSI_OMIT_FLASHPOINT is not set
CONFIG_SCSI_DMX3191D=m
@@ -837,6 +864,8 @@ CONFIG_SCSI_IBMMCA=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
CONFIG_SCSI_NCR53C406A=m
CONFIG_SCSI_NCR_D700=m
CONFIG_SCSI_SYM53C8XX_2=m
@@ -844,9 +873,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
CONFIG_SCSI_IPR=m
# CONFIG_SCSI_IPR_TRACE is not set
# CONFIG_SCSI_IPR_DUMP is not set
# CONFIG_SCSI_IPR is not set
CONFIG_SCSI_NCR_Q720=m
CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
@@ -856,8 +883,7 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20
CONFIG_SCSI_PAS16=m
CONFIG_SCSI_PSI240I=m
CONFIG_SCSI_QLOGIC_FAS=m
CONFIG_SCSI_QLOGIC_FC=m
# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
# CONFIG_SCSI_QLOGIC_FC is not set
CONFIG_SCSI_QLOGIC_1280=m
# CONFIG_SCSI_QLA_FC is not set
CONFIG_SCSI_LPFC=m
@@ -878,26 +904,16 @@ CONFIG_SCSI_NSP32=m
#
# PCMCIA SCSI adapter support
#
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
CONFIG_PCMCIA_NINJA_SCSI=m
CONFIG_PCMCIA_QLOGIC=m
CONFIG_PCMCIA_SYM53C500=m
# CONFIG_PCMCIA_AHA152X is not set
# CONFIG_PCMCIA_FDOMAIN is not set
# CONFIG_PCMCIA_NINJA_SCSI is not set
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
CONFIG_CD_NO_IDESCSI=y
CONFIG_AZTCD=m
CONFIG_GSCD=m
# CONFIG_SBPCD is not set
CONFIG_MCDX=m
CONFIG_OPTCD=m
# CONFIG_CM206 is not set
CONFIG_SJCD=m
CONFIG_ISP16_CDI=m
# CONFIG_CDU31A is not set
CONFIG_CDU535=m
# CONFIG_CD_NO_IDESCSI is not set
#
# Multi-device support (RAID and LVM)
@@ -908,7 +924,7 @@ CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
# CONFIG_MD_RAID10 is not set
CONFIG_MD_RAID5=m
# CONFIG_MD_RAID5 is not set
# CONFIG_MD_RAID6 is not set
CONFIG_MD_MULTIPATH=m
# CONFIG_MD_FAULTY is not set
@@ -917,46 +933,15 @@ CONFIG_MD_MULTIPATH=m
#
# Fusion MPT device support
#
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
CONFIG_FUSION_SAS=m
CONFIG_FUSION_MAX_SGE=128
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set
#
# IEEE 1394 (FireWire) support
#
CONFIG_IEEE1394=m
#
# Subsystem Options
#
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_IEEE1394_OUI_DB is not set
CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
# CONFIG_IEEE1394_EXPORT_FULL_API is not set
#
# Device Drivers
#
#
# Texas Instruments PCILynx requires I2C
#
CONFIG_IEEE1394_OHCI1394=m
#
# Protocol Drivers
#
# CONFIG_IEEE1394_VIDEO1394 is not set
CONFIG_IEEE1394_SBP2=m
CONFIG_IEEE1394_SBP2_PHYS_DMA=y
CONFIG_IEEE1394_ETH1394=m
# CONFIG_IEEE1394_DV1394 is not set
# CONFIG_IEEE1394_RAWIO is not set
# CONFIG_IEEE1394 is not set
#
# I2O device support
@@ -1094,6 +1079,7 @@ CONFIG_SUNDANCE_MMIO=y
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y
# CONFIG_NET_POCKET is not set
#
# Ethernet (1000 Mbit)
@@ -1112,7 +1098,7 @@ CONFIG_R8169=m
CONFIG_R8169_VLAN=y
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SKY2 is not set
CONFIG_SKY2=m
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
@@ -1130,18 +1116,7 @@ CONFIG_S2IO=m
#
# Token Ring devices
#
CONFIG_TR=y
CONFIG_IBMTR=m
CONFIG_IBMOL=m
CONFIG_IBMLS=m
CONFIG_3C359=m
CONFIG_TMS380TR=m
CONFIG_TMSPCI=m
CONFIG_SKISA=m
CONFIG_PROTEON=m
CONFIG_ABYSS=m
CONFIG_MADGEMC=m
CONFIG_SMCTR=m
# CONFIG_TR is not set
#
# Wireless LAN (non-hamradio)
@@ -1203,54 +1178,12 @@ CONFIG_NET_WIRELESS=y
#
# PCMCIA network device support
#
CONFIG_NET_PCMCIA=y
CONFIG_PCMCIA_3C589=m
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_FMVJ18X=m
CONFIG_PCMCIA_PCNET=m
CONFIG_PCMCIA_NMCLAN=m
CONFIG_PCMCIA_SMC91C92=m
CONFIG_PCMCIA_XIRC2PS=m
CONFIG_PCMCIA_AXNET=m
# CONFIG_PCMCIA_IBMTR is not set
# CONFIG_NET_PCMCIA is not set
#
# Wan interfaces
#
CONFIG_WAN=y
CONFIG_HOSTESS_SV11=m
CONFIG_COSA=m
CONFIG_DSCC4=m
CONFIG_DSCC4_PCISYNC=y
CONFIG_DSCC4_PCI_RST=y
CONFIG_LANMEDIA=m
CONFIG_SEALEVEL_4021=m
CONFIG_SYNCLINK_SYNCPPP=m
CONFIG_HDLC=m
CONFIG_HDLC_RAW=y
CONFIG_HDLC_RAW_ETH=y
CONFIG_HDLC_CISCO=y
CONFIG_HDLC_FR=y
CONFIG_HDLC_PPP=y
#
# X.25/LAPB support is disabled
#
CONFIG_PCI200SYN=m
CONFIG_WANXL=m
# CONFIG_WANXL_BUILD_FIRMWARE is not set
CONFIG_PC300=m
CONFIG_PC300_MLPPP=y
CONFIG_N2=m
CONFIG_C101=m
CONFIG_FARSYNC=m
CONFIG_DLCI=m
CONFIG_DLCI_COUNT=24
CONFIG_DLCI_MAX=8
CONFIG_SDLA=m
# CONFIG_WAN_ROUTER_DRIVERS is not set
CONFIG_SBNI=m
CONFIG_SBNI_MULTILINE=y
# CONFIG_WAN is not set
#
# ATM drivers
@@ -1296,6 +1229,7 @@ CONFIG_ATM_HE=m
CONFIG_ATM_HE_USE_SUNI=y
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
@@ -1303,15 +1237,15 @@ CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
CONFIG_PPPOATM=m
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
CONFIG_SLIP_MODE_SLIP6=y
CONFIG_NET_FC=y
CONFIG_SHAPER=m
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -1411,7 +1345,7 @@ CONFIG_KEYBOARD_NEWTON=y
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_PCSPKR is not set
CONFIG_INPUT_PCSPKR=y
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_INPUT_UINPUT is not set
@@ -1422,6 +1356,7 @@ CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
@@ -1433,28 +1368,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_NONSTANDARD=y
# CONFIG_COMPUTONE is not set
CONFIG_ROCKETPORT=m
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
CONFIG_DIGIEPCA=m
# CONFIG_ESPSERIAL is not set
# CONFIG_MOXA_INTELLIO is not set
CONFIG_MOXA_SMARTIO=m
# CONFIG_ISI is not set
CONFIG_SYNCLINK=m
CONFIG_SYNCLINKMP=m
# CONFIG_SYNCLINK_GT is not set
CONFIG_N_HDLC=m
# CONFIG_RISCOM8 is not set
CONFIG_SPECIALIX=m
# CONFIG_SPECIALIX_RTSCTS is not set
CONFIG_SX=m
# CONFIG_RIO is not set
CONFIG_STALDRV=y
# CONFIG_STALLION is not set
# CONFIG_ISTALLION is not set
# CONFIG_SERIAL_NONSTANDARD is not set
#
# Serial drivers
@@ -1469,19 +1383,23 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_8250_RSA=y
CONFIG_SERIAL_8250_FOURPORT=m
CONFIG_SERIAL_8250_ACCENT=m
CONFIG_SERIAL_8250_BOCA=m
CONFIG_SERIAL_8250_HUB6=m
CONFIG_SERIAL_8250_MCA=m
# CONFIG_SERIAL_8250_FOURPORT is not set
# CONFIG_SERIAL_8250_ACCENT is not set
# CONFIG_SERIAL_8250_BOCA is not set
# CONFIG_SERIAL_8250_HUB6 is not set
# CONFIG_SERIAL_8250_MCA is not set
#
# Non-8250 serial port support
#
CONFIG_SERIAL_CORE=m
CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
# CONFIG_TIPAR is not set
#
# IPMI
@@ -1552,10 +1470,11 @@ CONFIG_HPET_MMAP=y
#
# Hardware Monitoring support
#
CONFIG_HWMON=m
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
CONFIG_SENSORS_K8TEMP=y
# CONFIG_SENSORS_F71805F is not set
CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HDAPS is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1684,7 +1603,7 @@ CONFIG_USB_SL811_CS=m
# USB Device Class drivers
#
CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
CONFIG_USB_PRINTER=m
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1777,6 +1696,7 @@ CONFIG_USB_ZD1201=m
#
# USB port drivers
#
# CONFIG_USB_USS720 is not set
#
# USB Serial Converter support
@@ -1847,7 +1767,7 @@ CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=y
# CONFIG_REISER4_DEBUG is not set
CONFIG_REISERFS_FS=y
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
CONFIG_REISERFS_FS_XATTR=y
@@ -1857,14 +1777,14 @@ CONFIG_REISERFS_FS_SECURITY=y
CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_OCFS2_FS is not set
CONFIG_MINIX_FS=y
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_FUSE_FS is not set
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
#
# CD-ROM/DVD Filesystems
@@ -1872,7 +1792,8 @@ CONFIG_DNOTIFY=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
# CONFIG_UDF_FS is not set
CONFIG_UDF_FS=y
CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
@@ -1922,17 +1843,20 @@ CONFIG_SQUASHFS_VMALLOC=y
# Network File Systems
#
CONFIG_NFS_FS=m
# CONFIG_NFS_V3 is not set
# CONFIG_NFS_V4 is not set
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
# CONFIG_NFSD_V3 is not set
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
@@ -2003,7 +1927,7 @@ CONFIG_NLS_DEFAULT="cp437"
# CONFIG_PRINTK_TIME is not set
# CONFIG_MAGIC_SYSRQ is not set
CONFIG_DEBUG_KERNEL=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_LOG_BUF_SHIFT=17
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
@@ -2011,12 +1935,11 @@ CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_FRAME_POINTER is not set
CONFIG_FRAME_POINTER=y
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_EARLY_PRINTK=y
@@ -2024,7 +1947,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_DEBUG_RODATA is not set
CONFIG_4KSTACKS=y
# CONFIG_4KSTACKS is not set
#
# Security options
@@ -2046,11 +1969,11 @@ CONFIG_CRYPTO_SHA256=y
# CONFIG_CRYPTO_WP512 is not set
# CONFIG_CRYPTO_TGR192 is not set
CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_BLOWFISH is not set
CONFIG_CRYPTO_BLOWFISH=m
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
CONFIG_CRYPTO_AES=m
# CONFIG_CRYPTO_AES_586 is not set
CONFIG_CRYPTO_AES_586=m
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not set
# CONFIG_CRYPTO_TEA is not set

334
config/kernel/kernel.config.i586.smp
View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16
# Sat Feb 24 18:21:44 2007
# Linux kernel version: 2.6.16.42
# Tue Feb 27 18:10:45 2007
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
@@ -156,7 +156,7 @@ CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set
CONFIG_X86_CPUID=y
#
# Firmware Drivers
@@ -164,15 +164,14 @@ CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_EDD is not set
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
CONFIG_VMSPLIT_3G=y
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -184,7 +183,6 @@ CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_HIGHPTE is not set
CONFIG_MATH_EMULATION=y
# CONFIG_MTRR is not set
# CONFIG_EFI is not set
@@ -196,11 +194,9 @@ CONFIG_HZ_100=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=100
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
# CONFIG_HOTPLUG_CPU is not set
CONFIG_DOUBLEFAULT=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
# Power management options (ACPI, APM)
@@ -248,7 +244,44 @@ CONFIG_APM_RTC_IS_GMT=y
#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
# CPUFreq processor drivers
#
CONFIG_X86_ACPI_CPUFREQ=m
CONFIG_X86_POWERNOW_K6=m
CONFIG_X86_POWERNOW_K7=m
CONFIG_X86_POWERNOW_K7_ACPI=y
CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_POWERNOW_K8_ACPI=y
CONFIG_X86_GX_SUSPMOD=m
CONFIG_X86_SPEEDSTEP_CENTRINO=m
# CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI is not set
CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
CONFIG_X86_SPEEDSTEP_ICH=m
CONFIG_X86_SPEEDSTEP_SMI=m
CONFIG_X86_P4_CLOCKMOD=m
CONFIG_X86_CPUFREQ_NFORCE2=m
CONFIG_X86_LONGRUN=m
#
# shared options
#
# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
CONFIG_X86_SPEEDSTEP_LIB=m
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -348,9 +381,8 @@ CONFIG_NET_IPGRE_BROADCAST=y
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
# CONFIG_ARPD is not set
CONFIG_ARPD=y
CONFIG_SYN_COOKIES=y
CONFIG_IPSEC_NAT_TRAVERSAL=y
CONFIG_INET_AH=y
CONFIG_INET_ESP=y
CONFIG_INET_IPCOMP=y
@@ -431,17 +463,17 @@ CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_LAYER7=m
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
CONFIG_IP_NF_MATCH_MULTIPORT=m
# CONFIG_IP_NF_MATCH_MULTIPORT is not set
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_AH_ESP=m
# CONFIG_IP_NF_MATCH_DSCP is not set
# CONFIG_IP_NF_MATCH_AH_ESP is not set
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
CONFIG_IP_NF_MATCH_POLICY=m
# CONFIG_IP_NF_MATCH_POLICY is not set
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
@@ -462,7 +494,7 @@ CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_DSCP=m
# CONFIG_IP_NF_TARGET_DSCP is not set
CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_RAW=m
@@ -503,7 +535,6 @@ CONFIG_ATM_BR2684=m
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
# CONFIG_DECNET is not set
CONFIG_LLC=y
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
@@ -511,7 +542,7 @@ CONFIG_LLC=y
# CONFIG_LAPB is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=y
# CONFIG_WAN_ROUTER is not set
#
# QoS and/or fair queueing
@@ -535,7 +566,7 @@ CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_DSMARK=m
# CONFIG_NET_SCH_NETEM is not set
CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_INGRESS=m
#
@@ -551,7 +582,7 @@ CONFIG_NET_CLS_U32=m
# CONFIG_CLS_U32_PERF is not set
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_RSVP6=y
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -561,7 +592,7 @@ CONFIG_NET_EMATCH_META=m
CONFIG_NET_EMATCH_TEXT=m
# CONFIG_NET_CLS_ACT is not set
CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_CLS_IND is not set
CONFIG_NET_CLS_IND=y
CONFIG_NET_ESTIMATOR=y
#
@@ -585,10 +616,11 @@ CONFIG_KLIPS_ESP=y
CONFIG_KLIPS_AH=y
CONFIG_KLIPS_AUTH_HMAC_MD5=y
CONFIG_KLIPS_AUTH_HMAC_SHA1=y
# CONFIG_KLIPS_ENC_CRYPTOAPI is not set
CONFIG_KLIPS_ENC_CRYPTOAPI=y
CONFIG_KLIPS_ENC_1DES=y
CONFIG_KLIPS_ENC_3DES=y
CONFIG_KLIPS_ENC_AES=y
# CONFIG_KLIPS_ENC_NULL is not set
CONFIG_KLIPS_ENC_NULL=y
CONFIG_KLIPS_IPCOMP=y
CONFIG_KLIPS_DEBUG=y
@@ -617,7 +649,14 @@ CONFIG_CONNECTOR=m
#
# Parallel port support
#
# CONFIG_PARPORT is not set
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
# CONFIG_PARPORT_SERIAL is not set
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_1284 is not set
#
# Plug and Play support
@@ -630,7 +669,7 @@ CONFIG_PNP=y
#
CONFIG_ISAPNP=y
CONFIG_PNPBIOS=y
# CONFIG_PNPBIOS_PROC_FS is not set
CONFIG_PNPBIOS_PROC_FS=y
CONFIG_PNPACPI=y
#
@@ -638,6 +677,7 @@ CONFIG_PNPACPI=y
#
CONFIG_BLK_DEV_FD=y
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
# CONFIG_CISS_SCSI_TAPE is not set
@@ -669,7 +709,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=y
@@ -800,29 +840,16 @@ CONFIG_AIC79XX_ENABLE_RD_STRM=y
CONFIG_AIC79XX_DEBUG_MASK=0
# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
CONFIG_SCSI_DPT_I2O=m
# CONFIG_SCSI_ADVANSYS is not set
CONFIG_SCSI_IN2000=m
# CONFIG_SCSI_ARCMSR is not set
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
# CONFIG_MEGARAID_LEGACY is not set
CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_SATA=m
CONFIG_SCSI_SATA_AHCI=m
CONFIG_SCSI_SATA_SVW=m
CONFIG_SCSI_ATA_PIIX=m
CONFIG_SCSI_SATA_MV=m
CONFIG_SCSI_SATA_NV=m
# CONFIG_SCSI_PDC_ADMA is not set
CONFIG_SCSI_SATA_QSTOR=m
CONFIG_SCSI_SATA_PROMISE=m
CONFIG_SCSI_SATA_SX4=m
CONFIG_SCSI_SATA_SIL=m
# CONFIG_SCSI_SATA_SIL24 is not set
CONFIG_SCSI_SATA_SIS=m
CONFIG_SCSI_SATA_ULI=m
CONFIG_SCSI_SATA_VIA=m
CONFIG_SCSI_SATA_VITESSE=m
CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_HPTIOP is not set
CONFIG_SCSI_BUSLOGIC=m
# CONFIG_SCSI_OMIT_FLASHPOINT is not set
CONFIG_SCSI_DMX3191D=m
@@ -843,6 +870,8 @@ CONFIG_SCSI_IBMMCA=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
CONFIG_SCSI_NCR53C406A=m
CONFIG_SCSI_NCR_D700=m
CONFIG_SCSI_SYM53C8XX_2=m
@@ -850,9 +879,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
CONFIG_SCSI_IPR=m
# CONFIG_SCSI_IPR_TRACE is not set
# CONFIG_SCSI_IPR_DUMP is not set
# CONFIG_SCSI_IPR is not set
CONFIG_SCSI_NCR_Q720=m
CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
@@ -861,8 +888,7 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20
CONFIG_SCSI_PAS16=m
CONFIG_SCSI_PSI240I=m
CONFIG_SCSI_QLOGIC_FAS=m
CONFIG_SCSI_QLOGIC_FC=m
# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
# CONFIG_SCSI_QLOGIC_FC is not set
CONFIG_SCSI_QLOGIC_1280=m
# CONFIG_SCSI_QLA_FC is not set
CONFIG_SCSI_LPFC=m
@@ -883,23 +909,16 @@ CONFIG_SCSI_NSP32=m
#
# PCMCIA SCSI adapter support
#
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
CONFIG_PCMCIA_NINJA_SCSI=m
CONFIG_PCMCIA_QLOGIC=m
CONFIG_PCMCIA_SYM53C500=m
# CONFIG_PCMCIA_AHA152X is not set
# CONFIG_PCMCIA_FDOMAIN is not set
# CONFIG_PCMCIA_NINJA_SCSI is not set
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
CONFIG_CD_NO_IDESCSI=y
CONFIG_AZTCD=m
CONFIG_GSCD=m
CONFIG_MCDX=m
CONFIG_OPTCD=m
CONFIG_SJCD=m
CONFIG_ISP16_CDI=m
CONFIG_CDU535=m
# CONFIG_CD_NO_IDESCSI is not set
#
# Multi-device support (RAID and LVM)
@@ -910,7 +929,7 @@ CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
# CONFIG_MD_RAID10 is not set
CONFIG_MD_RAID5=m
# CONFIG_MD_RAID5 is not set
# CONFIG_MD_RAID6 is not set
CONFIG_MD_MULTIPATH=m
# CONFIG_MD_FAULTY is not set
@@ -919,46 +938,15 @@ CONFIG_MD_MULTIPATH=m
#
# Fusion MPT device support
#
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
CONFIG_FUSION_SAS=m
CONFIG_FUSION_MAX_SGE=128
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set
#
# IEEE 1394 (FireWire) support
#
CONFIG_IEEE1394=m
#
# Subsystem Options
#
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_IEEE1394_OUI_DB is not set
CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
# CONFIG_IEEE1394_EXPORT_FULL_API is not set
#
# Device Drivers
#
#
# Texas Instruments PCILynx requires I2C
#
CONFIG_IEEE1394_OHCI1394=m
#
# Protocol Drivers
#
# CONFIG_IEEE1394_VIDEO1394 is not set
CONFIG_IEEE1394_SBP2=m
CONFIG_IEEE1394_SBP2_PHYS_DMA=y
CONFIG_IEEE1394_ETH1394=m
# CONFIG_IEEE1394_DV1394 is not set
# CONFIG_IEEE1394_RAWIO is not set
# CONFIG_IEEE1394 is not set
#
# I2O device support
@@ -1094,6 +1082,7 @@ CONFIG_SUNDANCE_MMIO=y
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y
# CONFIG_NET_POCKET is not set
#
# Ethernet (1000 Mbit)
@@ -1112,7 +1101,7 @@ CONFIG_R8169=m
CONFIG_R8169_VLAN=y
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SKY2 is not set
CONFIG_SKY2=m
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
@@ -1130,18 +1119,7 @@ CONFIG_S2IO=m
#
# Token Ring devices
#
CONFIG_TR=y
CONFIG_IBMTR=m
CONFIG_IBMOL=m
CONFIG_IBMLS=m
CONFIG_3C359=m
CONFIG_TMS380TR=m
CONFIG_TMSPCI=m
CONFIG_SKISA=m
CONFIG_PROTEON=m
CONFIG_ABYSS=m
CONFIG_MADGEMC=m
CONFIG_SMCTR=m
# CONFIG_TR is not set
#
# Wireless LAN (non-hamradio)
@@ -1203,54 +1181,12 @@ CONFIG_NET_WIRELESS=y
#
# PCMCIA network device support
#
CONFIG_NET_PCMCIA=y
CONFIG_PCMCIA_3C589=m
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_FMVJ18X=m
CONFIG_PCMCIA_PCNET=m
CONFIG_PCMCIA_NMCLAN=m
CONFIG_PCMCIA_SMC91C92=m
CONFIG_PCMCIA_XIRC2PS=m
CONFIG_PCMCIA_AXNET=m
# CONFIG_PCMCIA_IBMTR is not set
# CONFIG_NET_PCMCIA is not set
#
# Wan interfaces
#
CONFIG_WAN=y
CONFIG_HOSTESS_SV11=m
CONFIG_COSA=m
CONFIG_DSCC4=m
CONFIG_DSCC4_PCISYNC=y
CONFIG_DSCC4_PCI_RST=y
CONFIG_LANMEDIA=m
CONFIG_SEALEVEL_4021=m
CONFIG_SYNCLINK_SYNCPPP=m
CONFIG_HDLC=m
CONFIG_HDLC_RAW=y
CONFIG_HDLC_RAW_ETH=y
CONFIG_HDLC_CISCO=y
CONFIG_HDLC_FR=y
CONFIG_HDLC_PPP=y
#
# X.25/LAPB support is disabled
#
CONFIG_PCI200SYN=m
CONFIG_WANXL=m
# CONFIG_WANXL_BUILD_FIRMWARE is not set
CONFIG_PC300=m
CONFIG_PC300_MLPPP=y
CONFIG_N2=m
CONFIG_C101=m
CONFIG_FARSYNC=m
CONFIG_DLCI=m
CONFIG_DLCI_COUNT=24
CONFIG_DLCI_MAX=8
CONFIG_SDLA=m
# CONFIG_WAN_ROUTER_DRIVERS is not set
CONFIG_SBNI=m
CONFIG_SBNI_MULTILINE=y
# CONFIG_WAN is not set
#
# ATM drivers
@@ -1296,6 +1232,7 @@ CONFIG_ATM_HE=m
CONFIG_ATM_HE_USE_SUNI=y
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
@@ -1303,15 +1240,15 @@ CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
CONFIG_PPPOATM=m
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
CONFIG_SLIP_MODE_SLIP6=y
CONFIG_NET_FC=y
CONFIG_SHAPER=m
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -1411,7 +1348,7 @@ CONFIG_KEYBOARD_NEWTON=y
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_PCSPKR is not set
CONFIG_INPUT_PCSPKR=y
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_INPUT_UINPUT is not set
@@ -1422,6 +1359,7 @@ CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
@@ -1433,24 +1371,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_NONSTANDARD=y
# CONFIG_COMPUTONE is not set
CONFIG_ROCKETPORT=m
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
CONFIG_DIGIEPCA=m
# CONFIG_ESPSERIAL is not set
# CONFIG_MOXA_INTELLIO is not set
CONFIG_MOXA_SMARTIO=m
# CONFIG_ISI is not set
CONFIG_SYNCLINK=m
CONFIG_SYNCLINKMP=m
# CONFIG_SYNCLINK_GT is not set
CONFIG_N_HDLC=m
CONFIG_SPECIALIX=m
# CONFIG_SPECIALIX_RTSCTS is not set
CONFIG_SX=m
CONFIG_STALDRV=y
# CONFIG_SERIAL_NONSTANDARD is not set
#
# Serial drivers
@@ -1465,19 +1386,23 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_8250_RSA=y
CONFIG_SERIAL_8250_FOURPORT=m
CONFIG_SERIAL_8250_ACCENT=m
CONFIG_SERIAL_8250_BOCA=m
CONFIG_SERIAL_8250_HUB6=m
CONFIG_SERIAL_8250_MCA=m
# CONFIG_SERIAL_8250_FOURPORT is not set
# CONFIG_SERIAL_8250_ACCENT is not set
# CONFIG_SERIAL_8250_BOCA is not set
# CONFIG_SERIAL_8250_HUB6 is not set
# CONFIG_SERIAL_8250_MCA is not set
#
# Non-8250 serial port support
#
CONFIG_SERIAL_CORE=m
CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
# CONFIG_TIPAR is not set
#
# IPMI
@@ -1547,10 +1472,11 @@ CONFIG_HPET_MMAP=y
#
# Hardware Monitoring support
#
CONFIG_HWMON=m
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
CONFIG_SENSORS_K8TEMP=y
# CONFIG_SENSORS_F71805F is not set
CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HDAPS is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1679,7 +1605,7 @@ CONFIG_USB_SL811_CS=m
# USB Device Class drivers
#
CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
CONFIG_USB_PRINTER=m
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1772,6 +1698,7 @@ CONFIG_USB_ZD1201=m
#
# USB port drivers
#
# CONFIG_USB_USS720 is not set
#
# USB Serial Converter support
@@ -1842,7 +1769,7 @@ CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=y
# CONFIG_REISER4_DEBUG is not set
CONFIG_REISERFS_FS=y
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
CONFIG_REISERFS_FS_XATTR=y
@@ -1852,14 +1779,14 @@ CONFIG_REISERFS_FS_SECURITY=y
CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_OCFS2_FS is not set
CONFIG_MINIX_FS=y
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_FUSE_FS is not set
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
#
# CD-ROM/DVD Filesystems
@@ -1867,7 +1794,8 @@ CONFIG_DNOTIFY=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
# CONFIG_UDF_FS is not set
CONFIG_UDF_FS=y
CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
@@ -1917,17 +1845,20 @@ CONFIG_SQUASHFS_VMALLOC=y
# Network File Systems
#
CONFIG_NFS_FS=m
# CONFIG_NFS_V3 is not set
# CONFIG_NFS_V4 is not set
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
# CONFIG_NFSD_V3 is not set
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
@@ -1998,7 +1929,7 @@ CONFIG_NLS_DEFAULT="cp437"
# CONFIG_PRINTK_TIME is not set
# CONFIG_MAGIC_SYSRQ is not set
CONFIG_DEBUG_KERNEL=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_LOG_BUF_SHIFT=17
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
@@ -2006,12 +1937,11 @@ CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_FRAME_POINTER is not set
CONFIG_FRAME_POINTER=y
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_EARLY_PRINTK=y
@@ -2019,7 +1949,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_DEBUG_RODATA is not set
CONFIG_4KSTACKS=y
# CONFIG_4KSTACKS is not set
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
@@ -2043,11 +1973,11 @@ CONFIG_CRYPTO_SHA256=y
# CONFIG_CRYPTO_WP512 is not set
# CONFIG_CRYPTO_TGR192 is not set
CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_BLOWFISH is not set
CONFIG_CRYPTO_BLOWFISH=m
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
CONFIG_CRYPTO_AES=m
# CONFIG_CRYPTO_AES_586 is not set
CONFIG_CRYPTO_AES_586=m
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not set
# CONFIG_CRYPTO_TEA is not set

4
config/rootfiles/common/fuse
View File

@@ -1,9 +1,9 @@
#etc/rc.d/init.d/fuse
etc/udev/rules.d/99-fuse.rules
#lib/modules/2.6.16/kernel/fs/fuse
lib/modules/2.6.16/kernel/fs/fuse/fuse.ko
#lib/modules/2.6.16/kernel/fs/fuse/fuse.ko
#lib/modules/2.6.16-smp/kernel/fs/fuse
lib/modules/2.6.16-smp/kernel/fs/fuse/fuse.ko
#lib/modules/2.6.16-smp/kernel/fs/fuse/fuse.ko
sbin/mount.fuse
usr/bin/fusermount
usr/bin/ulockmgr_server

31
config/rootfiles/common/libaal Normal file
View File

@@ -0,0 +1,31 @@
#usr/include/aal
#usr/include/aal/bitops.h
#usr/include/aal/block.h
#usr/include/aal/debug.h
#usr/include/aal/device.h
#usr/include/aal/endian.h
#usr/include/aal/exception.h
#usr/include/aal/file.h
#usr/include/aal/gauge.h
#usr/include/aal/hash.h
#usr/include/aal/libaal.h
#usr/include/aal/list.h
#usr/include/aal/malloc.h
#usr/include/aal/math.h
#usr/include/aal/print.h
#usr/include/aal/stream.h
#usr/include/aal/string.h
#usr/include/aal/types.h
#usr/include/aal/ui.h
#usr/include/aal/unaligned.h
usr/lib/libaal-1.0.so.5
usr/lib/libaal-1.0.so.5.0.0
#usr/lib/libaal-minimal.a
#usr/lib/libaal-minimal.la
usr/lib/libaal-minimal.so
usr/lib/libaal-minimal.so.0
usr/lib/libaal-minimal.so.0.0.0
#usr/lib/libaal.a
#usr/lib/libaal.la
usr/lib/libaal.so
#usr/share/aclocal/libaal.m4

2598
config/rootfiles/common/linux
View File

File diff suppressed because it is too large Load Diff

76
config/rootfiles/common/reiser4progs Normal file
View File

@@ -0,0 +1,76 @@
sbin/debugfs.reiser4
sbin/fsck.reiser4
#sbin/make_reiser4
sbin/measurefs.reiser4
sbin/mkfs.reiser4
#usr/include/reiser4
#usr/include/reiser4/alloc.h
#usr/include/reiser4/backup.h
#usr/include/reiser4/bitmap.h
#usr/include/reiser4/factory.h
#usr/include/reiser4/fake.h
#usr/include/reiser4/filesystem.h
#usr/include/reiser4/flow.h
#usr/include/reiser4/format.h
#usr/include/reiser4/item.h
#usr/include/reiser4/journal.h
#usr/include/reiser4/key.h
#usr/include/reiser4/libreiser4.h
#usr/include/reiser4/master.h
#usr/include/reiser4/node.h
#usr/include/reiser4/object.h
#usr/include/reiser4/oid.h
#usr/include/reiser4/place.h
#usr/include/reiser4/plugin.h
#usr/include/reiser4/print.h
#usr/include/reiser4/profile.h
#usr/include/reiser4/pset.h
#usr/include/reiser4/semantic.h
#usr/include/reiser4/status.h
#usr/include/reiser4/tree.h
#usr/include/reiser4/types.h
#usr/include/repair
#usr/include/repair/add_missing.h
#usr/include/repair/alloc.h
#usr/include/repair/backup.h
#usr/include/repair/cleanup.h
#usr/include/repair/disk_scan.h
#usr/include/repair/filesystem.h
#usr/include/repair/filter.h
#usr/include/repair/format.h
#usr/include/repair/item.h
#usr/include/repair/journal.h
#usr/include/repair/key.h
#usr/include/repair/librepair.h
#usr/include/repair/lost_found.h
#usr/include/repair/master.h
#usr/include/repair/node.h
#usr/include/repair/object.h
#usr/include/repair/oid.h
#usr/include/repair/place.h
#usr/include/repair/plugin.h
#usr/include/repair/repair.h
#usr/include/repair/semantic.h
#usr/include/repair/status.h
#usr/include/repair/tree.h
#usr/include/repair/twig_scan.h
usr/lib/libreiser4-1.0.so.5
usr/lib/libreiser4-1.0.so.5.0.0
usr/lib/libreiser4-minimal-1.0.so.5
usr/lib/libreiser4-minimal-1.0.so.5.0.0
#usr/lib/libreiser4-minimal.a
#usr/lib/libreiser4-minimal.la
usr/lib/libreiser4-minimal.so
#usr/lib/libreiser4.a
#usr/lib/libreiser4.la
usr/lib/libreiser4.so
usr/lib/librepair-1.0.so.5
usr/lib/librepair-1.0.so.5.0.0
#usr/lib/librepair.a
#usr/lib/librepair.la
usr/lib/librepair.so
#usr/man/man8/debugfs.reiser4.8
#usr/man/man8/fsck.reiser4.8
#usr/man/man8/measurefs.reiser4.8
#usr/man/man8/mkfs.reiser4.8
#usr/share/aclocal/libreiser4.m4

2
config/rootfiles/common/stage2
View File

@@ -40,7 +40,7 @@ media/cdrom
media/floppy
mnt
#opt
root
#root
#sbin
#srv
#sys

1
config/rootfiles/common/yasuc
View File

@@ -1 +0,0 @@
usr/bin/yasuc

5
doc/packages-list.txt
View File

@@ -124,7 +124,6 @@
* lcms-1.15
* less-394
* libaal-1.0.5
* libaal-1.0.5-minimal
* libart_lgpl-2.3.17
* libcap-1.10
* libmad-0.15.1b
@@ -142,6 +141,8 @@
* libwww-perl-5.803
* libxml2-2.6.26
* linux-2.6.16.29-ipfire
* linux-2.6.16.42
* linux-2.6.19.5
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* linuxigd-0.95
@@ -208,6 +209,7 @@
* rrdtool-1.2.15
* rsync-2.6.8
* samba-3.0.23d
* samba-3.0.24
* screen-4.0.2
* sed-4.1.5
* setserial-2.17
@@ -250,6 +252,5 @@
* xinetd-2.3.14
* xmbmon205
* xvidcore-1.1.0
* yasuc-0.4.1
* zaptel-1.4.0
* zlib-1.2.3

47
html/cgi-bin/netstatus.cgi
View File

@@ -32,7 +32,7 @@ my $output='';
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'left', $Lang::tr{'interfaces'});
$output = `/sbin/ifconfig`;
$output = `/sbin/ip addr show`;
$output = &Header::cleanhtml($output,"y");
my @itfs = ('ORANGE','BLUE','GREEN');
@@ -143,55 +143,14 @@ if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on
&Header::PrintActualLeases;
}
if ( $netsettings{'CONFIG_TYPE'} =~ /^(0|1|4|5)$/ && (exists($pppsettings{'TYPE'})) ) {
my $output1='';
my $output2='';
if ($pppsettings{'TYPE'} eq 'bewanadsl') {
print "<a name='adsl'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
$output1 = `/usr/bin/unicorn_status`;
$output1 = &Header::cleanhtml($output1,"y");
$output2 = `/bin/cat /proc/net/atm/UNICORN:*`;
$output2 = &Header::cleanhtml($output2,"y");
print "<pre>$output1$output2</pre>\n";
&Header::closebox();
}
if ($pppsettings{'TYPE'} eq 'alcatelusbk') {
print "<a name='adsl'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
$output = `/bin/cat /proc/net/atm/speedtch:*`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
}
if ($pppsettings{'TYPE'} eq 'conexantpciadsl') {
print "<a name='adsl'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
$output = `/bin/cat /proc/net/atm/CnxAdsl:*`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
}
if ($pppsettings{'TYPE'} eq 'eagleusbadsl') {
print "<a name='adsl'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
$output = `/usr/sbin/eaglestat`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
}
}
&Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
$output = `/sbin/route -n`;
$output = `/sbin/ip show show`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
&Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
$output = `/sbin/arp -n`;
$output = `/sbin/ip neigh show`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();

4
lfs/cdrom
View File

@@ -55,6 +55,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir -p /install/cdrom/doc
find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
find $(DIR_SRC)/config/rootfiles/ver_$(ED) -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
tar -c -C / --files-from=/tmp/ROOTFILES \
-f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
--exclude='proc/*' --exclude='usr/src/ccache/*' --exclude='usr/src/cache/*' \
@@ -78,7 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir -p /install/cdrom/boot/isolinux; \
dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog; \
cp /install/images/initrd /install/cdrom/boot/isolinux/instroot; \
cp /boot/vmlinuz-$(KVER) /install/cdrom/boot/isolinux/vmlinuz; \
cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz; \
cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/cdrom/boot/isolinux/isolinux.cfg; \
cp $(DIR_SRC)/config/syslinux/boot.msg /install/cdrom/boot/isolinux/boot.msg; \
cp $(DIR_SRC)/config/syslinux/options.msg /install/cdrom/boot/isolinux/options.msg; \

15
lfs/fcclassic
View File

@@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(SMP)" ""
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)/' \
-e 's/`uname -r`/$(KVER)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-e 's/`uname -r`/$(KVER)-ipfire/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
@@ -93,8 +93,8 @@ ifeq "$(SMP)" ""
else
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-smp/' \
-e 's/`uname -r`/$(KVER)-smp/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
@@ -103,10 +103,5 @@ else
endif
cd $(DIR_APP) && CC="$(KGCC)" make
cd $(DIR_APP) && CC="$(KGCC)" make install
ifeq "$(SMP)" ""
find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
else
find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
endif
# @rm -rf $(DIR_APP)
@rm -rf $(DIR_APP)
@$(POSTBUILD)

12
lfs/fcdsl
View File

@@ -81,25 +81,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(SMP)" ""
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)/' \
-e 's/`uname -r`/$(KVER)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-e 's/`uname -r`/$(KVER)-ipfire/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/config/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)/' Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
else
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-smp/' \
-e 's/`uname -r`/$(KVER)-smp/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/config/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-smp/' Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
endif
cd $(DIR_APP) && make CC=$(CC)
cd $(DIR_APP) && make CC=$(CC) install

12
lfs/fcdsl2
View File

@@ -88,25 +88,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(SMP)" ""
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)/' \
-e 's/`uname -r`/$(KVER)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-e 's/`uname -r`/$(KVER)-ipfire/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/config/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)/' Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
else
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-smp/' \
-e 's/`uname -r`/$(KVER)-smp/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/config/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-smp/' Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
endif
cd $(DIR_APP) && make CC=$(CC)
cd $(DIR_APP) && make CC=$(CC) install

12
lfs/fcdslsl
View File

@@ -81,25 +81,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(SMP)" ""
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)/' \
-e 's/`uname -r`/$(KVER)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-e 's/`uname -r`/$(KVER)-ipfire/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/config/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)/' Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
else
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-smp/' \
-e 's/`uname -r`/$(KVER)-smp/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/config/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-smp/' Makefile
cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
endif
cd $(DIR_APP) && make CC=$(CC)
cd $(DIR_APP) && make CC=$(CC) install

12
lfs/fcdslslusb
View File

@@ -85,27 +85,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(SMP)" ""
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)/' \
-e 's/`uname -r`/$(KVER)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-e 's/`uname -r`/$(KVER)-ipfire/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -r)/$(KVER)/' Makefile
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
else
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-smp/' \
-e 's/`uname -r`/$(KVER)-smp/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -r)/$(KVER)-smp/' Makefile
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
endif
cd $(DIR_APP) && CC="$(KGCC)" make
cd $(DIR_APP) && CC="$(KGCC)" make install

12
lfs/fcdslusb
View File

@@ -83,27 +83,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(SMP)" ""
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)/' \
-e 's/`uname -r`/$(KVER)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-e 's/`uname -r`/$(KVER)-ipfire/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -r)/$(KVER)/' Makefile
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
else
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-smp/' \
-e 's/`uname -r`/$(KVER)-smp/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -r)/$(KVER)-smp/' Makefile
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
endif
cd $(DIR_APP) && CC="$(KGCC)" make
cd $(DIR_APP) && CC="$(KGCC)" make install

8
lfs/fcpci
View File

@@ -80,7 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(SMP)" ""
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-e 's/`uname -r`/$(KVER)/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
@@ -88,11 +88,11 @@ ifeq "$(SMP)" ""
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -r)/$(KVER)/' Makefile
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
else
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-smp/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-e 's/`uname -r`/$(KVER)-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
@@ -100,7 +100,7 @@ else
-e '/^DEFINES/a\ \
-DMODVERSIONS \\' src/Makefile
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -r)/$(KVER)-smp/' Makefile
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
endif
cd $(DIR_APP) && CC="$(KGCC)" make
cd $(DIR_APP) && CC="$(KGCC)" make install

114
lfs/linux
View File

@@ -26,11 +26,11 @@
include Config
VER = 2.6.16
PATCHLEVEL = 2.6.16.29
PATCHLEVEL = .42
VER = 2.6.16.42
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
@@ -39,9 +39,9 @@ CXXFLAGS =
# Normal build or SMP build.
#
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire-smp
TARGET = $(DIR_INFO)/linux-$(VER)-smp
else
TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire
TARGET = $(DIR_INFO)/linux-$(VER)
endif
###############################################################################
@@ -50,37 +50,22 @@ endif
objects =$(DL_FILE) \
mISDN-CVS-2007-01-26.tar.bz2 \
squashfs3.0.tar.gz \
openswan-2.4.7.kernel-2.6-natt.patch.gz \
openswan-2.4.7.kernel-2.6-klips.patch.gz \
iptables-1.3.5.tar.bz2 \
patch-o-matic-ng-20061210.tar.bz2 \
kbc_option_2420.patch \
net4801.kernel.patch_2.4.31 \
netfilter-layer7-v2.6.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
patch-$(PATCHLEVEL).gz
patch-2.6.16-nath323-1.3.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
patch-$(PATCHLEVEL).gz = $(DL_FROM)/patch-$(PATCHLEVEL).gz
openswan-2.4.7.kernel-2.6-natt.patch.gz = $(URL_IPFIRE)/openswan-2.4.7.kernel-2.6-natt.patch.gz
openswan-2.4.7.kernel-2.6-klips.patch.gz = $(URL_IPFIRE)/openswan-2.4.7.kernel-2.6-klips.patch.gz
patch-o-matic-ng-20061210.tar.bz2 = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
iptables-1.3.5.tar.bz2 = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
kbc_option_2420.patch = $(URL_IPFIRE)/kbc_option_2420.patch
net4801.kernel.patch_2.4.31 = $(URL_IPFIRE)/net4801.kernel.patch_2.4.31
netfilter-layer7-v2.6.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.0.tar.gz = $(URL_IPFIRE)/squashfs3.0.tar.gz
mISDN-CVS-2007-01-26.tar.bz2 = $(URL_IPFIRE)/mISDN-CVS-2007-01-26.tar.bz2
$(DL_FILE)_MD5 = 50695965725367f39007023feac5e256
patch-$(PATCHLEVEL).gz_MD5 = 1355ebc25ea57df398d20e1c1726ec9b
openswan-2.4.7.kernel-2.6-natt.patch.gz_MD5 = 980d8bbdb29a761b7f5aa852f373df62
openswan-2.4.7.kernel-2.6-klips.patch.gz_MD5 = 5df0ffa2453488a407a23fc4ea4af879
$(DL_FILE)_MD5 = 87e998bb87839b962702815dd5aecc73
patch-o-matic-ng-20061210.tar.bz2_MD5 = 76edac76301b45f89e467b41c8cf4393
iptables-1.3.5.tar.bz2_MD5 = 00fb916fa8040ca992a5ace56d905ea5
kbc_option_2420.patch_MD5 = 6d37870344f7fcf97ace1fbf43323c60
net4801.kernel.patch_2.4.31_MD5 = c7d64e3caedb2f2b10e1c11db7f73a04
netfilter-layer7-v2.6.tar.gz_MD5 = 58135cd1aafaf4ae2fa478159206f064
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.0.tar.gz_MD5 = 9fd05d0bfbb712f5fb95edafea5bc733
@@ -113,24 +98,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ln -s linux-$(VER) /usr/src/linux
# Update kernel to latest patchlevel
cd $(DIR_APP) && zcat $(DIR_DL)/patch-$(PATCHLEVEL).gz | patch -p1
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch
# Remove patch level in EXTRAVERSION.
# We want to avoid the need to supply a full kernel
# (installed in a different place) if only one part could be updated
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =/' Makefile
cd $(DIR_APP) && sed -i -e 's/-Werror//' drivers/scsi/aic7xxx/Makefile
cd $(DIR_APP) && sed -i -e 's/gettext//' scripts/kconfig/lkc.h
# Openswan 2
cd $(DIR_SRC) && rm -rf openswan-*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.7.tar.gz
cd $(DIR_APP) && gzip -dc $(DIR_DL)/openswan-2.4.7.kernel-2.6-natt.patch.gz | patch -Np1
cd $(DIR_APP) && gzip -dc $(DIR_DL)/openswan-2.4.7.kernel-2.6-klips.patch.gz | patch -Np1
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-natt.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-klips.patch
cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
# H323 conntrack
@@ -151,14 +126,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC) && rm -rf patch-o-matic*
cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
cd $(DIR_SRC)/patch-o-matic-ng* && \
./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ --iptables-path=$(ROOT)/usr/src/iptables/ \
./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ \
--iptables-path=$(ROOT)/usr/src/iptables/ \
TARPIT sip-conntrack-nat rtsp-conntrack-nat \
mms-conntrack-nat
# Layer7-patch
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.6
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.6.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.9
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.9.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
# Linux Intermediate Queueing Device
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16-imq2.diff
@@ -167,7 +143,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
# mISDN
cd $(DIR_SRC) && rm -rf mISDN-CVS-2007-01-26
cd $(DIR_SRC) && rm -rf mISDN-*
cd $(DIR_SRC) && tar xfj $(DIR_DL)/mISDN-CVS-2007-01-26.tar.bz2
cd $(DIR_SRC)/mISDN-CVS-2007-01-26 && yes 'yes' | ./std2kern -k /usr/src/linux
@@ -191,36 +167,34 @@ endif
cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
cd $(DIR_APP) && make CC="$(KGCC)" clean
if [ "$(SMP)" = "" ]; then \
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER); \
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER); \
cd $(DIR_APP) && cp -v .config /boot/config-$(VER); \
ln -sf vmlinuz-$(VER) /boot/vmlinuz; \
ln -sf System.map-$(VER) /boot/System.map; \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules; \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install; \
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module; \
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall; \
elif [ "$(SMP)" = "1" ]; then \
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =/EXTRAVERSION\ =\ -smp/' Makefile; \
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-smp; \
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-smp; \
cd $(DIR_APP) && cp -v .config /boot/config-$(VER); \
ln -sf vmlinuz-$(VER)-smp /boot/vmlinuz-smp; \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules; \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install; \
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module; \
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall; \
fi
ifeq "$(SMP)" "1"
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-smp/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire-smp
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-smp
cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
ln -sf vmlinuz-$(VER)-smp /boot/vmlinuz-ipfire-smp
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
#cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
#cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
else
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire
cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz
ln -sf System.map-$(VER)-ipfire /boot/System.map
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
#cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
#cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
endif
# remove symlinked pcmcia directory
ifeq "$(SMP)" ""
rm -rf /lib/modules/$(VER)/pcmcia
endif
ifeq "$(SMP)" "1"
rm -rf /lib/modules/$(VER)-smp/pcmcia
endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-CVS-2007-01-26 $(DIR_SRC)/netfilter-layer7-v2.6
-rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)

4
lfs/nagios
View File

@@ -79,7 +79,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) $(DIR_SRC)/nagios* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr/nagios --with-cgiurl=/nagios/cgi-bin \
--with-htmurl=/nagios --with-nagios-user=nobody \
--with-nagios-group=nobody
@@ -90,5 +90,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/nagios-plugins-1.4.3 && ./configure --prefix=/usr/nagios --with-ping-command="-n %s -c %d"
cd $(DIR_SRC)/nagios-plugins-1.4.3 && make
cd $(DIR_SRC)/nagios-plugins-1.4.3 && make install
@rm -rf $(DIR_APP)
@rm -rf $(DIR_APP) $(DIR_SRC)/nagios*
@$(POSTBUILD)

2
lfs/pxe
View File

@@ -53,7 +53,7 @@ $(TARGET) :
mkdir -p /tmp/$(VERSION) /tmp/pxelinux.cfg
cp /usr/lib/syslinux/pxelinux.0 /tmp
cp /install/images/initrd /tmp/$(VERSION)/instroot
cp /boot/vmlinuz-$(KVER) /tmp/$(VERSION)/vmlinuz
cp /boot/vmlinuz-$(KVER)-ipfire /tmp/$(VERSION)/vmlinuz
cp $(DIR_SRC)/config/syslinux/options.msg /tmp/$(VERSION)/options.msg
cp $(DIR_SRC)/config/syslinux/splash.lss /tmp/$(VERSION)/splash.lss
cp /usr/lib/memtest86+/memtest.bin /tmp/$(VERSION)/memtest

7
lfs/samba
View File

@@ -26,7 +26,7 @@
include Config
VER = 3.0.23d
VER = 3.0.24
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = afe6923d05fed5b5ccab593c7a407cd1
$(DL_FILE)_MD5 = 89273f67a6d8067cbbecefaa13747153
install : $(TARGET)
@@ -98,9 +98,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
# cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
# cd $(DIR_APP)/source && install -v -m755 -d /usr/share/doc/samba-3.0.22
# cd $(DIR_APP)/source && install -v -m644 ../docs/*.pdf /usr/share/doc/samba-3.0.22
# cd $(DIR_APP)/source && ln -v -s ../../samba/swat /usr/share/doc/samba-3.0.22
cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

21
lfs/aboot → lfs/whatmask
View File

@@ -26,15 +26,13 @@
include Config
VER = 0.9b
VER = 1.2
THISAPP = aboot-$(VER)
THISAPP = whatmask-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
CFLAGS =
CXXFLAGS =
###############################################################################
# Top-level Rules
@@ -44,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 00c35c192d320bb005ad9bead7043d2c
$(DL_FILE)_MD5 = 26aeff74dbba70262ccd426e681dcf4a
install : $(TARGET)
@@ -54,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
@@ -74,14 +75,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make CFGDEFS="-fno-stack-protector"
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# aboot files
mkdir -p /boot/etc
for i in $(DIR_SRC)/config/aboot/*; do \
[ -f $$i ] && cp -f $$i /boot/etc; \
done
@rm -rf $(DIR_APP)
@$(POSTBUILD)

83
lfs/yasuc
View File

@@ -1,83 +0,0 @@
###############################################################################
# This file is part of the IPCop Firewall. #
# #
# IPCop is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPCop is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPCop; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 0.4.1
THISAPP = yasuc-$(VER)
DL_FILE = $(THISAPP)_x86_linux.tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/dist/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = yasuc
PAK_VER = 1
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7cdf8534c6b9acba168c14594082d039
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && cp -f yasuc /usr/bin/yasuc
chmod 755 /usr/bin/yasuc
@rm -rf $(DIR_APP)
@$(POSTBUILD)

8
lfs/zaptel
View File

@@ -85,12 +85,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch
ifeq "$(SMP)" "1"
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make linux26 KVERS=$(KVER)-smp
cd $(DIR_APP) && make install KVERS=$(KVER)-smp
cd $(DIR_APP) && make linux26 KVERS=$(KVER)-ipfire-smp
cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire-smp
else
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make linux26 KVERS=$(KVER)
cd $(DIR_APP) && make install KVERS=$(KVER)
cd $(DIR_APP) && make linux26 KVERS=$(KVER)-ipfire
cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire
endif
cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h
cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/zconfig.h

4
src/initscripts/init.d/checkfs
View File

@@ -30,8 +30,8 @@
case "${1}" in
start)
if [ -f /fastboot ]; then
boot_mesg -n "/fastboot found, will not perform" ${INFO}
if [ ! -f /.autofsck ]; then
boot_mesg -n "No /.autofsck found, will not perform" ${INFO}
boot_mesg " file system checks as requested."
echo_ok
exit 0

8
src/install+setup/install/main.c
View File

@@ -557,9 +557,9 @@ int main(int argc, char *argv[])
}
if (raid_disk)
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %sp3", hdparams.devnode);
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %sp3", hdparams.devnode);
else
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %s3", hdparams.devnode);
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %s3", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
{
@@ -568,9 +568,9 @@ int main(int argc, char *argv[])
}
if (raid_disk)
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %sp4", hdparams.devnode);
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %sp4", hdparams.devnode);
else
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %s4", hdparams.devnode);
snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %s4", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
{

111
src/patches/grub-0.90-append.patch
View File

@@ -1,111 +0,0 @@
--- grub-0.90/stage2/stage2.c.append Thu Dec 20 08:20:48 2001
+++ grub-0.90/stage2/stage2.c Thu Dec 20 17:01:20 2001
@@ -500,7 +500,8 @@
if (config_entries)
printf ("\
Press enter to boot the selected OS, \'e\' to edit the\n\
- commands before booting, or \'c\' for a command-line.");
+ commands before booting, \'a\' to modify the kernel arguments\n\
+ before booting, or \'c\' for a command-line.");
else
printf ("\
Press \'b\' to boot, \'e\' to edit the selected command in the\n\
@@ -787,6 +788,98 @@
enter_cmdline (heap, 0);
goto restart;
}
+ if (config_entries && c == 'a')
+ {
+ int new_num_entries = 0, i = 0, j;
+ int needs_padding, amount;
+ char *new_heap;
+ char * entries;
+ char * entry_copy;
+ char * append_line;
+ char * start;
+
+ entry_copy = new_heap = heap;
+ cur_entry = get_entry (config_entries, first_entry + entryno,
+ 1);
+
+ do
+ {
+ while ((*(new_heap++) = cur_entry[i++]) != 0);
+ new_num_entries++;
+ }
+ while (config_entries && cur_entry[i]);
+
+ /* this only needs to be done if config_entries is non-NULL,
+ but it doesn't hurt to do it always */
+ *(new_heap++) = 0;
+
+ new_heap = heap + NEW_HEAPSIZE + 1;
+
+ entries = entry_copy;
+ while (*entries)
+ {
+ if ((strstr(entries, "kernel") == entries) &&
+ isspace(entries[6]))
+ break;
+
+ while (*entries) entries++;
+ entries++;
+ }
+
+ if (!*entries)
+ goto restart;
+
+ start = entries + 6;
+
+ /* skip the white space */
+ while (*start && isspace(*start)) start++;
+ /* skip the kernel name */
+ while (*start && !isspace(*start)) start++;
+
+ /* skip the white space */
+ needs_padding = (!*start || !isspace(*start));
+ while (*start && isspace(*start)) start++;
+
+ append_line = new_heap;
+ grub_strcpy(append_line, start);
+
+ cls();
+ print_cmdline_message (CMDLINE_EDIT_MODE);
+
+ if (get_cmdline(PACKAGE " append> ",
+ append_line, NEW_HEAPSIZE + 1,
+ 0, 1))
+ goto restart;
+
+ /* have new args; append_line points to the
+ new args and start points to the old
+ args */
+
+ i = grub_strlen(start);
+ j = grub_strlen(append_line);
+
+ if (i > (j + needs_padding))
+ amount = i;
+ else
+ amount = j + needs_padding;
+
+ /* align rest of commands properly */
+ memmove (start + j + needs_padding, start + i,
+ ((int) append_line) - ((int) start) - (amount));
+
+ if (needs_padding)
+ *start = ' ';
+
+ /* copy command to correct area */
+ memmove (start + needs_padding, append_line, j);
+
+ /* set up this entry to boot */
+ config_entries = NULL;
+ cur_entry = entry_copy;
+ heap = new_heap;
+
+ break;
+ }
#ifdef GRUB_UTIL
if (c == 'q')
{

16
src/patches/grub-0.90-symlinkmenulst.patch
View File

@@ -1,16 +0,0 @@
Only in grub: ChangeLog~
diff -ur grub-0.90/util/grub-install.in grub/util/grub-install.in
--- grub-0.90/util/grub-install.in Wed Sep 5 15:50:06 2001
+++ grub/util/grub-install.in Wed Sep 5 15:50:24 2001
@@ -320,6 +320,10 @@
exit 1
fi
+if ! test -e ${grubdir}/grub.conf ; then
+ test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
+fi
+
# Create a safe temporary file.
test -x /bin/mktemp && log_file=`/bin/mktemp /tmp/grub-install.log.XXXXXX`
Only in grub/util: grub-install.in.orig

249
src/patches/grub-0.91-bootonce.patch
View File

@@ -1,249 +0,0 @@
To: bug-grub@gnu.org
cc: Keir.Fraser@cl.cam.ac.uk
Subject: PATCH (updated): 'lilo -R' functionality
From: Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Message-Id: <E16iFu3-0002VK-00@wisbech.cl.cam.ac.uk>
The following is a slight modification to the patch I submitted a week
or so ago. This will cause GRUB to skip displaying the boot menu if a
one-shot default has been specified (just as lilo does with '-R').
Same caveats as for previous patch:
* The new 'savedefault' function in the GRUB shell is incomplete.
Only works if the filesystem containing stage2 file is mounted.
* Patch is against grub-0.90, but patches directly to 0.91
I hope this goes into CVS in the next round of updates :-)
-- Keir Fraser
diff -urBP grub-0.90-old/stage2/builtins.c grub-0.90-modified/stage2/builtins.c
--- grub-0.90-old/stage2/builtins.c Fri Feb 22 11:59:57 2002
+++ grub-0.90-modified/stage2/builtins.c Fri Feb 22 13:48:36 2002
@@ -785,6 +785,17 @@
default_func (char *arg, int flags)
{
#ifndef SUPPORT_DISKLESS
+#ifndef GRUB_UTIL
+ /* Has a forced once-only default been specified? */
+ static int savedefault_helper(int);
+ if ((saved_entryno & STAGE2_ONCEONLY_ENTRY) != 0)
+ {
+ grub_timeout = 0;
+ default_entry = saved_entryno & ~STAGE2_ONCEONLY_ENTRY;
+ savedefault_helper(0);
+ return 0;
+ }
+#endif
if (grub_strcmp (arg, "saved") == 0)
{
default_entry = saved_entryno;
@@ -3074,22 +3085,15 @@
};
-/* savedefault */
+
+#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
+/* Write specified default entry number into stage2 file. */
static int
-savedefault_func (char *arg, int flags)
+savedefault_helper(int new_default)
{
-#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
char buffer[512];
int *entryno_ptr;
-
- /* This command is only useful when you boot an entry from the menu
- interface. */
- if (! (flags & BUILTIN_SCRIPT))
- {
- errnum = ERR_UNRECOGNIZED;
- return 1;
- }
-
+
/* Get the geometry of the boot drive (i.e. the disk which contains
this stage2). */
if (get_diskinfo (boot_drive, &buf_geom))
@@ -3115,10 +3119,10 @@
entryno_ptr = (int *) (buffer + STAGE2_SAVED_ENTRYNO);
/* Check if the saved entry number differs from current entry number. */
- if (*entryno_ptr != current_entryno)
+ if (*entryno_ptr != new_default)
{
/* Overwrite the saved entry number. */
- *entryno_ptr = current_entryno;
+ *entryno_ptr = new_default;
/* Save the image in the disk. */
if (! rawwrite (boot_drive, install_second_sector, buffer))
@@ -3129,6 +3133,117 @@
}
return 0;
+}
+#endif
+
+#if !defined(SUPPORT_DISKLESS) && defined(GRUB_UTIL)
+/*
+ * Full implementation of new `savedefault' for GRUB shell.
+ * XXX This needs fixing for stage2 files which aren't accessible
+ * through a mounted filesystem.
+ */
+static int
+savedefault_shell(char *arg, int flags)
+{
+ char *stage2_os_file = "/boot/grub/stage2"; /* Default filename */
+ FILE *fp;
+ char buffer[512];
+ int *entryno_ptr;
+ int new_default = 0;
+
+ while (1)
+ {
+ if (grub_memcmp ("--stage2=", arg, sizeof ("--stage2=") - 1) == 0)
+ {
+ stage2_os_file = arg + sizeof ("--stage2=") - 1;
+ arg = skip_to (0, arg);
+ nul_terminate (stage2_os_file);
+ }
+ else if (grub_memcmp ("--default=", arg, sizeof ("--default=") - 1) == 0)
+ {
+ char *p = arg + sizeof ("--default=") - 1;
+ if (! safe_parse_maxint (&p, &new_default))
+ return 1;
+ arg = skip_to (0, arg);
+ }
+ else if (grub_memcmp ("--once", arg, sizeof ("--once") - 1) == 0)
+ {
+ new_default |= STAGE2_ONCEONLY_ENTRY;
+ arg = skip_to (0, arg);
+ }
+ else
+ break;
+ }
+
+ if (! (fp = fopen(stage2_os_file, "r+")))
+ {
+ errnum = ERR_FILE_NOT_FOUND;
+ return 1;
+ }
+
+ if (fseek (fp, SECTOR_SIZE, SEEK_SET) != 0)
+ {
+ fclose (fp);
+ errnum = ERR_BAD_VERSION;
+ return 1;
+ }
+
+ if (fread (buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
+ {
+ fclose (fp);
+ errnum = ERR_READ;
+ return 1;
+ }
+
+ /* Sanity check. */
+ if (buffer[STAGE2_STAGE2_ID] != STAGE2_ID_STAGE2
+ || *((short *) (buffer + STAGE2_VER_MAJ_OFFS)) != COMPAT_VERSION)
+ {
+ errnum = ERR_BAD_VERSION;
+ return 1;
+ }
+
+ entryno_ptr = (int *) (buffer + STAGE2_SAVED_ENTRYNO);
+ *entryno_ptr = new_default;
+
+ if (fseek (fp, SECTOR_SIZE, SEEK_SET) != 0)
+ {
+ fclose (fp);
+ errnum = ERR_BAD_VERSION;
+ return 1;
+ }
+
+ if (fwrite (buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
+ {
+ fclose (fp);
+ errnum = ERR_WRITE;
+ return 1;
+ }
+
+ (void)fflush (fp);
+ fclose (fp);
+ return 0;
+}
+#endif
+
+/* savedefault */
+static int
+savedefault_func (char *arg, int flags)
+{
+#if !defined(SUPPORT_DISKLESS)
+#if !defined(GRUB_UTIL)
+ /* This command is only useful when you boot an entry from the menu
+ interface. */
+ if (! (flags & BUILTIN_SCRIPT))
+ {
+ errnum = ERR_UNRECOGNIZED;
+ return 1;
+ }
+
+ return savedefault_helper(current_entryno);
+#else /* defined(GRUB_UTIL) */
+ return savedefault_shell(arg, flags);
+#endif
#else /* ! SUPPORT_DISKLESS && ! GRUB_UTIL */
errnum = ERR_UNRECOGNIZED;
return 1;
@@ -3140,8 +3255,14 @@
"savedefault",
savedefault_func,
BUILTIN_CMDLINE,
+#ifdef GRUB_UTIL
+ "savedefault [--stage2=STAGE2_FILE] [--default=DEFAULT] [--once]",
+ "Save DEFAULT as the default boot entry in STAGE2_FILE. If '--once'"
+ " is specified, the default is reset after the next reboot."
+#else
"savedefault",
"Save the current entry as the default boot entry."
+#endif
};
@@ -4217,6 +4338,15 @@
static int
timeout_func (char *arg, int flags)
{
+ /* One-shot default shenanigans -- don't piss around with the menu! */
+ if (grub_timeout != -1)
+ return 0;
+ if ((saved_entryno & STAGE2_ONCEONLY_ENTRY) != 0)
+ {
+ grub_timeout = 0;
+ return 0;
+ }
+
if (! safe_parse_maxint (&arg, &grub_timeout))
return 1;
diff -urBP grub-0.90-old/stage2/shared.h grub-0.90-modified/stage2/shared.h
--- grub-0.90-old/stage2/shared.h Fri Feb 22 11:59:53 2002
+++ grub-0.90-modified/stage2/shared.h Fri Feb 22 10:51:49 2002
@@ -199,6 +199,8 @@
#define STAGE2_FORCE_LBA 0x11
#define STAGE2_VER_STR_OFFS 0x12
+#define STAGE2_ONCEONLY_ENTRY 0x10000
+
/* Stage 2 identifiers */
#define STAGE2_ID_STAGE2 0
#define STAGE2_ID_FFS_STAGE1_5 1
_______________________________________________
Bug-grub mailing list
Bug-grub@gnu.org
http://mail.gnu.org/mailman/listinfo/bug-grub

28
src/patches/grub-0.91-splashimagehelp.patch
View File

@@ -1,28 +0,0 @@
diff -ur grub-0.91/docs/grub.texi grub/docs/grub.texi
--- grub-0.91/docs/grub.texi Mon Jan 21 22:57:46 2002
+++ grub/docs/grub.texi Mon Jan 21 22:57:51 2002
@@ -1891,6 +1891,7 @@
* rarp:: Initialize a network device via RARP
* serial:: Set up a serial device
* setkey:: Configure the key map
+* splashimage:: Use a splash image
* terminal:: Choose a terminal
* tftpserver:: Specify a TFTP server
* unhide:: Unhide a partition
@@ -2260,6 +2261,16 @@
@end deffn
+@node splashimage
+@subsection splashimage
+
+@deffn Command splashimage file
+Select an image to use as the background image. This should be
+specified using normal GRUB device naming syntax. The format of the
+file is a gzipped xpm which is 640x480 with a 14 color palette.
+@end deffn
+
+
@node terminal
@subsection terminal

75
src/patches/grub-0.93-configfile.patch
View File

@@ -1,75 +0,0 @@
--- grub-0.93/stage2/asm.S.config 2002-12-02 18:18:56.000000000 -0500
+++ grub-0.93/stage2/asm.S 2002-12-28 22:01:24.000000000 -0500
@@ -97,7 +97,7 @@
.string VERSION
VARIABLE(config_file)
#ifndef STAGE1_5
- .string "/boot/grub/menu.lst"
+ .string "/boot/grub/grub.conf"
#else /* STAGE1_5 */
.long 0xffffffff
.string "/boot/grub/stage2"
--- grub-0.93/stage2/builtins.c.config 2002-12-03 23:41:57.000000000 -0500
+++ grub-0.93/stage2/builtins.c 2002-12-28 22:01:24.000000000 -0500
@@ -3838,7 +3838,7 @@
/* The prefix was determined. */
grub_sprintf (stage2, "%s%s", prefix, "/stage2");
- grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
+ grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
*real_config_filename = 0;
/* Check if stage2 exists. */
--- grub-0.93/grub/asmstub.c.config 2002-12-02 18:20:45.000000000 -0500
+++ grub-0.93/grub/asmstub.c 2002-12-28 22:01:24.000000000 -0500
@@ -71,7 +71,7 @@
unsigned long boot_drive = 0;
int saved_entryno = 0;
char version_string[] = VERSION;
-char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
+char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
unsigned long linux_text_len = 0;
char *linux_data_tmp_addr = 0;
char *linux_data_real_addr = 0;
--- grub-0.93/docs/grub.8.config 2002-12-07 22:17:59.000000000 -0500
+++ grub-0.93/docs/grub.8 2002-12-28 22:01:24.000000000 -0500
@@ -15,7 +15,7 @@
specify stage2 boot_drive [default=0x0]
.TP
\fB\-\-config\-file\fR=\fIFILE\fR
-specify stage2 config_file [default=/boot/grub/menu.lst]
+specify stage2 config_file [default=/boot/grub/grub.conf]
.TP
\fB\-\-device\-map\fR=\fIFILE\fR
use the device map file FILE
--- grub-0.93/docs/grub.texi.config 2002-12-02 17:35:28.000000000 -0500
+++ grub-0.93/docs/grub.texi 2002-12-28 22:01:24.000000000 -0500
@@ -989,7 +989,7 @@
keys) that will do everything to boot an OS.
To enable the menu, you need a configuration file,
-@file{menu.lst} under the boot directory. We'll analyze an example
+@file{grub.conf} under the boot directory. We'll analyze an example
file.
The file first contains some general settings, the menu interface
@@ -1596,8 +1596,8 @@
An absolute file name resembles a Unix absolute file name, using
@samp{/} for the directory separator (not @samp{\} as in DOS). One
-example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
-@file{/boot/grub/menu.lst} in the first partition of the first hard
+example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
+@file{/boot/grub/grub.conf} in the first partition of the first hard
disk. If you omit the device name in an absolute file name, GRUB uses
GRUB's @dfn{root device} implicitly. So if you set the root device to,
say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
@@ -3249,7 +3249,7 @@
@item --config-file=@var{file}
Read the configuration file @var{file} instead of
-@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
+@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
syntax. See @ref{Filesystem}, for more information.
@item --boot-drive=@var{drive}

77
src/patches/grub-0.93-endedit.patch
View File

@@ -1,77 +0,0 @@
Index: stage2/cmdline.c
===================================================================
RCS file: /cvsroot/grub/grub/stage2/cmdline.c,v
retrieving revision 1.27
diff -u -r1.27 cmdline.c
--- stage2/cmdline.c 3 Dec 2002 00:02:53 -0000 1.27
+++ stage2/cmdline.c 6 Jan 2003 05:33:33 -0000
@@ -48,12 +48,17 @@
/* Print a helpful message for the command-line interface. */
void
-print_cmdline_message (int forever)
+print_cmdline_message (int type)
{
printf (" [ Minimal BASH-like line editing is supported. For the first word, TAB\n"
" lists possible command completions. Anywhere else TAB lists the possible\n"
- " completions of a device/filename.%s ]\n",
- (forever ? "" : " ESC at any time exits."));
+ " completions of a device/filename.");
+ if (type == CMDLINE_NORMAL_MODE)
+ printf(" ESC at any time exits.");
+ if (type == CMDLINE_EDIT_MODE)
+ printf(" ESC at any time cancels. ENTER \n"
+ " at any time accepts your changes.");
+ printf("]\n");
}
/* Find the builtin whose command name is COMMAND and return the
@@ -128,7 +133,7 @@
print_network_configuration ();
grub_putchar ('\n');
#endif
- print_cmdline_message (forever);
+ print_cmdline_message (forever ? CMDLINE_FOREVER_MODE : CMDLINE_NORMAL_MODE);
while (1)
{
Index: stage2/shared.h
===================================================================
RCS file: /cvsroot/grub/grub/stage2/shared.h,v
retrieving revision 1.90
diff -u -r1.90 shared.h
--- stage2/shared.h 3 Dec 2002 00:02:53 -0000 1.90
+++ stage2/shared.h 6 Jan 2003 05:33:33 -0000
@@ -843,9 +843,15 @@
void init_config (void);
char *skip_to (int after_equal, char *cmdline);
struct builtin *find_command (char *command);
-void print_cmdline_message (int forever);
void enter_cmdline (char *heap, int forever);
int run_script (char *script, char *heap);
+
+/* the flags for the cmdline message */
+#define CMDLINE_FOREVER_MODE 0x0
+#define CMDLINE_NORMAL_MODE 0x1
+#define CMDLINE_EDIT_MODE 0x2
+
+void print_cmdline_message (int type);
#endif
/* C library replacement functions with identical semantics. */
Index: stage2/stage2.c
===================================================================
RCS file: /cvsroot/grub/grub/stage2/stage2.c,v
retrieving revision 1.42
diff -u -r1.42 stage2.c
--- stage2/stage2.c 4 Dec 2002 00:55:45 -0000 1.42
+++ stage2/stage2.c 6 Jan 2003 05:33:33 -0000
@@ -655,7 +655,7 @@
else
{
cls ();
- print_cmdline_message (0);
+ print_cmdline_message (CMDLINE_EDIT_MODE);
new_heap = heap + NEW_HEAPSIZE + 1;

39
src/patches/grub-0.93-graphics-bootterm.patch
View File

@@ -1,39 +0,0 @@
--- grub-0.93/stage2/builtins.c.bootterm 2002-12-29 02:01:50.000000000 -0500
+++ grub-0.93/stage2/builtins.c 2002-12-29 02:01:07.000000000 -0500
@@ -233,12 +233,22 @@
static int
boot_func (char *arg, int flags)
{
+ struct term_entry *prev_term = current_term;
/* Clear the int15 handler if we can boot the kernel successfully.
This assumes that the boot code never fails only if KERNEL_TYPE is
not KERNEL_TYPE_NONE. Is this assumption is bad? */
if (kernel_type != KERNEL_TYPE_NONE)
unset_int15_handler ();
+ /* if our terminal needed initialization, we should shut it down
+ * before booting the kernel, but we want to save what it was so
+ * we can come back if needed */
+ if (current_term->shutdown)
+ {
+ (*current_term->shutdown)();
+ current_term = term_table; /* assumption: console is first */
+ }
+
#ifdef SUPPORT_NETBOOT
/* Shut down the networking. */
cleanup_net ();
@@ -302,6 +312,13 @@
return 1;
}
+ /* if we get back here, we should go back to what our term was before */
+ current_term = prev_term;
+ if (current_term->startup)
+ /* if our terminal fails to initialize, fall back to console since
+ * it should always work */
+ if ((*current_term->startup)() == 0)
+ current_term = term_table; /* we know that console is first */
return 0;
}

1283
src/patches/grub-0.93-graphics.patch
View File

File diff suppressed because it is too large Load Diff

183
src/patches/grub-0.93-rtl8139.patch
View File

@@ -1,183 +0,0 @@
--- rtl8139.c.old 2004-01-25 17:49:38.000000000 +0000
+++ rtl8139.c 2004-01-25 18:20:29.000000000 +0000
@@ -161,19 +161,11 @@
/* The RTL8139 can only transmit from a contiguous, aligned memory block. */
static unsigned char tx_buffer[TX_BUF_SIZE] __attribute__((aligned(4)));
-/* I know that this is a MEGA HACK, but the tagged boot image specification
- * states that we can do whatever we want below 0x10000 - so we do! */
-/* But we still give the user the choice of using an internal buffer
- just in case - Ken */
-#ifdef USE_LOWMEM_BUFFER
-#define rx_ring ((unsigned char *)(0x10000 - (RX_BUF_LEN + 16)))
-#else
static unsigned char rx_ring[RX_BUF_LEN+16] __attribute__((aligned(4)));
-#endif
struct nic *rtl8139_probe(struct nic *nic, unsigned short *probeaddrs,
struct pci_device *pci);
-static int read_eeprom(int location);
+static int read_eeprom(int location, int addr_len);
static void rtl_reset(struct nic *nic);
static void rtl_transmit(struct nic *nic, const char *destaddr,
unsigned int type, unsigned int len, const char *data);
@@ -186,6 +178,8 @@
{
int i;
int speed10, fullduplex;
+ int addr_len;
+ unsigned short *ap = (unsigned short*)nic->node_addr;
/* There are enough "RTL8139" strings on the console already, so
* be brief and concentrate on the interesting pieces of info... */
@@ -199,15 +193,9 @@
/* Bring the chip out of low-power mode. */
outb(0x00, ioaddr + Config1);
- if (read_eeprom(0) != 0xffff) {
- unsigned short *ap = (unsigned short*)nic->node_addr;
- for (i = 0; i < 3; i++)
- *ap++ = read_eeprom(i + 7);
- } else {
- unsigned char *ap = (unsigned char*)nic->node_addr;
- for (i = 0; i < ETH_ALEN; i++)
- *ap++ = inb(ioaddr + MAC0 + i);
- }
+ addr_len = read_eeprom(0,8) == 0x8129 ? 8 : 6;
+ for (i = 0; i < 3; i++)
+ *ap++ = read_eeprom(i + 7,addr_len);
speed10 = inb(ioaddr + MediaStatus) & MSRSpeed10;
fullduplex = inw(ioaddr + MII_BMCR) & BMCRDuplex;
@@ -217,6 +205,10 @@
rtl_reset(nic);
+ if (inb(ioaddr + MediaStatus) & MSRLinkFail) {
+ printf("Cable not connected or other link failure\n");
+ return(0);
+ }
nic->reset = rtl_reset;
nic->poll = rtl_poll;
nic->transmit = rtl_transmit;
@@ -244,22 +236,23 @@
#define eeprom_delay() inl(ee_addr)
/* The EEPROM commands include the alway-set leading bit. */
-#define EE_WRITE_CMD (5 << 6)
-#define EE_READ_CMD (6 << 6)
-#define EE_ERASE_CMD (7 << 6)
+#define EE_WRITE_CMD (5)
+#define EE_READ_CMD (6)
+#define EE_ERASE_CMD (7)
-static int read_eeprom(int location)
+static int read_eeprom(int location, int addr_len)
{
int i;
unsigned int retval = 0;
long ee_addr = ioaddr + Cfg9346;
- int read_cmd = location | EE_READ_CMD;
+ int read_cmd = location | (EE_READ_CMD << addr_len);
outb(EE_ENB & ~EE_CS, ee_addr);
outb(EE_ENB, ee_addr);
+ eeprom_delay();
/* Shift the read command bits out. */
- for (i = 10; i >= 0; i--) {
+ for (i = 4 + addr_len; i >= 0; i--) {
int dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
outb(EE_ENB | dataval, ee_addr);
eeprom_delay();
@@ -279,9 +272,28 @@
/* Terminate the EEPROM access. */
outb(~EE_CS, ee_addr);
+ eeprom_delay();
return retval;
}
+static const unsigned int rtl8139_rx_config =
+ (RX_BUF_LEN_IDX << 11) |
+ (RX_FIFO_THRESH << 13) |
+ (RX_DMA_BURST << 8);
+
+static void set_rx_mode(struct nic *nic) {
+ unsigned int mc_filter[2];
+ int rx_mode;
+ /* !IFF_PROMISC */
+ rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
+ mc_filter[1] = mc_filter[0] = 0xffffffff;
+
+ outl(rtl8139_rx_config | rx_mode, ioaddr + RxConfig);
+
+ outl(mc_filter[0], ioaddr + MAR0 + 0);
+ outl(mc_filter[1], ioaddr + MAR0 + 4);
+}
+
static void rtl_reset(struct nic* nic)
{
int i;
@@ -316,17 +328,24 @@
#ifdef DEBUG_RX
printf("rx ring address is %X\n",(unsigned long)rx_ring);
#endif
- outl((unsigned long)rx_ring, ioaddr + RxBuf);
+ outl((unsigned long)rx_ring, ioaddr + RxBuf);
+
+
- /* Start the chip's Tx and Rx process. */
- outl(0, ioaddr + RxMissed);
- /* set_rx_mode */
- outb(AcceptBroadcast|AcceptMyPhys, ioaddr + RxConfig);
/* If we add multicast support, the MAR0 register would have to be
* initialized to 0xffffffffffffffff (two 32 bit accesses). Etherboot
* only needs broadcast (for ARP/RARP/BOOTP/DHCP) and unicast. */
+
outb(CmdRxEnb | CmdTxEnb, ioaddr + ChipCmd);
+
+ outl(rtl8139_rx_config, ioaddr + RxConfig);
+
+ /* Start the chip's Tx and Rx process. */
+ outl(0, ioaddr + RxMissed);
+ /* set_rx_mode */
+ set_rx_mode(nic);
+
/* Disable all known interrupts by setting the interrupt mask. */
outw(0, ioaddr + IntrMask);
}
@@ -337,10 +356,11 @@
unsigned int status, to, nstype;
unsigned long txstatus;
+ /* nstype assignment moved up here to avoid gcc 3.0.3 compiler bug */
+ nstype = htons(type);
memcpy(tx_buffer, destaddr, ETH_ALEN);
memcpy(tx_buffer + ETH_ALEN, nic->node_addr, ETH_ALEN);
- nstype = htons(type);
- memcpy(tx_buffer + 2 * ETH_ALEN, (char*)&nstype, 2);
+ memcpy(tx_buffer + 2 * ETH_ALEN, &nstype, 2);
memcpy(tx_buffer + ETH_HLEN, data, len);
len += ETH_HLEN;
@@ -354,7 +374,7 @@
tx_buffer[len++] = '\0';
}
- outl((unsigned long)tx_buffer, ioaddr + TxAddr0 + cur_tx*4);
+ outl((unsigned long)tx_buffer, ioaddr + TxAddr0 + cur_tx*4);
outl(((TX_FIFO_THRESH<<11) & 0x003f0000) | len,
ioaddr + TxStatus0 + cur_tx*4);
@@ -448,6 +468,8 @@
static void rtl_disable(struct nic *nic)
{
+ rtl_reset(nic);
+
/* reset the chip */
outb(CmdReset, ioaddr + ChipCmd);

18
src/patches/grub-0.93-special-device-names.patch
View File

@@ -1,18 +0,0 @@
--- grub-0.93/lib/device.c.raid 2002-05-20 05:53:46.000000000 -0400
+++ grub-0.93/lib/device.c 2002-12-28 23:24:10.000000000 -0500
@@ -689,7 +689,14 @@
if (strcmp (dev + strlen(dev) - 5, "/disc") == 0)
strcpy (dev + strlen(dev) - 5, "/part");
}
- sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1);
+
+ sprintf (dev + strlen(dev), "%s%d",
+ /* Compaq smart and others */
+ (strncmp(dev, "/dev/ida/", 9) == 0 ||
+ strncmp(dev, "/dev/ataraid/", 13) == 0 ||
+ strncmp(dev, "/dev/cciss/", 11) == 0 ||
+ strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
+ ((partition >> 16) & 0xFF) + 1);
/* Open the partition. */
fd = open (dev, O_RDWR);

55
src/patches/grub-0.94-i2o.patch
View File

@@ -1,55 +0,0 @@
Only in grub-0.94/docs: grub.info
Only in grub-0.94/docs: multiboot.info
diff -ur grub-0.94/lib/device.c grub-0.94.new/lib/device.c
--- grub-0.94/lib/device.c 2004-05-07 04:50:36.375238696 +0200
+++ grub-0.94.new/lib/device.c 2004-05-07 04:48:57.611253104 +0200
@@ -419,6 +419,12 @@
{
sprintf (name, "/dev/rd/c%dd%d", controller, drive);
}
+
+static void
+get_i2o_disk_name (char *name, int unit)
+{
+ sprintf (name, "/dev/i2o/hd%c", unit + 'a');
+}
#endif
/* Check if DEVICE can be read. If an error occurs, return zero,
@@ -789,6 +795,26 @@
}
}
}
+
+ /* I2O disks. */
+ for (i = 0; i < 8; i++)
+ {
+ char name[16];
+
+ get_i2o_disk_name (name, i);
+ if (check_device (name))
+ {
+ (*map)[num_hd + 0x80] = strdup (name);
+ assert ((*map)[num_hd + 0x80]);
+
+ /* If the device map file is opened, write the map. */
+ if (fp)
+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
+
+ num_hd++;
+ }
+ }
+
#endif /* __linux__ */
/* OK, close the device map file if opened. */
@@ -844,7 +870,8 @@
(strncmp(dev, "/dev/ida/", 9) == 0 ||
strncmp(dev, "/dev/ataraid/", 13) == 0 ||
strncmp(dev, "/dev/cciss/", 11) == 0 ||
- strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
+ strncmp(dev, "/dev/rd/", 8) == 0 ||
+ strncmp(dev, "/dev/i2o/", 9) == 0) ? "p" : "",
((partition >> 16) & 0xFF) + 1);
/* Open the partition. */

18
src/patches/openswan-1.0.1-plutoctl.patch
View File

@@ -1,18 +0,0 @@
diff -ruN openswan-1.0.1.bak/pluto/server.c openswan-1.0.1/pluto/server.c
--- openswan-1.0.1.bak/pluto/server.c 2003-11-17 00:32:11.000000000 +0100
+++ openswan-1.0.1/pluto/server.c 2004-03-12 14:58:00.000000000 +0100
@@ -98,12 +98,13 @@
else
{
/* to keep control socket secure, use umask */
- mode_t ou = umask(~S_IRWXU);
+ mode_t ou = umask(~(S_IRWXU | S_IRWXG));
if (bind(ctl_fd, (struct sockaddr *)&ctl_addr
, offsetof(struct sockaddr_un, sun_path) + strlen(ctl_addr.sun_path)) < 0)
failed = "bind";
umask(ou);
+ chown(ctl_addr.sun_path, 0, 99);
}
/* 5 is a haphazardly chosen limit for the backlog.

342
src/patches/openswan-1.0.6-numif.patch
View File

@@ -1,342 +0,0 @@
--- openswan-1.0.6.old/klips/net/ipsec/ipsec_tunnel.c 2003-12-04 03:03:24.000000000 +0000
+++ openswan-1.0.6/klips/net/ipsec/ipsec_tunnel.c 2004-09-01 21:20:46.870711465 +0100
@@ -3186,6 +3186,174 @@
return 0;
}
+static struct device dev_ipsec15 =
+{
+ "ipsec15\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec14 =
+{
+ "ipsec14\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec13 =
+{
+ "ipsec13\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec12 =
+{
+ "ipsec12\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec11 =
+{
+ "ipsec11\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec10 =
+{
+ "ipsec10\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec9 =
+{
+ "ipsec9\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec8 =
+{
+ "ipsec8\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec7 =
+{
+ "ipsec7\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec6 =
+{
+ "ipsec6\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec5 =
+{
+ "ipsec5\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
+static struct device dev_ipsec4 =
+{
+ "ipsec4\0 ", /* name */
+ 0, /* recv memory end */
+ 0, /* recv memory start */
+ 0, /* memory end */
+ 0, /* memory start */
+ 0x0, /* base I/O address */
+ 0, /* IRQ */
+ 0, 0, 0, /* flags */
+ NULL, /* next device */
+ ipsec_tunnel_probe /* setup */
+};
+
static struct device dev_ipsec3 =
{
"ipsec3\0 ", /* name */
@@ -3277,6 +3445,102 @@
#endif
if (register_netdev(&dev_ipsec3) != 0)
return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec4.name);
+#endif
+ if (register_netdev(&dev_ipsec4) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec5.name);
+#endif
+ if (register_netdev(&dev_ipsec5) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec6.name);
+#endif
+ if (register_netdev(&dev_ipsec6) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec7.name);
+#endif
+ if (register_netdev(&dev_ipsec7) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec8.name);
+#endif
+ if (register_netdev(&dev_ipsec8) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec9.name);
+#endif
+ if (register_netdev(&dev_ipsec9) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec10.name);
+#endif
+ if (register_netdev(&dev_ipsec10) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec11.name);
+#endif
+ if (register_netdev(&dev_ipsec11) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec12.name);
+#endif
+ if (register_netdev(&dev_ipsec12) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec13.name);
+#endif
+ if (register_netdev(&dev_ipsec13) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec14.name);
+#endif
+ if (register_netdev(&dev_ipsec14) != 0)
+ return -EIO;
+#if 0
+ KLIPS_PRINT(debug_tunnel & DB_TN_INIT,
+ "klips_debug:ipsec_tunnel_init_devices: "
+ "registering device %s\n",
+ dev_ipsec15.name);
+#endif
+ if (register_netdev(&dev_ipsec15) != 0)
+ return -EIO;
return 0;
}
@@ -3290,14 +3554,50 @@
unregister_netdev(&dev_ipsec1);
unregister_netdev(&dev_ipsec2);
unregister_netdev(&dev_ipsec3);
+ unregister_netdev(&dev_ipsec4);
+ unregister_netdev(&dev_ipsec5);
+ unregister_netdev(&dev_ipsec6);
+ unregister_netdev(&dev_ipsec7);
+ unregister_netdev(&dev_ipsec8);
+ unregister_netdev(&dev_ipsec9);
+ unregister_netdev(&dev_ipsec10);
+ unregister_netdev(&dev_ipsec11);
+ unregister_netdev(&dev_ipsec12);
+ unregister_netdev(&dev_ipsec13);
+ unregister_netdev(&dev_ipsec14);
+ unregister_netdev(&dev_ipsec15);
kfree(dev_ipsec0.priv);
kfree(dev_ipsec1.priv);
kfree(dev_ipsec2.priv);
kfree(dev_ipsec3.priv);
+ kfree(dev_ipsec4.priv);
+ kfree(dev_ipsec5.priv);
+ kfree(dev_ipsec6.priv);
+ kfree(dev_ipsec7.priv);
+ kfree(dev_ipsec8.priv);
+ kfree(dev_ipsec9.priv);
+ kfree(dev_ipsec10.priv);
+ kfree(dev_ipsec11.priv);
+ kfree(dev_ipsec12.priv);
+ kfree(dev_ipsec13.priv);
+ kfree(dev_ipsec14.priv);
+ kfree(dev_ipsec15.priv);
dev_ipsec0.priv=NULL;
dev_ipsec1.priv=NULL;
dev_ipsec2.priv=NULL;
dev_ipsec3.priv=NULL;
+ dev_ipsec4.priv=NULL;
+ dev_ipsec5.priv=NULL;
+ dev_ipsec6.priv=NULL;
+ dev_ipsec7.priv=NULL;
+ dev_ipsec8.priv=NULL;
+ dev_ipsec9.priv=NULL;
+ dev_ipsec10.priv=NULL;
+ dev_ipsec11.priv=NULL;
+ dev_ipsec12.priv=NULL;
+ dev_ipsec13.priv=NULL;
+ dev_ipsec14.priv=NULL;
+ dev_ipsec15.priv=NULL;
return error;
}
--- openswan-1.0.6.old/klips/net/ipsec/ipsec_tunnel.h 2002-09-05 05:13:17.000000000 +0200
+++ openswan-1.0.6/klips/net/ipsec/ipsec_tunnel.h 2004-08-25 12:30:01.000000000 +0200
@@ -98,7 +98,7 @@
int mtu; /* What is the desired MTU? */
};
-#define IPSEC_NUM_IF 4
+#define IPSEC_NUM_IF 16
extern char ipsec_tunnel_c_version[];

73
src/patches/openswan-1.0.9-restart.patch
View File

@@ -1,73 +0,0 @@
diff -rNu pluto.orig/constants.h pluto/constants.h
--- pluto.orig/constants.h 2004-07-21 16:33:16.000000000 +0200
+++ pluto/constants.h 2004-08-22 22:45:59.000000000 +0200
@@ -298,8 +298,9 @@
/* Dead Peer Detection actions */
enum dpd_action {
- DPD_ACTION_CLEAR = 0,
- DPD_ACTION_HOLD = 1
+ DPD_ACTION_CLEAR = 0,
+ DPD_ACTION_HOLD = 1,
+ DPD_ACTION_RESTART = 2
};
/* Timer events */
diff -rNu pluto.orig/ipsec_doi.c pluto/ipsec_doi.c
--- pluto.orig/ipsec_doi.c 2004-04-03 18:48:10.000000000 +0200
+++ pluto/ipsec_doi.c 2004-08-22 22:32:15.000000000 +0200
@@ -5504,7 +5528,7 @@
action = st->st_connection->dpd_action;
- passert(action == DPD_ACTION_HOLD || action == DPD_ACTION_CLEAR);
+ passert(action == DPD_ACTION_HOLD || action == DPD_ACTION_CLEAR || action == DPD_ACTION_RESTART);
loglog(RC_LOG_SERIOUS, "DPD: Info: No response from peer - declaring peer dead");
@@ -5521,11 +5545,20 @@
force an initiation of the conn again. */
loglog(RC_LOG_SERIOUS, "DPD: Info: Putting connection into %%trap");
- } else {
+ } else if(action == DPD_ACTION_CLEAR) {
/* dpdaction=clear - Wipe the SA, eroute - everything */
loglog(RC_LOG_SERIOUS, "DPD: Info: Clearing Connection");
unroute_connection(c);
+ } else {
+ /* dpdaction=clear - Wipe the SA, eroute - everything, then restart */
+
+ loglog(RC_LOG_SERIOUS, "DPD: Info: Restarting Connection");
+ unroute_connection(c);
+ if (c->kind == CK_PERMANENT) {
+ c->initiated = TRUE;
+ ipsecdoi_initiate(NULL_FD, c, c->policy, 1, SOS_NOBODY);
+ }
}
}
#endif
diff -rNu pluto.orig/whack.c pluto/whack.c
--- pluto.orig/whack.c 2004-03-01 13:54:10.000000000 +0100
+++ pluto/whack.c 2004-08-22 22:34:56.000000000 +0200
@@ -1033,6 +1033,9 @@
if( strcmp(optarg, "hold") == 0) {
msg.dpd_action = DPD_ACTION_HOLD;
}
+ if( strcmp(optarg, "restart") == 0) {
+ msg.dpd_action = DPD_ACTION_RESTART;
+ }
continue;
#endif
@@ -1235,8 +1238,8 @@
diag("dpddelay specified, but dpdtimeout is zero, both should be specified");
if(!msg.dpd_delay && msg.dpd_timeout)
diag("dpdtimeout specified, but dpddelay is zero, both should be specified");
- if(msg.dpd_action != DPD_ACTION_CLEAR && msg.dpd_action != DPD_ACTION_HOLD) {
- diag("dpdaction can only be \"clear\" or \"hold\", defaulting to \"hold\"");
+ if(msg.dpd_action != DPD_ACTION_CLEAR && msg.dpd_action != DPD_ACTION_HOLD && msg.dpd_action != DPD_ACTION_RESTART) {
+ diag("dpdaction can only be \"restart\", \"clear\" or \"hold\", defaulting to \"hold\"");
msg.dpd_action = DPD_ACTION_HOLD;
}
#endif

59334
src/patches/openswan-2.4.7.kernel-2.6-klips.patch Normal file
View File

File diff suppressed because it is too large Load Diff

166
src/patches/openswan-2.4.7.kernel-2.6-natt.patch Normal file
View File

@@ -0,0 +1,166 @@
packaging/utils/nattpatch 2.6
--- /dev/null Tue Mar 11 13:02:56 2003
+++ nat-t/include/net/xfrmudp.h Mon Feb 9 13:51:03 2004
@@ -0,0 +1,10 @@
+/*
+ * pointer to function for type that xfrm4_input wants, to permit
+ * decoupling of XFRM from udp.c
+ */
+#define HAVE_XFRM4_UDP_REGISTER
+
+typedef int (*xfrm4_rcv_encap_t)(struct sk_buff *skb, __u16 encap_type);
+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
+ , xfrm4_rcv_encap_t *oldfunc);
+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
--- /distros/kernel/linux-2.6.11.2/net/ipv4/Kconfig 2005-03-09 03:12:33.000000000 -0500
+++ swan26/net/ipv4/Kconfig 2005-04-04 18:46:13.000000000 -0400
@@ -351,2 +351,8 @@
+config IPSEC_NAT_TRAVERSAL
+ bool "IPSEC NAT-Traversal (KLIPS compatible)"
+ depends on INET
+ ---help---
+ Includes support for RFC3947/RFC3948 NAT-Traversal of ESP over UDP.
+
config IP_TCPDIAG
--- plain26/net/ipv4/udp.c.orig 2006-01-02 22:21:10.000000000 -0500
+++ plain26/net/ipv4/udp.c 2006-01-10 20:07:21.000000000 -0500
@@ -108,11 +108,14 @@
#include <net/inet_common.h>
#include <net/checksum.h>
#include <net/xfrm.h>
+#include <net/xfrmudp.h>
/*
* Snmp MIB for the UDP layer
*/
+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func;
+
DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly;
struct hlist_head udp_hash[UDP_HTABLE_SIZE];
@@ -894,6 +897,42 @@
sk_common_release(sk);
}
+#if defined(CONFIG_XFRM) || defined(CONFIG_IPSEC_NAT_TRAVERSAL)
+
+/* if XFRM isn't a module, then register it directly. */
+#if 0 && !defined(CONFIG_XFRM_MODULE) && !defined(CONFIG_IPSEC_NAT_TRAVERSAL)
+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = xfrm4_rcv_encap;
+#else
+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = NULL;
+#endif
+
+int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
+ , xfrm4_rcv_encap_t *oldfunc)
+{
+ if(oldfunc != NULL) {
+ *oldfunc = xfrm4_rcv_encap_func;
+ }
+
+#if 0
+ if(xfrm4_rcv_encap_func != NULL)
+ return -1;
+#endif
+
+ xfrm4_rcv_encap_func = func;
+ return 0;
+}
+
+int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func)
+{
+ if(xfrm4_rcv_encap_func != func)
+ return -1;
+
+ xfrm4_rcv_encap_func = NULL;
+ return 0;
+}
+#endif /* CONFIG_XFRM_MODULE || CONFIG_IPSEC_NAT_TRAVERSAL */
+
+
/* return:
* 1 if the the UDP system should process it
* 0 if we should drop this packet
@@ -901,9 +940,9 @@
*/
static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
{
-#ifndef CONFIG_XFRM
+#if !defined(CONFIG_XFRM) && !defined(CONFIG_IPSEC_NAT_TRAVERSAL)
return 1;
-#else
+#else /* either CONFIG_XFRM or CONFIG_IPSEC_NAT_TRAVERSAL */
struct udp_sock *up = udp_sk(sk);
struct udphdr *uh = skb->h.uh;
struct iphdr *iph;
@@ -915,11 +954,11 @@
/* if we're overly short, let UDP handle it */
len = skb->len - sizeof(struct udphdr);
if (len <= 0)
- return 1;
+ return 2;
/* if this is not encapsulated socket, then just return now */
if (!encap_type)
- return 1;
+ return 3;
len = skb->tail - udpdata;
@@ -934,7 +973,7 @@
len = sizeof(struct udphdr);
} else
/* Must be an IKE packet.. pass it through */
- return 1;
+ return 4;
break;
case UDP_ENCAP_ESPINUDP_NON_IKE:
/* Check if this is a keepalive packet. If so, eat it. */
@@ -947,7 +986,7 @@
len = sizeof(struct udphdr) + 2 * sizeof(u32);
} else
/* Must be an IKE packet.. pass it through */
- return 1;
+ return 5;
break;
}
@@ -1021,10 +1060,14 @@
return 0;
}
if (ret < 0) {
- /* process the ESP packet */
- ret = xfrm4_rcv_encap(skb, up->encap_type);
- UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
- return -ret;
+ if(xfrm4_rcv_encap_func != NULL) {
+ ret = (*xfrm4_rcv_encap_func)(skb, up->encap_type);
+ UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
+ } else {
+ UDP_INC_STATS_BH(UDP_MIB_INERRORS);
+ ret = 1;
+ }
+ return ret;
}
/* FALLTHROUGH -- it's a UDP Packet */
}
@@ -1114,7 +1157,6 @@
/*
* All we need to do is get the socket, and then do a checksum.
*/
-
int udp_rcv(struct sk_buff *skb)
{
struct sock *sk;
@@ -1571,3 +1613,9 @@
EXPORT_SYMBOL(udp_proc_register);
EXPORT_SYMBOL(udp_proc_unregister);
#endif
+
+#if defined(CONFIG_IPSEC_NAT_TRAVERSAL)
+EXPORT_SYMBOL(udp4_register_esp_rcvencap);
+EXPORT_SYMBOL(udp4_unregister_esp_rcvencap);
+#endif
+