PERFORCE change 40249 for review
Robert Watson
rwatson at FreeBSD.org
Thu Oct 23 02:44:03 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=40249
Change 40249 by rwatson at rwatson_paprika on 2003/10/22 19:43:41
Integrate trustedbsd_sebsd etc tree forward to 39070, the last
major integration of the trustedbsd_mac branch, which brings in
many of the major changes in the last four months to the main
FreeBSD tree. This includes substantial lock pushdown,
threading bug fixes, compiler upgrades, et al.
Affected files ...
.. //depot/projects/trustedbsd/sebsd/etc/Makefile#5 integrate
.. //depot/projects/trustedbsd/sebsd/etc/defaults/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/defaults/devfs.rules#1 branch
.. //depot/projects/trustedbsd/sebsd/etc/defaults/pccard.conf#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/defaults/rc.conf#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/devd.conf#3 integrate
.. //depot/projects/trustedbsd/sebsd/etc/etc.ia64/ttys#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/etc.sparc64/ttys#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/gettytab#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/isdn/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.local.dist#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.root.dist#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.usr.dist#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/network.subr#3 integrate
.. //depot/projects/trustedbsd/sebsd/etc/newsyslog.conf#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/pccard_ether#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/devfs#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/dhclient#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/initdiskless#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipfilter#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/jail#3 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/ldconfig#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/localdaemons#4 delete
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/network1#4 delete
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/network2#4 delete
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/network3#4 delete
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/routing#3 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.subr#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/sendmail/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/services#4 integrate
Differences ...
==== //depot/projects/trustedbsd/sebsd/etc/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.315 2003/07/06 19:23:31 gshapiro Exp $
+# $FreeBSD: src/etc/Makefile,v 1.319 2003/09/27 17:33:03 markm Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -11,7 +11,7 @@
hosts hosts.allow hosts.equiv hosts.lpd \
inetd.conf login.access login.conf \
mac.conf motd netconfig network.subr networks newsyslog.conf \
- phones printcap profile protocols \
+ phones profile protocols \
rc.firewall rc.firewall6 rc.sendmail \
rc.subr remote rpc services \
shells sysctl.conf syslog.conf usbd.conf \
@@ -20,7 +20,7 @@
${.CURDIR}/../usr.bin/mail/misc/mail.rc \
${.CURDIR}/../usr.bin/locate/locate/locate.rc
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
SSH= ${.CURDIR}/../crypto/openssh/ssh_config \
${.CURDIR}/../crypto/openssh/sshd_config \
@@ -32,8 +32,6 @@
# -rwxr-xr-x root:wheel, for the new cron root:wheel
BIN2= netstart pccard_ether rc.suspend rc.resume rc rc.shutdown
-DEFAULTS= rc.conf pccard.conf periodic.conf
-
MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
BSD.var.dist BSD.x11.dist BSD.x11-4.dist
.if !defined(NO_SENDMAIL)
@@ -71,8 +69,7 @@
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
- cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${DEFAULTS} ${DESTDIR}/etc/defaults
+ cd ${.CURDIR}/defaults; ${MAKE} install
cd ${.CURDIR}/periodic; ${MAKE} install
cd ${.CURDIR}/rc.d; ${MAKE} install
cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
@@ -82,10 +79,15 @@
.if !defined(NO_I4B)
cd ${.CURDIR}/isdn; ${MAKE} install
.endif
+.if !defined(NO_LPR)
+ cd ${.CURDIR}; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ printcap ${DESTDIR}/etc
+.endif
.if !defined(NO_SENDMAIL)
cd ${.CURDIR}/sendmail; ${MAKE} distribution
.endif
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSH} ${DESTDIR}/etc/ssh
@@ -113,7 +115,7 @@
${MTREE} ${DESTDIR}/etc/mtree
cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${NAMEDB} ${DESTDIR}/etc/namedb
- cd ${.CURDIR}/ppp; ${INSTALL} -o root -g ${BINGRP} -m 600 \
+ cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
${PPPCNF} ${DESTDIR}/etc/ppp
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${ETCMAIL} ${DESTDIR}/etc/mail
@@ -201,7 +203,7 @@
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${BIN1} ${BIN2} nsmb.conf opieaccess \
${DESTDIR}/usr/share/examples/etc
- cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${DEFAULTS} ${DESTDIR}/usr/share/examples/etc/defaults
+ cd ${.CURDIR}/defaults; ${MAKE} install \
+ DESTDIR=${DESTDIR}/usr/share/examples
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sebsd/etc/defaults/Makefile#2 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/etc/defaults/Makefile,v 1.1 2002/01/30 09:27:03 bde Exp $
+# $FreeBSD: src/etc/defaults/Makefile,v 1.3 2003/08/24 03:24:54 mtm Exp $
-FILES= pccard.conf periodic.conf rc.conf
+FILES= devfs.rules pccard.conf periodic.conf rc.conf
NOOBJ= noobj
FILESDIR= /etc/defaults
-FILESMODE= 644
+FILESMODE= 444
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sebsd/etc/defaults/pccard.conf#4 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Default PCCARD configuration file
#
-# $FreeBSD: src/etc/defaults/pccard.conf,v 1.262 2003/07/22 21:23:01 dds Exp $
+# $FreeBSD: src/etc/defaults/pccard.conf,v 1.265 2003/09/20 05:21:58 imp Exp $
#
# Please send new entries for this file to imp at freebsd.org. He likes to
# review them before they are committed to make sure they are correct for
@@ -205,6 +205,10 @@
card "KODAK Picture Card" "KODAK"
config default "ata" ?
+# Panasonic KXL-CB10AN (CD-R/RW/DVD)
+card "KME" "KXLC006"
+ config auto "ata" ?
+
# TOSHIBA Portable 24X Speed CD-ROM Drive PA2673UJ
card "LOOKMEET" "/CBIDE2 */"
config default "ata" ?
@@ -691,6 +695,12 @@
insert /etc/pccard_ether $device start
remove /etc/pccard_ether $device stop
+# I/O DATA PCET10-CL
+card "IO DATA" "PCET10CL"
+ config auto "ed0" any 0x10
+ insert /etc/pccard_ether $device
+ remove /etc/pccard_ether_remove $device
+
# I-O DATA PCET/100-CL
card "IO DATA" "PCET100CL"
config auto "ed" ? 0x80000
@@ -1874,6 +1884,12 @@
insert /etc/pccard_ether $device start
remove /etc/pccard_ether $device stop
+# Benq AWL100 wireless 11 Mbps pcmcia card
+card "BENQ" "AWL100 PCMCIA ADAPTER"
+ config auto "wi" ?
+ insert /etc/pccard_ether $device start
+ remove /etc/pccard_ether $device stop
+
# BreezeNET
card "BreezeNET" "PC-DS.11"
config auto "wi" ?
@@ -1989,6 +2005,12 @@
insert /etc/pccard_ether $device start
remove /etc/pccard_ether $device stop
+# ELSA Vianect
+card "ELSA" "Vianect WLAN MC-11"
+ config auto "wi" ?
+ insert /etc/pccard_ether $device start
+ remove /etc/pccard_ether $device stop
+
# PLANEX GeoWave/GW-NS11S
card "Geowave" "GW-NS11S"
config auto "wi" ?
@@ -2088,6 +2110,12 @@
insert /etc/pccard_ether $device start
remove /etc/pccard_ether $device stop
+# Netgear MA701
+card "NETGEAR" "MA701 Wireless CF Card"
+ config auto "wi" ?
+ insert /etc/pccard_ether $device start
+ remove /etc/pccard_ether $device stop
+
# Nortel eMobility
card "Nortel Networks" "emobility 802.11 Wireless LAN PC Card"
config auto "wi" ?
@@ -2125,6 +2153,12 @@
insert /etc/pccard_ether $device start
remove /etc/pccard_ether $device stop
+# Proxim Harmony OEM card
+card "PROXIM" "LAN PC CARD HARMONY 80211B"
+ config 0x1 "wi" ?
+ insert /etc/pccard_ether $device start
+ remove /etc/pccard_ether $device stop
+
# Proxim RangeLAN-DS (OEM of Zcommax - Prism2 card)
card "PROXIM" "RangeLAN-DS/LAN PC CARD"
config auto "wi" ?
==== //depot/projects/trustedbsd/sebsd/etc/defaults/rc.conf#4 (text+ko) ====
@@ -13,14 +13,14 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.182 2003/07/28 13:09:00 mbr Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.189 2003/09/18 09:59:37 dougb Exp $
##############################################################
### Important initial Boot-time options ####################
##############################################################
rc_debug="NO" # Set to YES to enable debugging output from rc.d
-rc_info="YES" # Enables display of informational messages at boot.
+rc_info="NO" # Enables display of informational messages at boot.
rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown
swapfile="NO" # Set to name of swapfile if aux swapfile desired.
apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO).
@@ -41,6 +41,11 @@
local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs.
script_name_sep=" " # Change if your startup scripts' names contain spaces
rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
+
+# Experimental - test before enabling
+gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab
+gbde_devices="NO" # Devices to automatically attach (list, or AUTO)
+
fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails.
background_fsck="YES" # Attempt to run fsck in the background where possible.
background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
@@ -130,7 +135,7 @@
#syslogd_flags="-ss" # Syslogd flags to not bind an inet socket
inetd_enable="NO" # Run the network daemon dispatcher (YES/NO).
inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one.
-inetd_flags="-wW" # Optional flags to inetd
+inetd_flags="-wW -C 60" # Optional flags to inetd
#
# named. It may be possible to run named in a sandbox, man security for
# details.
@@ -219,6 +224,7 @@
### Network routing options: ###
defaultrouter="NO" # Set to default gateway (or NO).
static_routes="" # Set to static route list (or leave empty).
+natm_static_routes="" # Set to static route list for NATM (or leave empty).
gateway_enable="NO" # Set to YES if this host will be a gateway.
router_enable="NO" # Set to YES to enable a routing daemon.
router="/sbin/routed" # Name of routing daemon to use if enabled.
@@ -282,6 +288,7 @@
ipv6_default_interface="NO" # Default output interface for scoped addrs.
# Now this works only for IPv6 link local
# multicast addrs.
+rtsol_flags="" # Flags to IPv6 router solicitation.
rtadvd_enable="NO" # Set to YES to enable an IPv6 router
# advertisement daemon. If set to YES,
# this router becomes a possible candidate
@@ -426,12 +433,35 @@
harvest_ethernet="YES" # Entropy device harvests ethernet randomness
harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness
dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot
+watchdogd_enable="NO" # Start the software watchdog daemon
+devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing
+ # devfs(8) rules.
+devfs_system_ruleset="" # The name of a ruleset to apply to /dev
+
+##############################################################
+### Jail Configuration #######################################
+##############################################################
jail_enable="NO" # Set to NO to disable starting of any jails
jail_list="" # Space separated list of names of jails
jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname
jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail
-jail_sysvipc_allow="NO" # Allow SystemV IPC use from within a jail
-watchdogd_enable="NO" # Start the software watchdog daemon
+jail_sysvipc_allow="NO" # Allow SystemV IPC use from within a jail
+jail_stop_jailer="NO" # Only stop jailer. Requires jail_*_exec be set
+ # to use sysutils/jailer port to start the jail.
+
+#
+# To use rc's built-in jail infrastructure create entries for
+# each jail, specified in jail_list, with the following variables.
+# NOTE: replace 'example' with the jail's name.
+#
+#jail_example_rootdir="/usr/jail/default" # Jail's root directory
+#jail_example_hostname="default.domain.com" # Jail's hostname
+#jail_example_ip="192.168.0.10" # Jail's IP number
+#jail_example_exec="/bin/sh /etc/rc" # command to execute in jail
+#jail_example_devfs_enable="NO" # mount devfs in the jail
+#jail_example_fdescfs_enable="NO" # mount fdescfs in the jail
+#jail_example_procfs_enable="NO" # mount procfs in jail
+#jail_example_devfs_ruleset="123" # devfs ruleset to apply to jail
##############################################################
### Define source_rc_confs, the mechanism used by /etc/rc.* ##
==== //depot/projects/trustedbsd/sebsd/etc/devd.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.5 2003/05/09 05:58:22 imp Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.8 2003/09/09 18:17:23 wpaul Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -18,8 +18,8 @@
# Setup some shorthand for regex that we use later in the file.
set ethernet-nic-regex
- "(an|ar|ath|aue|awi|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|ex|\
- fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|rl|rue|\
+ "(an|ar|ath|aue|awi|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|\
+ ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\
sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+";
set scsi-controller-regex
"(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\
@@ -66,9 +66,9 @@
# Don't even try to second guess what to do about drivers that don't
# match here. Instead, pass it off to syslog. Commented out for the
# moment, as pnpinfo isn't set in devd yet
-#nomatch 0 {
+nomatch 0 {
# action "logger Unknown device: $pnpinfo $location $bus";
-#};
+};
/* EXAMPLES TO END OF FILE
==== //depot/projects/trustedbsd/sebsd/etc/etc.ia64/ttys#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/etc.ia64/ttys,v 1.2 2002/04/17 10:42:41 gerald Exp $
+# $FreeBSD: src/etc/etc.ia64/ttys,v 1.3 2003/09/07 06:02:36 marcel Exp $
# @(#)ttys 5.1 (Berkeley) 4/17/89
#
# This file specifies various information about terminals on the system.
@@ -33,7 +33,7 @@
console none unknown off secure
#
ttyv0 "/usr/libexec/getty Pc" cons25 on secure
-# Virtual terminals
+# Virtual terminals.
ttyv1 "/usr/libexec/getty Pc" cons25 on secure
ttyv2 "/usr/libexec/getty Pc" cons25 on secure
ttyv3 "/usr/libexec/getty Pc" cons25 on secure
@@ -42,13 +42,13 @@
ttyv6 "/usr/libexec/getty Pc" cons25 on secure
ttyv7 "/usr/libexec/getty Pc" cons25 on secure
ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure
-# Serial terminals
-# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyd0 "/usr/libexec/getty std.9600" vt100 on secure
-ttyd1 "/usr/libexec/getty std.9600" dialup off secure
-ttyd2 "/usr/libexec/getty std.9600" dialup off secure
-ttyd3 "/usr/libexec/getty std.9600" dialup off secure
-# Pseudo terminals
+# Serial terminals. The 'dialup' keyword identifies dialin lines to login,
+# fingerd etc.
+ttyu0 "/usr/libexec/getty std.9600" vt100 on secure
+ttyu1 "/usr/libexec/getty std.9600" dialup off secure
+ttyu2 "/usr/libexec/getty std.9600" dialup off secure
+ttyu3 "/usr/libexec/getty std.9600" dialup off secure
+# Pseudo terminals.
ttyp0 none network
ttyp1 none network
ttyp2 none network
==== //depot/projects/trustedbsd/sebsd/etc/etc.sparc64/ttys#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.4 2003/01/27 04:42:16 jake Exp $
+# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.5 2003/09/11 00:14:17 jake Exp $
# @(#)ttys 5.1 (Berkeley) 4/17/89
#
# This file specifies various information about terminals on the system.
@@ -48,10 +48,10 @@
#ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure
# Serial terminals
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyd0 "/usr/libexec/getty std.9600" dialup off secure
-ttyd1 "/usr/libexec/getty std.9600" dialup off secure
-ttyd2 "/usr/libexec/getty std.9600" dialup off secure
-ttyd3 "/usr/libexec/getty std.9600" dialup off secure
+ttyu0 "/usr/libexec/getty std.9600" vt100 on secure
+ttyu1 "/usr/libexec/getty std.9600" vt100 on secure
+ttyu2 "/usr/libexec/getty std.9600" vt100 off secure
+ttyu3 "/usr/libexec/getty std.9600" vt100 off secure
# Pseudo terminals
ttyp0 none network
ttyp1 none network
==== //depot/projects/trustedbsd/sebsd/etc/gettytab#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/gettytab,v 1.20 2001/08/31 22:18:50 murray Exp $
+# $FreeBSD: src/etc/gettytab,v 1.21 2003/09/09 15:37:19 yar Exp $
# from: @(#)gettytab 5.14 (Berkeley) 3/27/91
#
# Most of the table entries here are just copies of the old getty table,
@@ -19,11 +19,11 @@
#
# Parity defaults to even, but the Pc entry and all the `std' entries
# specify no parity. The different parities are:
-# (none): same as even except -inpck instead of inpck for login.
+# (none): same as ep for getty. login will use terminal as is.
# ep: getty will use raw mode (cs8 -parenb) (unless rw is set) and
# fake parity. login will use even parity (cs7 parenb -parodd).
# op: same as ep except odd parity (cs7 parenb parodd) for login.
-# op overrides ep.
+# getty will fake odd parity as well.
# ap: same as ep except -inpck instead of inpck for login.
# ap overrides op and ep.
# np: 1. don't fake parity in getty. The fake parity garbles
@@ -32,10 +32,8 @@
# try to fake parity. It could just use cbreak mode so as
# not to force cs8 and let the hardware handle the parity.
# login has to be rely on the hardware anyway.
-# 2. set PASS8, giving cs8 -parenb -istrip -inpck.
-# np:ep: same as np except inpck.
-# np:op: same as np:ep except for parodd (but parodd is overridden).
-# np:ap: same as np except istrip.
+# 2. set cs8 -parenb -istrip -inpck.
+# ep:op: same as ap.
#
default:\
:cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
==== //depot/projects/trustedbsd/sebsd/etc/isdn/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/isdn/Makefile,v 1.9 2002/08/07 16:01:06 ru Exp $
+# $FreeBSD: src/etc/isdn/Makefile,v 1.11 2003/08/18 15:33:08 obrien Exp $
I4BETCPROG= answer \
isdntel.sh \
@@ -18,8 +18,12 @@
install:
for i in ${I4BETCPROG} ; do \
- ${INSTALL} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 700 $$i \
+ ${DESTDIR}/etc/isdn ; \
done ; \
for i in ${I4BETCFILE} ; do \
- ${INSTALL} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 $$i \
+ ${DESTDIR}/etc/isdn ; \
done
+
+.include <bsd.own.mk>
==== //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.local.dist#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.100 2003/08/05 05:42:07 mtm Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.101 2003/08/08 13:43:48 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -383,6 +383,8 @@
..
ja_JP.eucJP
..
+ ko_KR.CP949
+ ..
ko_KR.eucKR
..
la_LN.ISO8859-1
==== //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.root.dist#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.63 2003/06/29 18:35:36 gordon Exp $
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.64 2003/08/17 07:48:09 gordon Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -65,6 +65,10 @@
ssl
..
..
+ lib
+ ..
+ libexec
+ ..
mnt
..
proc mode=0555
==== //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.usr.dist#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.278 2003/08/05 05:42:07 mtm Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.280 2003/08/12 14:26:57 harti Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -67,6 +67,8 @@
doc
IPv6
..
+ atm
+ ..
bind
html
..
@@ -445,6 +447,8 @@
..
ja_JP.eucJP
..
+ ko_KR.CP949
+ ..
ko_KR.eucKR
..
la_LN.ISO8859-1
@@ -775,6 +779,8 @@
..
ja_JP.eucJP
..
+ ko_KR.CP949
+ ..
ko_KR.eucKR
..
la_LN.ISO8859-1
==== //depot/projects/trustedbsd/sebsd/etc/network.subr#3 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.151 2003/06/24 03:55:21 kuriyama Exp $
+# $FreeBSD: src/etc/network.subr,v 1.153 2003/08/11 20:32:00 mbr Exp $
#
#
@@ -299,6 +299,24 @@
esac
done
+ case ${pccard_ifconfig} in
+ [Dd][Hh][Cc][Pp])
+ for _if in ${removable_interfaces} ; do
+ _test_if=`ifconfig ${_if} 2>&1`
+ case "$_test_if" in
+ "ifconfig: interface $_if does not exist")
+ ;;
+ *)
+ _dhcplist="${_dhcplist}${_aprefix}${_if}"
+ [ -z "$_aprefix" ] && _aprefix=' '
+ ;;
+ esac
+ done
+ ;;
+ *)
+ ;;
+ esac
+
case "$type" in
nodhcp)
echo $_nodhcplist
@@ -407,7 +425,7 @@
sysctl net.inet6.ip6.accept_rtadv=1
set ${rtsol_interfaces}
ifconfig $1 up
- rtsol $1
+ rtsol ${rtsol_flags} $1
fi
for i in $interfaces; do
==== //depot/projects/trustedbsd/sebsd/etc/newsyslog.conf#4 (text+ko) ====
@@ -1,10 +1,10 @@
# configuration file for newsyslog
-# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $
+# $FreeBSD: src/etc/newsyslog.conf,v 1.47 2003/08/07 21:04:40 fjoe Exp $
#
# Entries which do not specify the '/pid_file' field will cause the
# syslogd process to be signalled when that log file is rotated. This
# action is only appropriate for log files which are written to by the
-# syslogd process (ie, files listed in /etc/syslogd.conf). If there
+# syslogd process (ie, files listed in /etc/syslog.conf). If there
# is no process which needs to be signalled when a given log file is
# rotated, then the entry for that file should include the 'N' flag.
#
==== //depot/projects/trustedbsd/sebsd/etc/pccard_ether#4 (text+ko) ====
@@ -1,22 +1,83 @@
#!/bin/sh -
#
-# $FreeBSD: src/etc/pccard_ether,v 1.32 2003/06/16 09:11:29 maxim Exp $
+# $FreeBSD: src/etc/pccard_ether,v 1.38 2003/09/15 18:27:38 mbr Exp $
#
# pccard_ether interfacename [start|stop] [ifconfig option]
#
# example: pccard_ether fxp0 start link0
#
+. /etc/network.subr
+
stop_dhcp() {
- if [ -s /var/run/dhclient.${interface}.pid ]; then
- pidfile="/var/run/dhclient.${interface}.pid"
- elif [ -s /var/run/dhcpc.${interface}.pid ]; then
- pidfile="/var/run/dhcpc.${interface}.pid"
+ # If dhclient is already running, record
+ # its interfaces.
+ if [ -x /usr/bin/grep ]; then
+ eval _active_list=\"`/bin/ps -axwww | \
+ /usr/bin/grep dhclient | \
+ /usr/bin/grep -v grep | \
+ /usr/bin/sed -e 's|^.*dhclient||' | \
+ /usr/bin/awk '{for (i=1;i<=NF;i++) \
+ { if ($i~/[a-zA-Z].[0-9]$/) \
+ { printf(" %s",$i) } }}'` \
+ \"
+ fi
+
+ # Get the rc.conf list of dhcp configured interfaces
+ static_dhcp_list="`list_net_interfaces dhcp`"
+
+ # Get the current ifconfig list of interfaces
+ _aprefix=
+ _nlist=
+ for _if in ${_active_list} ; do
+ _test_if=`ifconfig ${_if} 2>&1`
+ case "$_test_if" in
+ "ifconfig: interface $_if does not exist")
+ ;;
+ ${interface})
+ # Don't record the same device twice.
+ ;;
+ *)
+ #
+ # Catch devices which were specified before,
+ # but have not been part of the rc. We need
+ # them again for the restart.
+ #
+ for _cif in ${static_dhcp_list} ; do
+ case "$_cif" in
+ ${_if})
+ # Nothing to add
+ ;;
+ *)
+ # Found interface beside rc.conf
+ _nlist="${_nlist}${_aprefix}${_if}"
+ ;;
+ esac
+ done
+ _dhcplist="${_dhcplist}${_aprefix}${_if}"
+ [ -z "$_aprefix" ] && _aprefix=' '
+ ;;
+ esac
+ done
+
+ if [ -s /var/run/dhclient.pid ]; then
+ pidfile="/var/run/dhclient.pid"
else
return
fi
- kill `cat ${pidfile}`
+ /sbin/dhclient -r ${interface}
rm -f ${pidfile}
+ case ${startstop} in
+ [Ss][Tt][Oo][Pp])
+ if [ -z "${_nlist}" ]; then
+ sh `/etc/rc.d/dhclient start`
+ else
+ start_dhcp_keep_current
+ fi
+ ;;
+ *)
+ ;;
+ esac
}
start_dhcp() {
@@ -31,11 +92,20 @@
[ -n "$dhcp_program" ] && dhclient_program="$dhcp_program"
[ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags"
if [ -x "${dhclient_program}" ]; then
- if [ `basename ${dhclient_program}` = "dhclient" ]; then
- pidfile="/var/run/dhclient.${interface}.pid"
- dhclient_flags="${dhclient_flags} -pf ${pidfile}"
- fi
- ${dhclient_program} ${dhclient_flags} ${interface}
+ ${dhclient_program} ${dhclient_flags} $_dhcplist ${interface}
+ else
+ echo "${dhclient_program}: DHCP client software not available"
+ fi
+}
+
+# Called after detaching a card, if dhclient has been
+# used for more than one interface.
+start_dhcp_keep_current() {
+ [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program"
+ [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags"
+ if [ -x "${dhclient_program}" ]; then
+ ${dhclient_program} ${dhclient_flags} \
+ ${_dhcplist}
else
echo "${dhclient_program}: DHCP client software not available"
fi
@@ -67,9 +137,11 @@
case ${startstop} in
[Ss][Tt][Aa][Rr][Tt] | '')
- if ifconfig ${interface} | grep -s UP, > /dev/null 2>&1; then
- # Interface is already up, so ignore it.
- exit 0
+ if [ -x /usr/bin/grep ]; then
+ if ifconfig ${interface} | grep -s UP, > /dev/null 2>&1; then
+ # Interface is already up, so ignore it.
+ exit 0
+ fi
fi
if [ -r /etc/start_if.${interface} ]; then
==== //depot/projects/trustedbsd/sebsd/etc/rc.d/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.24 2003/08/06 00:35:13 mtm Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.25 2003/08/29 13:25:08 mtm Exp $
.include <bsd.own.mk>
@@ -19,11 +19,10 @@
ipnat ipsec ipxrouted isdnd \
jail \
kadmind kerberos keyserv kldxref kpasswdd \
- ldconfig local localdaemons localpkg lomac lpd \
+ ldconfig local localpkg lomac lpd \
motd mountcritlocal mountcritremote \
mountd moused mroute6d mrouted msgs \
named netif netoptions \
- network1 network2 network3 \
network_ipv6 nfsclient nfsd \
nfslocking nfsserver nisdomain ntpd ntpdate \
othermta \
==== //depot/projects/trustedbsd/sebsd/etc/rc.d/devfs#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $
+# $FreeBSD: src/etc/rc.d/devfs,v 1.6 2003/08/20 06:15:18 mtm Exp $
#
# PROVIDE: devfs
@@ -11,9 +11,19 @@
. /etc/rc.subr
name="devfs"
-start_cmd='read_devfs_conf'
+start_cmd='devfs_start'
stop_cmd=':'
+devfs_start()
+{
+ if [ -n "$devfs_system_ruleset" ]; then
+ devfs_init_rulesets
+ devfs_set_ruleset $devfs_system_ruleset /dev
+ devfs_apply_ruleset $devfs_system_ruleset /dev
+ fi
+ read_devfs_conf
+}
+
read_devfs_conf()
{
if [ -r /etc/devfs.conf ]; then
==== //depot/projects/trustedbsd/sebsd/etc/rc.d/dhclient#4 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhclient,v 1.9 2003/07/28 08:15:52 mbr Exp $
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.10 2003/09/16 02:56:13 mbr Exp $
#
# PROVIDE: dhclient
@@ -53,8 +53,9 @@
dhclient_prestart()
{
- dhclient_common || return 1
-
+ if [ $dhclient_common_error -eq 1 ]; then
+ return 1
+ fi
for ifn in ${_cooked_list}; do
ifscript_up ${ifn}
done
@@ -78,8 +79,9 @@
dhclient_prestop()
{
- dhclient_common || return 1
-
+ if [ $dhclient_common_error -eq 1 ]; then
+ return 1
+ fi
for ifn in ${_cooked_list}; do
ipx_down ${ifn}
ifalias_down ${ifn}
@@ -110,4 +112,11 @@
fi
load_rc_config $name
+dhclient_common_error=0
+dhclient_common || dhclient_common_error=1;
+if [ -n "$_cooked_list" ]; then
+ if [ -s $pidfile ]; then
+ stop_cmd=":"
+ fi
+fi
run_rc_command "$1"
==== //depot/projects/trustedbsd/sebsd/etc/rc.d/initdiskless#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 1999 Matt Dillion
+# Copyright (c) 1999 Matt Dillon
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/initdiskless,v 1.24 2003/06/30 21:47:06 brooks Exp $
+# $FreeBSD: src/etc/rc.d/initdiskless,v 1.25 2003/08/07 21:06:32 fjoe Exp $
#
# PROVIDE: initdiskless
# KEYWORD: FreeBSD
==== //depot/projects/trustedbsd/sebsd/etc/rc.d/ipfilter#4 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipfilter,v 1.11 2003/07/30 18:53:59 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.12 2003/09/27 13:50:47 mux Exp $
#
# PROVIDE: ipfilter
@@ -40,7 +40,7 @@
case ${OSTYPE} in
FreeBSD)
# load ipfilter kernel module if needed
- if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then
+ if ! kldstat -v | grep "IP Filter" > /dev/null 2>&1; then
if kldload ipl; then
info 'IP-filter module loaded.'
else
@@ -79,12 +79,15 @@
echo "Enabling ipfilter."
case ${OSTYPE} in
FreeBSD)
- ${ipfilter_program:-/sbin/ipf} -EFa
+ if [ `sysctl -n net.inet.ipf.fr_running` -eq 0 ]; then
+ ${ipfilter_program:-/sbin/ipf} -E
+ fi
+ ${ipfilter_program:-/sbin/ipf} -Fa
if [ -r "${ipfilter_rules}" ]; then
${ipfilter_program:-/sbin/ipf} \
-f "${ipfilter_rules}" ${ipfilter_flags}
fi
- ${ipfilter_program:-/sbin/ipf} -6 -EFa
+ ${ipfilter_program:-/sbin/ipf} -6 -Fa
if [ -r "${ipv6_ipfilter_rules}" ]; then
${ipfilter_program:-/sbin/ipf} -6 \
-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
@@ -104,17 +107,21 @@
ipfilter_stop()
{
- case ${OSTYPE} in
- FreeBSD)
- echo "Saving firewall state tables"
- ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags}
- ;;
- NetBSD)
- ;;
- esac
- # XXX - The following command is not effective for 'lkm's
- echo "Disabling ipfilter."
- /sbin/ipf -D
+ # XXX - The ipf -D command is not effective for 'lkm's
+ if [ `sysctl -n net.inet.ipf.fr_running` -eq 1 ]; then
+ case ${OSTYPE} in
+ FreeBSD)
+ echo "Saving firewall state tables"
+ ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags}
+ echo "Disabling ipfilter."
+ ${ipfilter_program:-/sbin/ipf} -D
+ ;;
+ NetBSD)
+ echo "Disabling ipfilter."
+ /sbin/ipf -D
+ ;;
+ esac
+ fi
}
ipfilter_reload()
@@ -157,7 +164,7 @@
case ${OSTYPE} in
FreeBSD)
# Don't resync if ipfilter is not loaded
- [ sysctl net.inet.ipf.fr_pass > /dev/null 2>&1 ] && return
+ [ kldstat -v | grep "IP Filter" > /dev/null 2>&1 ] && return
;;
esac
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags}
==== //depot/projects/trustedbsd/sebsd/etc/rc.d/jail#3 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.6 2003/08/24 06:29:32 mtm Exp $
#
# PROVIDE: jail
# REQUIRE: LOGIN
# BEFORE: securelevel
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD shutdown
. /etc/rc.subr
@@ -15,6 +15,50 @@
start_cmd="jail_start"
stop_cmd="jail_stop"
+# init_variables _j
+# Initialize the various jail variables for jail _j.
+#
+init_variables()
+{
+ _j="$1"
+
+ if [ -z "$_j" ]; then
+ warn "init_variables: you must specify a jail"
+ return
+ fi
+
+ eval jail_rootdir=\"\$jail_${_j}_rootdir\"
+ jail_devdir="${jail_rootdir}/dev"
+ jail_fdescdir="${jail_devdir}/fd"
+ jail_procdir="${jail_rootdir}/proc"
+ eval jail_hostname=\"\$jail_${_j}_hostname\"
+ eval jail_ip=\"\$jail_${_j}_ip\"
+ eval jail_exec=\"\$jail_${_j}_exec\"
+ [ -z "${jail_exec}" ] && jail_exec="/bin/sh /etc/rc"
+
+ # The default jail ruleset will be used by rc.subr if none is specified.
+ eval jail_ruleset=\"\$jail_${_j}_devfs_ruleset\"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list