From b8afae864d66d73477acc8c43ff3489d91ccf1cf Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 25 Aug 2014 09:40:39 -0700 Subject: [PATCH] kernel config - Build 'vn' into the kernel * Build vn into the kernel, we are using it in the build system and its not a good idea to kldload it during a buildworld or installworld. --- sys/config/GENERIC | 1 + sys/config/LINT | 14 +++++++------- sys/config/LINT64 | 14 +++++++------- sys/config/SOEKRIS | 2 +- sys/config/VKERNEL | 3 +-- sys/config/VKERNEL64 | 3 +-- sys/config/X86_64_GENERIC | 1 + 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/config/GENERIC b/sys/config/GENERIC index 7b25fceadf..797b381e03 100644 --- a/sys/config/GENERIC +++ b/sys/config/GENERIC @@ -322,6 +322,7 @@ 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 vn # File image "disks" pseudo-device gif # IPv6 and IPv4 tunneling pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) diff --git a/sys/config/LINT b/sys/config/LINT index d710ed5ca2..016413fb9b 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -860,13 +860,13 @@ options SES_ENABLE_PASSTHROUGH # as it is required for `telnetd', `rlogind', `screen', `emacs', and # `xterm', among others. -pseudo-device pty #Pseudo ttys -pseudo-device gzip #Exec gzipped a.out's -pseudo-device vn #Vnode driver (turns a file into a device) -pseudo-device md #Memory/malloc disk -pseudo-device putter #for puffs and pud -pseudo-device snp #Snoop device - to look at pty/vty/etc.. -pseudo-device ccd 4 #Concatenated disk driver +pseudo-device pty # Pseudo ttys +pseudo-device gzip # Exec gzipped a.out's +pseudo-device md # Memory/malloc disk +pseudo-device vn # File image "disks" +pseudo-device putter # for puffs and pud +pseudo-device snp # Snoop device - to look at pty/vty/etc.. +pseudo-device ccd 4 # Concatenated disk driver # Configuring Vinum into the kernel is not necessary, since the kld # module gets started automatically when vinum(8) starts. This diff --git a/sys/config/LINT64 b/sys/config/LINT64 index e39e54b042..f922d9f329 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -777,13 +777,13 @@ options SES_ENABLE_PASSTHROUGH # as it is required for `telnetd', `rlogind', `screen', `emacs', and # `xterm', among others. -pseudo-device pty #Pseudo ttys -pseudo-device gzip #Exec gzipped a.out's -pseudo-device vn #Vnode driver (turns a file into a device) -pseudo-device md #Memory/malloc disk -pseudo-device putter #for puffs and pud -pseudo-device snp #Snoop device - to look at pty/vty/etc.. -pseudo-device ccd 4 #Concatenated disk driver +pseudo-device pty # Pseudo ttys +pseudo-device gzip # Exec gzipped a.out's +pseudo-device md # Memory/malloc disk +pseudo-device vn # File image "disks" +pseudo-device putter # for puffs and pud +pseudo-device snp # Snoop device - to look at pty/vty/etc.. +pseudo-device ccd 4 # Concatenated disk driver # Configuring Vinum into the kernel is not necessary, since the kld # module gets started automatically when vinum(8) starts. This diff --git a/sys/config/SOEKRIS b/sys/config/SOEKRIS index ef542053ed..257830202b 100644 --- a/sys/config/SOEKRIS +++ b/sys/config/SOEKRIS @@ -80,7 +80,6 @@ device da # Direct Access (disks) device pass # Passthrough device (direct SCSI access) device sg # Passthrough device (linux scsi generic) - # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 @@ -159,6 +158,7 @@ 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 vn # File image "disks" pseudo-device gif # IPv6 and IPv4 tunneling pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) diff --git a/sys/config/VKERNEL b/sys/config/VKERNEL index dad55b4b1f..92ebce1799 100644 --- a/sys/config/VKERNEL +++ b/sys/config/VKERNEL @@ -80,6 +80,7 @@ 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 vn # File image "disks" pseudo-device gif # IPv6 and IPv4 tunneling pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) @@ -98,8 +99,6 @@ pseudo-device bpf #Berkeley packet filter # VIRTUAL DEVICES # -device vn device vkd device vke - device vcd diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64 index 29d68cb459..76bba85a7d 100644 --- a/sys/config/VKERNEL64 +++ b/sys/config/VKERNEL64 @@ -75,6 +75,7 @@ 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 vn # File image "disks" pseudo-device gif # IPv6 and IPv4 tunneling pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) @@ -93,8 +94,6 @@ pseudo-device bpf #Berkeley packet filter # VIRTUAL DEVICES # -device vn device vkd device vke - device vcd diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC index f99a0dd9eb..5b07176a9f 100644 --- a/sys/config/X86_64_GENERIC +++ b/sys/config/X86_64_GENERIC @@ -296,6 +296,7 @@ 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 vn # File image "disks" pseudo-device gif # IPv6 and IPv4 tunneling pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) -- 2.41.0