From 91856cf5ffc1c463b9e1c638274c612e7fa8b4e5 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 24 May 2011 14:05:04 +0200 Subject: [PATCH] nrelease/installer: No longer build and offer separate UP and SMP kernels. Due to sephe's recent work, SMP kernels should boot on UP machines as well. This is to give his work more exposure. Also remove the (now redundant) *_SMP configs. In-discussion-with: sephe --- nrelease/Makefile | 20 +- share/installer/cmdnames.conf | 3 - sys/boot/dloader/dloader.menu | 23 -- sys/config/GENERIC_SMP | 359 ------------------ sys/config/X86_64_GENERIC_SMP | 334 ---------------- .../installer/dfuibe_installer/fn_install.c | 18 - 6 files changed, 5 insertions(+), 752 deletions(-) delete mode 100644 sys/config/GENERIC_SMP delete mode 100644 sys/config/X86_64_GENERIC_SMP diff --git a/nrelease/Makefile b/nrelease/Makefile index bf45db292e..780333224d 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -30,9 +30,9 @@ MACHINE_ARCH= x86_64 # XXX makeshift fix to build the right kernel for the (target) architecture # We should configure this in the platform files somehow .if ${MACHINE_ARCH} == "i386" -KERNCONF ?= GENERIC GENERIC_SMP +KERNCONF ?= GENERIC .else -KERNCONF ?= X86_64_GENERIC X86_64_GENERIC_SMP +KERNCONF ?= X86_64_GENERIC .endif PKGSRC_PREFIX?= /usr/pkg @@ -250,20 +250,10 @@ buildiso: cpdup ${ISOROOT}/etc ${ISOROOT}/etc.hdd cd ${.CURDIR}/..; \ for kernconf in ${KERNCONF}; do \ - make DESTDIR=${ISOROOT} installkernel \ - KERNCONF=$${kernconf} \ - DESTKERNDIR=/boot/kernel.$${kernconf} \ - INSTALLSTRIPPEDMODULES=y; \ - ln -s kernel ${ISOROOT}/boot/kernel.$${kernconf}/kernel.BOOTP; \ - rm -rf ${ISOROOT}/boot/kernel.$${kernconf}.old; \ + make DESTDIR=${ISOROOT} installkernel KERNCONF=$${kernconf}; \ done -.if ${MACHINE_ARCH} == "i386" - mv ${ISOROOT}/boot/kernel.GENERIC ${ISOROOT}/boot/kernel.UP - mv ${ISOROOT}/boot/kernel.GENERIC_SMP ${ISOROOT}/boot/kernel.SMP -.else - mv ${ISOROOT}/boot/kernel.X86_64_GENERIC ${ISOROOT}/boot/kernel.UP - mv ${ISOROOT}/boot/kernel.X86_64_GENERIC_SMP ${ISOROOT}/boot/kernel.SMP -.endif + rm -rf ${ISOROOT}/boot/kernel.old + ln -s kernel ${ISOROOT}/boot/kernel/kernel.BOOTP mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.local.dist -p ${ISOROOT}/usr/local/ mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.var.dist -p ${ISOROOT}/var dev_mkdb -f ${ISOROOT}/var/run/dev.db ${ISOROOT}/dev diff --git a/share/installer/cmdnames.conf b/share/installer/cmdnames.conf index 299655657e..a1d4325a6e 100644 --- a/share/installer/cmdnames.conf +++ b/share/installer/cmdnames.conf @@ -1,6 +1,5 @@ # Command names for DragonFly installer backend. # $Id: cmdnames.conf,v 1.15 2005/04/08 02:29:17 cpressey Exp $ -# $DragonFly: src/share/installer/cmdnames.conf,v 1.3 2008/08/30 16:47:47 hasso Exp $ # This is in Bourne shell syntax so that it is easily editable; # it is also sourced by the installer, a C program. @@ -42,7 +41,6 @@ NEWFS_HAMMER=sbin/newfs_hammer NEWFS_MSDOS=sbin/newfs_msdos NFSD=sbin/nfsd ROUTE=sbin/route -SYSCTL=sbin/sysctl SWAPOFF=sbin/swapoff SWAPON=sbin/swapon UMOUNT=sbin/umount @@ -50,7 +48,6 @@ UMOUNT=sbin/umount AWK=usr/bin/awk BUNZIP2=usr/bin/bunzip2 CHFLAGS=usr/bin/chflags -DIRNAME=usr/bin/dirname GREP=usr/bin/grep KILLALL=usr/bin/killall SED=usr/bin/sed diff --git a/sys/boot/dloader/dloader.menu b/sys/boot/dloader/dloader.menu index b73ba895b9..dab7df6cb4 100644 --- a/sys/boot/dloader/dloader.menu +++ b/sys/boot/dloader/dloader.menu @@ -28,17 +28,10 @@ acpi_load="YES" ahci_load="YES" ehci_load="YES" -# Default boot /boot/kernel/ is the user-installed kernel and -# is always checked first. Otherwise fallback to generic kernels. -# ifset default_kernel # already selected a kernel elseifexists kernel set default_kernel=kernel -elseifexists kernel.UP - set default_kernel=kernel.UP -elseifexists kernel.SMP - set default_kernel=kernel.SMP else set default_kernel=kernel endif @@ -164,21 +157,5 @@ menuadd loadall menuadd boot menuadd set autoboot_delay=NO -ifexists kernel.UP -menuitem u "Select UP kernel" -menuadd set default_kernel=kernel.UP -menuadd include ${base}defaults/dloader.menu -menuadd optinclude ${base}dloader.menu -menuadd menu -endif - -ifexists kernel.SMP -menuitem m "Select SMP kernel" -menuadd set default_kernel=kernel.SMP -menuadd include ${base}defaults/dloader.menu -menuadd optinclude ${base}dloader.menu -menuadd menu -endif - menuitem R "Reboot" menuadd reboot diff --git a/sys/config/GENERIC_SMP b/sys/config/GENERIC_SMP deleted file mode 100644 index 19f4d36de7..0000000000 --- a/sys/config/GENERIC_SMP +++ /dev/null @@ -1,359 +0,0 @@ -# -# GENERIC_SMP -- Generic kernel configuration file for DragonFly/i386 -# -# Check the LINT configuration file in sys/config, for an -# exhaustive list of options. -# -platform pc32 -machine i386 -machine_arch i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident GENERIC_SMP -maxusers 0 - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - -options MATH_EMULATE #Support for x87 emulation -options INET #InterNETworking -options INET6 #IPv6 communications protocols -options HAMMER #Hammer Filesystem -options NULLFS #NULL filesystem -options FFS #Berkeley Fast Filesystem -options FFS_ROOT #FFS usable as root device [keep this!] -options SOFTUPDATES #Enable FFS soft updates support -options UFS_DIRHASH #Improve performance on big directories -options MFS #Memory Filesystem -options TMPFS #Temporary Filesystem -options MD_ROOT #MD is a potential root device -options NFS #Network Filesystem -options NFS_ROOT #NFS usable as root device, NFS required -options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -options PROCFS #Process filesystem -options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_DF12 #Compatible with DragonFly 1.2 and earlier -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options DEVICE_POLLING # Support mixed interrupt-polling - # handling of network device drivers -options UCONSOLE #Allow users to grab the console -options USERCONFIG #boot -c editor -options VISUAL_USERCONFIG #visual boot -c editor -options KTRACE #ktrace(1) support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores -options P1003_1B #Posix P1003_1B real-time extensions -options _KPOSIX_PRIORITY_SCHEDULING -options ICMP_BANDLIM #Rate limit bad replies -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options DSCHED_FQ # Fair-queuing disk scheduler - -# ALTQ -options ALTQ #alternate queueing -options ALTQ_CBQ #class based queueing -options ALTQ_RED #random early detection -options ALTQ_RIO #triple red for diffserv (needs RED) -options ALTQ_HFSC #hierarchical fair service curve -options ALTQ_PRIQ #priority queue -options ALTQ_FAIRQ #fair queueing -#options ALTQ_NOPCC #don't use processor cycle counter -#options ALTQ_DEBUG #for debugging - -# SMP boxes should normally be build with SMP and APIC_IO. If SMP has -# interrupt routing problems in APIC_IO you can disable it with the -# hw.apic_io_enable=0 tunable or by building without the APIC_IO option. -# -# -options SMP # Symmetric MultiProcessor Kernel -options APIC_IO # hw.apic_io_enable = 1 by default - -# Debugging for Development -options DDB -options DDB_TRACE -options INVARIANTS - -device isa -device pci - -# Floppy drives -device fdc0 at isa? port IO_FD1 irq 6 drq 2 -device fd0 at fdc0 drive 0 -device fd1 at fdc0 drive 1 -# -# If you have a Toshiba Libretto with its Y-E Data PCMCIA floppy, -# don't use the above line for fdc0 but the following one: -#device fdc0 - -# AHCI driver, this will override NATA for AHCI devices, -# both drivers may be included. -# -device ahci - -# SiI3124/3132 driver -# -device sili - -# NEW-ATA (NATA) and ATAPI devices -# -device nata -device natadisk # ATA disk drives -device natapicd # ATAPI CDROM drives -device natapifd # ATAPI floppy drives -device natapist # ATAPI tape drives -device natapicam # Emulate ATAPI devices as SCSI -device nataraid # support for ATA software RAID - # controllers -device natausb # ATA-over-USB support -options ATA_STATIC_ID # Static device numbering - -# LEGACY ATA and ATAPI devices -#device ata0 at isa? port IO_WD1 irq 14 -#device ata1 at isa? port IO_WD2 irq 15 -#device ata -#device atadisk # ATA disk drives -#device atapicd # ATAPI CDROM drives -#device atapifd # ATAPI floppy drives -#device atapist # ATAPI tape drives -#device atapicam # Emulate ATAPI devices as SCSI via CAM -#options ATA_STATIC_ID #Static device numbering - -# SCSI Controllers -device ahc # AHA2940 and onboard AIC7xxx devices -device ahd # AHA39320/29320 and onboard AIC79xx devices -device amd # AMD 53C974 (Tekram DC-390(T)) -device isp # Qlogic family -device mpt # LSI-Logic MPT/Fusion -device ncr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets) -options SYM_SETUP_LP_PROBE_MAP=0x40 - # Allow ncr to attach legacy NCR devices when - # both sym and ncr are configured - -device adv0 at isa? -device adw -device bt0 at isa? -device aha0 at isa? -device aic0 at isa? - -device ncv # NCR 53C500 -device nsp # Workbit Ninja SCSI-3 -device stg # TMC 18C30/18C50 - -# SCSI peripherals -device scbus # SCSI bus (required) -device da # Direct Access (disks) -device sa # Sequential Access (tape etc) -device cd # CD -device pass # Passthrough device (direct SCSI access) -device sg # Passthrough device (linux scsi generic) - -# RAID controllers interfaced to the SCSI subsystem -device arcmsr # Areca SATA II RAID -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq SmartRAID 5* series -device dpt # DPT Smartcache - See LINT for options! -device hptiop # Highpoint RocketRaid 3xxx series -device hptmv # Highpoint RocketRAID 182x -device iir # Intel Integrated RAID -device mly # Mylex AcceleRAID/eXtremeRAID -device twa # 3ware 9000 series PATA/SATA RAID -device tws # 3ware 9750 series SATA/SAS RAID - -# RAID controllers -device aac # Adaptec FSA RAID, Dell PERC2/PERC3 -device aacp # SCSI passthrough for aac (requires CAM) -device amr # AMI MegaRAID -device amrp # SCSI Passthrough interface (optional, CAM req.) -device ida # Compaq Smart RAID -device ips # IBM ServeRAID -device mlx # Mylex DAC960 family -device mfi # LSI MegaRAID SAS -device mfip # LSI MegaRAID SAS passthrough, requires CAM -device pst # Promise Supertrack -device twe # 3ware Escalade 7000/8000's - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc0 at isa? port IO_KBD -device atkbd0 at atkbdc? irq 1 flags 0x1 -device psm0 at atkbdc? irq 12 - -device vga0 at isa? - -# kbdmux is the keyboard multiplexer -device kbdmux - -# splash screen/screen saver -pseudo-device splash - -# syscons is the default console driver, resembling an SCO console -device sc0 at isa? flags 0x100 -options SC_PIXEL_MODE # add support for the raster text mode - -device agp # support several AGP chipsets - -# Floating point support - do not disable. -device npx0 at nexus? port IO_NPX irq 13 - -# Power management support (see LINT for more options) -device apm0 at nexus? disable flags 0x20 # Advanced Power Management - -# HW monitoring devices -device aps0 at isa? port 0x1600 -device lm0 at isa? port 0x290 -device it0 at isa? port 0x290 -device it1 at isa? port 0xc00 -device it2 at isa? port 0xd00 -device it3 at isa? port 0x228 -device wbsio0 at isa? port 0x2e -device wbsio1 at isa? port 0x4e -device lm#3 at wbsio? - -# PCCARD (PCMCIA) support -device pccard -device cardbus -device cbb - -# Serial (COM) ports -device sio0 at isa? port IO_COM1 flags 0x10 irq 4 -device sio1 at isa? port IO_COM2 irq 3 -device sio2 at isa? disable port IO_COM3 irq 5 -device sio3 at isa? disable port IO_COM4 irq 9 - -# Parallel port -device ppc0 at isa? irq 7 -device ppbus # Parallel port bus (required) -device lpt # Printer -device plip # TCP/IP over parallel -device ppi # Parallel port interface device -#device vpo # Requires scbus and da - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -device em # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'') - # Requires ig_hal -device ig_hal # Intel PRO/1000 hardware abstraction layer - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device ae # Attansic/Atheros L2 Fast Ethernet -device age # Attansic/Atheros L1 Gigabit Ethernet -device alc # Atheros AR8131/AR8132 -device ale # Atheros AR8121/AR8113/AR8114 -device bce # Broadcom NetXtreme II Gigabit Ethernet -device bfe # Broadcom BCM440x 10/100 Ethernet -device dc # DEC/Intel 21143 and various workalikes -device et # Agere ET1310 10/100/1000 Ethernet -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device jme # JMicron Gigabit/Fast Ethernet -device pcn # AMD Am79C97x PCI 10/100 NICs -device rl # RealTek 8129/8139 -device re # RealTek 8139C+/8169 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect GEnesis, LinkSys EG1023, D-Link -device ste # Sundance ST201 (D-Link DFE-550TX) -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA 612x GigE -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -device bge # Broadcom BCM570x (``Tigon III'') -device stge # Sundance/Tamarack TC9021 Gigabit Ethernet -device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet -device nfe # NVIDIA nForce MCP 10/100/Gigabit Ethernet - -# ISA Ethernet NICs. -# 'device ed' requires 'device miibus' -device ed0 at isa? disable port 0x280 irq 10 iomem 0xd8000 -device ex -device ep -device fe0 at isa? disable port 0x300 -# Xircom Ethernet -device xe - -# Wireless NIC cards -options IEEE80211_DEBUG #enable debugging msgs -options IEEE80211_SUPPORT_MESH #enable 802.11s D3.0 support -options IEEE80211_SUPPORT_TDMA #enable TDMA support -device wlan # 802.11 support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support -device wlan_wep # 802.11 WEP support -#device wlan_amrr # AMRR - -# All wireless NICs require wlan and wlan_amrr -# Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will -# work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP -# mode (the factory default). If you set the switches on your ISA -# card for a manually chosen I/O address and IRQ, you must specify -# those parameters here. -device an -device ral # Ralink Technology 802.11 wireless NIC -#device rtw # RealTek 802.11 wireless NIC -# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really -# exists only as a PCMCIA device, so there is no ISA attachment needed -# and resources will always be dynamically assigned by the pccard code. -device wi - -# The probe order of these is presently determined by i386/isa/isa_compat.c. -device ie0 at isa? disable port 0x300 irq 10 iomem 0xd0000 -#device le0 at isa? disable port 0x300 irq 5 iomem 0xd0000 -device lnc0 at isa? disable port 0x280 irq 10 drq 0 -device cs0 at isa? disable port 0x300 -device sn0 at isa? disable port 0x300 irq 10 - -# Pseudo devices - the number indicates how many units to allocate. -pseudo-device loop # Network loopback -pseudo-device ether # Ethernet support -pseudo-device sl 1 # Kernel SLIP -pseudo-device ppp 1 # Kernel PPP -pseudo-device tun # Packet tunnel. -pseudo-device pty # Pseudo-ttys (telnet etc) -pseudo-device md # Memory "disks" -pseudo-device gif # IPv6 and IPv4 tunneling -pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) - -# The `bpf' pseudo-device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -pseudo-device bpf #Berkeley packet filter - -pseudo-device crypto # core crypto support, used by wlan -pseudo-device cryptodev - -# USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse -device uscanner # Scanners -device urio # Diamond Rio MP3 Player -# USB Ethernet, requires mii -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB Ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet -device rue # RealTek 8150 based USB ethernet -# USB wireless NICs, requires wlan, wlan_amrr -#device rum # Ralink Technology RT2501USB/RT2601USB -#device ural # Ralink Technology RT2500USB - -# FireWire support -device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) diff --git a/sys/config/X86_64_GENERIC_SMP b/sys/config/X86_64_GENERIC_SMP deleted file mode 100644 index 22a3114c01..0000000000 --- a/sys/config/X86_64_GENERIC_SMP +++ /dev/null @@ -1,334 +0,0 @@ -# -# X86_64_GENERIC_SMP -- Generic kernel configuration file for DragonFly/x86_64 -# -# Check the LINT configuration file in sys/config, for an -# exhaustive list of options. -# -platform pc64 -machine x86_64 -machine_arch x86_64 -cpu HAMMER_CPU -ident X86_64_GENERIC_SMP -maxusers 0 - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - -options INET #InterNETworking -options INET6 #IPv6 communications protocols -options HAMMER #Hammer Filesystem -options NULLFS #NULL filesystem -options FFS #Berkeley Fast Filesystem -options FFS_ROOT #FFS usable as root device [keep this!] -options SOFTUPDATES #Enable FFS soft updates support -options UFS_DIRHASH #Improve performance on big directories -options MFS #Memory Filesystem -options TMPFS #Temporary Filesystem -options MD_ROOT #MD is a potential root device -options NFS #Network Filesystem -options NFS_ROOT #NFS usable as root device, NFS required -options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -options PROCFS #Process filesystem -options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options DEVICE_POLLING # Support mixed interrupt-polling - # handling of network device drivers -options UCONSOLE #Allow users to grab the console -options KTRACE #ktrace(1) support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores -options P1003_1B #Posix P1003_1B real-time extensions -options _KPOSIX_PRIORITY_SCHEDULING -options ICMP_BANDLIM #Rate limit bad replies -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options DSCHED_FQ # Fair-queuing disk scheduler - -# ALTQ -options ALTQ #alternate queueing -options ALTQ_CBQ #class based queueing -options ALTQ_RED #random early detection -options ALTQ_RIO #triple red for diffserv (needs RED) -options ALTQ_HFSC #hierarchical fair service curve -options ALTQ_PRIQ #priority queue -options ALTQ_FAIRQ #fair queueing -#options ALTQ_NOPCC #don't use processor cycle counter -#options ALTQ_DEBUG #for debugging - - -# SMP boxes should normally be build with SMP and APIC_IO. If SMP has -# interrupt routing problems in APIC_IO you can disable it with the -# hw.apic_io_enable=0 tunable or by building without the APIC_IO option. -# -# -options SMP # Symmetric MultiProcessor Kernel -options APIC_IO # hw.apic_io_enable = 1 by default - -# Debugging for Development -options DDB -options DDB_TRACE -options INVARIANTS - -device isa -device pci - -# AHCI driver, this will override NATA for AHCI devices, -# both drivers may be included. -# -device ahci - -# SiI3124/3132 driver -# -device sili - -# NEW-ATA (NATA) and ATAPI devices -# -device nata -device natadisk # ATA disk drives -device natapicd # ATAPI CDROM drives -device natapifd # ATAPI floppy drives -device natapist # ATAPI tape drives -device natapicam # Emulate ATAPI devices as SCSI -device nataraid # support for ATA software RAID - # controllers -device natausb # ATA-over-USB support -options ATA_STATIC_ID # Static device numbering - -# LEGACY ATA and ATAPI devices -#device ata0 at isa? port IO_WD1 irq 14 -#device ata1 at isa? port IO_WD2 irq 15 -#device ata -#device atadisk # ATA disk drives -#device atapicd # ATAPI CDROM drives -#device atapifd # ATAPI floppy drives -#device atapist # ATAPI tape drives -#device atapicam # Emulate ATAPI devices as SCSI via CAM -#options ATA_STATIC_ID #Static device numbering - -# SCSI Controllers -device ahc # AHA2940 and onboard AIC7xxx devices -device ahd # AHA39320/29320 and onboard AIC79xx devices -device amd # AMD 53C974 (Tekram DC-390(T)) -device isp # Qlogic family -device mpt # LSI-Logic MPT/Fusion -device ncr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets) -options SYM_SETUP_LP_PROBE_MAP=0x40 - # Allow ncr to attach legacy NCR devices when - # both sym and ncr are configured - -device adv0 at isa? -device adw -device bt0 at isa? -device aha0 at isa? -device aic0 at isa? - -device ncv # NCR 53C500 -device nsp # Workbit Ninja SCSI-3 -device stg # TMC 18C30/18C50 - -# SCSI peripherals -device scbus # SCSI bus (required) -device da # Direct Access (disks) -device sa # Sequential Access (tape etc) -device cd # CD -device pass # Passthrough device (direct SCSI access) -device sg # Passthrough device (linux scsi generic) - -# RAID controllers interfaced to the SCSI subsystem -device arcmsr # Areca SATA II RAID -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq SmartRAID 5* series -device dpt # DPT Smartcache - See LINT for options! -device hptiop # Highpoint RocketRaid 3xxx series -device hptmv # Highpoint RocketRAID 182x -device iir # Intel Integrated RAID -device mly # Mylex AcceleRAID/eXtremeRAID -device twa # 3ware 9000 series PATA/SATA RAID -device tws # 3ware 9750 series SATA/SAS RAID - -# RAID controllers -device aac # Adaptec FSA RAID, Dell PERC2/PERC3 -device aacp # SCSI passthrough for aac (requires CAM) -device amr # AMI MegaRAID -device amrp # SCSI Passthrough interface (optional, CAM req.) -device ida # Compaq Smart RAID -device ips # IBM ServeRAID -device mlx # Mylex DAC960 family -device mfi # LSI MegaRAID SAS -device mfip # LSI MegaRAID SAS passthrough, requires CAM -device twe # 3ware Escalade 7000/8000's - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc0 at isa? port IO_KBD -device atkbd0 at atkbdc? irq 1 flags 0x1 -device psm0 at atkbdc? irq 12 - -device vga0 at isa? - -# kbdmux is the keyboard multiplexer -device kbdmux - -# splash screen/screen saver -pseudo-device splash - -# syscons is the default console driver, resembling an SCO console -device sc0 at isa? flags 0x100 -options SC_PIXEL_MODE # add support for the raster text mode - -device agp # support several AGP chipsets - -# HW monitoring devices -device aps0 at isa? port 0x1600 -device lm0 at isa? port 0x290 -device it0 at isa? port 0x290 -device it1 at isa? port 0xc00 -device it2 at isa? port 0xd00 -device it3 at isa? port 0x228 -device wbsio0 at isa? port 0x2e -device wbsio1 at isa? port 0x4e -device lm#3 at wbsio? - -# PCCARD (PCMCIA) support -device pccard -device cardbus -device cbb - -# Serial (COM) ports -device sio0 at isa? port IO_COM1 flags 0x10 irq 4 -device sio1 at isa? port IO_COM2 irq 3 -device sio2 at isa? disable port IO_COM3 irq 5 -device sio3 at isa? disable port IO_COM4 irq 9 - -# Parallel port -device ppc0 at isa? irq 7 -device ppbus # Parallel port bus (required) -device lpt # Printer -device plip # TCP/IP over parallel -device ppi # Parallel port interface device -#device vpo # Requires scbus and da - - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -device em # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'') - # Requires ig_hal -device ig_hal # Intel PRO/1000 hardware abstraction layer - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device ae # Attansic/Atheros L2 Fast Ethernet -device age # Attansic/Atheros L1 Gigabit Ethernet -device alc # Atheros AR8131/AR8132 -device ale # Atheros AR8121/AR8113/AR8114 -device bce # Broadcom NetXtreme II Gigabit Ethernet -device bfe # Broadcom BCM440x 10/100 Ethernet -device dc # DEC/Intel 21143 and various workalikes -device et # Agere ET1310 10/100/1000 Ethernet -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device jme # JMicron Gigabit/Fast Ethernet -device pcn # AMD Am79C97x PCI 10/100 NICs -device rl # RealTek 8129/8139 -device re # RealTek 8139C+/8169 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect GEnesis, LinkSys EG1023, D-Link -device ste # Sundance ST201 (D-Link DFE-550TX) -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA 612x GigE -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -device bge # Broadcom BCM570x (``Tigon III'') -device stge # Sundance/Tamarack TC9021 Gigabit Ethernet -device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet -device nfe # NVIDIA nForce MCP 10/100/Gigabit Ethernet - -# ISA Ethernet NICs. -# 'device ed' requires 'device miibus' -device ed0 at isa? disable port 0x280 irq 10 iomem 0xd8000 -device ex -# Xircom Ethernet -device xe - -# Wireless NIC cards -options IEEE80211_DEBUG #enable debugging msgs -options IEEE80211_SUPPORT_MESH #enable 802.11s D3.0 support -options IEEE80211_SUPPORT_TDMA #enable TDMA support -device wlan # 802.11 support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support -device wlan_wep # 802.11 WEP support -#device wlan_amrr # AMRR - -# Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will -# work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP -# mode (the factory default). If you set the switches on your ISA -# card for a manually chosen I/O address and IRQ, you must specify -# those parameters here. -device an -device ral # Ralink Technology 802.11 wireless NIC -#device rtw # RealTek 802.11 wireless NIC -# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really -# exists only as a PCMCIA device, so there is no ISA attachment needed -# and resources will always be dynamically assigned by the pccard code. -device wi - -# The probe order of these is presently determined by i386/isa/isa_compat.c. -#device le0 at isa? disable port 0x300 irq 5 iomem 0xd0000 -device lnc0 at isa? disable port 0x280 irq 10 drq 0 -device cs0 at isa? disable port 0x300 -device sn0 at isa? disable port 0x300 irq 10 - -# Pseudo devices - the number indicates how many units to allocate. -pseudo-device loop # Network loopback -pseudo-device ether # Ethernet support -pseudo-device sl 1 # Kernel SLIP -pseudo-device ppp 1 # Kernel PPP -pseudo-device tun # Packet tunnel. -pseudo-device pty # Pseudo-ttys (telnet etc) -pseudo-device md # Memory "disks" -pseudo-device gif # IPv6 and IPv4 tunneling -pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) - -# The `bpf' pseudo-device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -pseudo-device bpf #Berkeley packet filter - -pseudo-device crypto # core crypto support, used by wlan - -# USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse -device uscanner # Scanners -device urio # Diamond Rio MP3 Player -# USB Ethernet, requires mii -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB Ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet -device rue # RealTek 8150 based USB ethernet -# USB wireless NICs, requires wlan, wlan_amrr -#device rum # Ralink Technology RT2501USB/RT2601USB -#device ural # Ralink Technology RT2500USB - -# FireWire support -device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) diff --git a/usr.sbin/installer/dfuibe_installer/fn_install.c b/usr.sbin/installer/dfuibe_installer/fn_install.c index c9e161d172..95a5d9f2c6 100644 --- a/usr.sbin/installer/dfuibe_installer/fn_install.c +++ b/usr.sbin/installer/dfuibe_installer/fn_install.c @@ -660,24 +660,6 @@ fn_install_os(struct i_fn_args *a) command_add(cmds, "%s%s 600 %smnt/var/log/install.log", a->os_root, cmd_name(a, "CHMOD"), a->os_root); - /* - * Move the kernel used for booting (kernel.UP or kernel.SMP) to - * /boot/kernel and remove the other kernel - */ - command_add(cmds, - "%s%s %smnt`%s%s $(%s%s -n kern.bootfile)` %smnt/boot/kernel", - a->os_root, cmd_name(a, "MV"), - a->os_root, - a->os_root, cmd_name(a, "DIRNAME"), - a->os_root, cmd_name(a, "SYSCTL"), - a->os_root); - command_add(cmds, - "%s%s -R noschg %smnt/boot/kernel.[SU]M*P; %s%s -rf %smnt/boot/kernel.[SU]M*P", - a->os_root, cmd_name(a, "CHFLAGS"), - a->os_root, - a->os_root, cmd_name(a, "RM"), - a->os_root); - /* Do some preparation if encrypted partitions were configured */ if (needcrypt) { command_add(cmds, -- 2.41.0