Date: Sat, 12 Oct 2002 04:26:29 -0700 (PDT) From: Serguei Tzukanov <tzukanov@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 19136 for review Message-ID: <200210121126.g9CBQTN7098402@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=19136 Change 19136 by tzukanov@tzukanov_antares on 2002/10/12 04:25:47 IFC. Affected files ... .. //depot/projects/s390/contrib/gcc/gcc.c#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/env.cc#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/s390/etc/rc#3 integrate .. //depot/projects/s390/etc/rc.d/accounting#3 integrate .. //depot/projects/s390/etc/rc.d/addswap#2 integrate .. //depot/projects/s390/etc/rc.d/amd#3 integrate .. //depot/projects/s390/etc/rc.d/apmd#3 integrate .. //depot/projects/s390/etc/rc.d/archdep#2 integrate .. //depot/projects/s390/etc/rc.d/atm2.sh#3 integrate .. //depot/projects/s390/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/s390/etc/rc.d/cleanvar#2 integrate .. //depot/projects/s390/etc/rc.d/cleartmp#3 integrate .. //depot/projects/s390/etc/rc.d/devdb#2 integrate .. //depot/projects/s390/etc/rc.d/diskless#3 integrate .. //depot/projects/s390/etc/rc.d/fsck#3 integrate .. //depot/projects/s390/etc/rc.d/initdiskless#3 integrate .. //depot/projects/s390/etc/rc.d/ip6fw#2 integrate .. //depot/projects/s390/etc/rc.d/ipfilter#3 integrate .. //depot/projects/s390/etc/rc.d/ipfw#2 integrate .. //depot/projects/s390/etc/rc.d/ipmon#3 integrate .. //depot/projects/s390/etc/rc.d/ipnat#3 integrate .. //depot/projects/s390/etc/rc.d/isdnd#3 integrate .. //depot/projects/s390/etc/rc.d/local#2 integrate .. //depot/projects/s390/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/s390/etc/rc.d/mountd#3 integrate .. //depot/projects/s390/etc/rc.d/named#3 integrate .. //depot/projects/s390/etc/rc.d/network1#3 integrate .. //depot/projects/s390/etc/rc.d/network3#3 integrate .. //depot/projects/s390/etc/rc.d/network_ipv6#3 integrate .. //depot/projects/s390/etc/rc.d/nfsclient#3 integrate .. //depot/projects/s390/etc/rc.d/nfsd#3 integrate .. //depot/projects/s390/etc/rc.d/nfsserver#2 integrate .. //depot/projects/s390/etc/rc.d/ntpd#3 integrate .. //depot/projects/s390/etc/rc.d/ntpdate#3 integrate .. //depot/projects/s390/etc/rc.d/pccard#3 integrate .. //depot/projects/s390/etc/rc.d/pcvt#2 integrate .. //depot/projects/s390/etc/rc.d/ppp-user#2 integrate .. //depot/projects/s390/etc/rc.d/quota#2 integrate .. //depot/projects/s390/etc/rc.d/random#2 integrate .. //depot/projects/s390/etc/rc.d/root#3 integrate .. //depot/projects/s390/etc/rc.d/rtadvd#3 integrate .. //depot/projects/s390/etc/rc.d/sendmail#3 integrate .. //depot/projects/s390/etc/rc.d/serial#3 integrate .. //depot/projects/s390/etc/rc.d/wscons#2 integrate .. //depot/projects/s390/etc/rc.d/ypserv#3 integrate .. //depot/projects/s390/etc/rc.d/ypset#3 integrate .. //depot/projects/s390/etc/rc.d/ypupdated#3 integrate .. //depot/projects/s390/etc/rc.d/ypxfrd#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/Makefile#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/Makefile.inc0#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/i386-freebsd/config.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/gdb/Makefile.alpha#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/gdb/Makefile.i386#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/ld/config.h#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/alpha/bfd.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/config.h.fbsd#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/i386/bfd.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/sparc64/bfd.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/x86-64/bfd.h#2 integrate .. //depot/projects/s390/include/stdio.h#3 integrate .. //depot/projects/s390/lib/libc/Makefile#3 integrate .. //depot/projects/s390/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/s390/lib/libc/stdio/fseek.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/strfmon.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/strfmon.c#3 integrate .. //depot/projects/s390/libexec/rtld-elf/alpha/ld.so.script#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/s390/share/man/man4/ktr.4#2 integrate .. //depot/projects/s390/share/man/man9/VOP_READDIR.9#3 integrate .. //depot/projects/s390/share/man/man9/ktr.9#2 integrate .. //depot/projects/s390/share/man/man9/swi.9#2 integrate .. //depot/projects/s390/sys/conf/files#3 integrate .. //depot/projects/s390/sys/conf/ldscript.alpha#2 integrate .. //depot/projects/s390/sys/conf/ldscript.i386#2 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/s390/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/s390/sys/dev/isp/isp.c#3 integrate .. //depot/projects/s390/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/s390/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/s390/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/s390/sys/dev/sio/sio.c#3 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/s390/sys/geom/geom_disk.c#3 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/s390/sys/i386/conf/OLDCARD#3 integrate .. //depot/projects/s390/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/s390/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/s390/sys/kern/kern_clock.c#3 integrate .. //depot/projects/s390/sys/kern/kern_exec.c#3 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#3 integrate .. //depot/projects/s390/sys/kern/kern_fork.c#3 integrate .. //depot/projects/s390/sys/kern/kern_idle.c#3 integrate .. //depot/projects/s390/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/s390/sys/kern/kern_resource.c#3 integrate .. //depot/projects/s390/sys/kern/kern_subr.c#4 integrate .. //depot/projects/s390/sys/kern/kern_switch.c#3 integrate .. //depot/projects/s390/sys/kern/kern_synch.c#3 integrate .. //depot/projects/s390/sys/kern/sched_4bsd.c#1 branch .. //depot/projects/s390/sys/kern/subr_prf.c#3 integrate .. //depot/projects/s390/sys/kern/subr_trap.c#3 integrate .. //depot/projects/s390/sys/kern/subr_witness.c#3 integrate .. //depot/projects/s390/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/s390/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/s390/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/s390/sys/posix4/ksched.c#3 integrate .. //depot/projects/s390/sys/sys/proc.h#3 integrate .. //depot/projects/s390/sys/sys/sched.h#1 branch .. //depot/projects/s390/sys/sys/stat.h#3 integrate .. //depot/projects/s390/sys/sys/uio.h#3 integrate .. //depot/projects/s390/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/s390/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/s390/usr.bin/calendar/calendars/calendar.birthday#2 integrate .. //depot/projects/s390/usr.bin/showmount/showmount.8#3 integrate .. //depot/projects/s390/usr.bin/showmount/showmount.c#2 integrate .. //depot/projects/s390/usr.bin/wall/ttymsg.c#2 integrate .. //depot/projects/s390/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/s390/usr.sbin/sysinstall/disks.c#3 integrate .. //depot/projects/s390/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/s390/usr.sbin/sysinstall/label.c#2 integrate .. //depot/projects/s390/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/s390/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/s390/usr.sbin/sysinstall/system.c#3 integrate Differences ... ==== //depot/projects/s390/contrib/gcc/gcc.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ This paragraph is here to try to keep Sun CC from dying. The number of chars here seems crucial!!!! */ -/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.30 2002/10/10 04:49:03 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.31 2002/10/12 01:39:46 obrien Exp $ */ /* This program is the user interface to the C compiler and possibly to other compilers. It is used because compilation is a complicated procedure @@ -3879,7 +3879,7 @@ 0, 0, warn_std_ptr, 0); break; case OBJFMT_ELF: - add_prefix (&exec_prefixes, PREFIX"/libexec/elf/", "BINUTILS", + add_prefix (&exec_prefixes, PREFIX"/bin/", "BINUTILS", 0, 0, warn_std_ptr, 0); break; case OBJFMT_UNKNOWN: ==== //depot/projects/s390/contrib/groff/src/roff/troff/env.cc#3 (text+ko) ==== @@ -3720,7 +3720,7 @@ if (i > 0) { if (have_patterns || final_pattern || traditional) { for (int j = 0; j < i; j++) - buf[j] = hpf_code_table[buf[j]]; + buf[j] = hpf_code_table[(unsigned char)buf[j]]; insert_pattern(buf, i, num); final_pattern = 0; } ==== //depot/projects/s390/contrib/ncurses/ncurses/curses.priv.h#2 (text+ko) ==== @@ -220,6 +220,8 @@ #define S_QUOTE '\'' #define D_QUOTE '"' +#define VT_ACSC "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~" + /* * Structure for palette tables */ ==== //depot/projects/s390/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 (text+ko) ==== @@ -465,6 +465,14 @@ PAIRED(enter_underline_mode, exit_underline_mode) } + /* we do this check/fix in postprocess_termcap(), but some packagers + * prefer to bypass it... + */ + if (acs_chars == 0 + && enter_alt_charset_mode != 0 + && exit_alt_charset_mode != 0) + acs_chars = strdup(VT_ACSC); + /* listed in structure-member order of first argument */ PAIRED(enter_alt_charset_mode, exit_alt_charset_mode); ANDMISSING(enter_alt_charset_mode, acs_chars); ==== //depot/projects/s390/etc/rc#3 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.321 2002/10/03 20:39:29 schweikh Exp $ +# $FreeBSD: src/etc/rc,v 1.322 2002/10/12 07:21:18 dd Exp $ # # System startup script run by init on autoboot @@ -93,7 +93,7 @@ if [ $? -eq 2 ]; then unset _rc_conf_loaded load_rc_config 'XXX' - echo "Reloading rc.conf" + echo "Reloading rc.conf." fi done ==== //depot/projects/s390/etc/rc.d/accounting#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: accounting @@ -24,7 +24,7 @@ FreeBSD) _dir=`dirname "$accounting_file"` if [ ! -d `dirname "$_dir"` ]; then - if ! mkdir -p "$_dir" ; then + if ! mkdir -p "$_dir"; then warn "Could not create $_dir." return 1 fi ==== //depot/projects/s390/etc/rc.d/addswap#2 (text+ko) ==== @@ -2,7 +2,7 @@ # # Add additional swap files # -# $FreeBSD: src/etc/rc.d/addswap,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/addswap,v 1.2 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: addswap @@ -24,7 +24,7 @@ *) if [ -w "${swapfile}" -a -c /dev/mdctl ]; then echo "Adding ${swapfile} as additional swap" - mdev=`mdconfig -a -t vnode -f ${swapfile}` && swapon /dev/${mdev} + mdev=`mdconfig -a -t vnode -f ${swapfile}` && swapon /dev/${mdev} fi ;; esac ==== //depot/projects/s390/etc/rc.d/amd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.8 2002/09/18 08:49:50 rse Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.9 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: amd @@ -28,17 +28,17 @@ ;; esac -amd_precmd() +amd_precmd() { case ${OSTYPE} in FreeBSD) - if ! checkyesno nfs_client_enable ; then + if ! checkyesno nfs_client_enable; then force_depend nfsclient || return 1 fi if ! checkyesno rpcbind_enable && \ ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then + then force_depend rpcbind || return 1 fi ==== //depot/projects/s390/etc/rc.d/apmd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.4 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.5 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: apmd @@ -23,15 +23,15 @@ apmd_prestart() { - case `${SYSCTL_N} hw.machine_arch` in - i386) + case `${SYSCTL_N} hw.machine_arch` in + i386) # Don't start if apm is already running /etc/rc.d/apm forcestatus > /dev/null && return 1 - ;; + ;; *) return 1 ;; - esac + esac return 0 } ==== //depot/projects/s390/etc/rc.d/archdep#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.1 2002/09/05 20:29:18 gordon Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.2 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: archdep @@ -17,7 +17,7 @@ # unaligned_warnings() { - if ! checkyesno unaligned_print ; then + if ! checkyesno unaligned_print; then sysctl machdep.unaligned_print=0 fi } @@ -26,7 +26,7 @@ # osf1_compat() { - if checkyesno osf1_enable ; then + if checkyesno osf1_enable; then echo -n ' OSF/1' if ! kldstat -v | grep osf1_ecoff > /dev/null; then kldload osf1 > /dev/null 2>&1 @@ -38,7 +38,7 @@ # ibcs2_compat() { - if checkyesno ibcs2_enable ; then + if checkyesno ibcs2_enable; then echo -n ' ibcs2' kldload ibcs2 > /dev/null 2>&1 case ${ibcs2_loaders} in @@ -57,7 +57,7 @@ # x10_daemon() { - if checkyesno xtend_enable ; then + if checkyesno xtend_enable; then echo -n ' xtend' /usr/libexec/xtend fi ==== //depot/projects/s390/etc/rc.d/atm2.sh#3 (text+ko) ==== @@ -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/atm2.sh,v 1.10 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/atm2.sh,v 1.11 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: atm2 @@ -90,7 +90,7 @@ # XXX - required by atm3.sh. I don't like having one script depend # on variables in another script (especially in a dynamic # ordered system like this), but it's necessary for the moment. - # + # export atm_atmarpd export atm_scspd } ==== //depot/projects/s390/etc/rc.d/bootconf.sh#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: bootconf.sh,v 1.5 2002/03/25 03:22:10 wiz Exp $ -# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.3 2002/10/01 13:29:44 ru Exp $ +# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: bootconf @@ -32,7 +32,7 @@ case $name in current|default|\*) continue - ;; + ;; *) if [ "$name" = "$default" ]; then echo -n "${spc}[${name}]" @@ -53,7 +53,7 @@ (sleep 30 && kill -ALRM $master) >/dev/null 2>&1 & read conf trap : ALRM - if [ -z $conf ] ; then + if [ -z $conf ]; then conf=$default fi if [ ! -d /etc/etc.$conf/. ]; then @@ -70,7 +70,7 @@ ;; esac - if [ -f /etc/rc.conf ] ; then + if [ -f /etc/rc.conf ]; then . /etc/rc.conf fi } ==== //depot/projects/s390/etc/rc.d/cleanvar#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.2 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: cleanvar @@ -10,7 +10,7 @@ purgedir() { - local dir file + local dir file if [ $# -eq 0 ]; then purgedir . ==== //depot/projects/s390/etc/rc.d/cleartmp#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: cleartmp @@ -27,7 +27,7 @@ (cd /tmp && rm -rf [a-km-pr-zA-Z]* && find -x . ! -name . ! -name lost+found ! -name quota.user \ ! -name quota.group -exec rm -rf -- {} \; -type d -prune) - + case ${OSTYPE} in FreeBSD) # Remove X lock files, since they will prevent you from ==== //depot/projects/s390/etc/rc.d/devdb#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devdb,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/devdb,v 1.2 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: devdb @@ -9,9 +9,9 @@ # Build device name databases if we are not using DEVFS # -if sysctl vfs.devfs.generation > /dev/null 2>&1 ; then - rm -f /var/run/dev.db +if sysctl vfs.devfs.generation > /dev/null 2>&1; then + rm -f /var/run/dev.db else - dev_mkdb + dev_mkdb fi ==== //depot/projects/s390/etc/rc.d/diskless#3 (text+ko) ==== @@ -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/diskless,v 1.22 2002/10/01 13:29:44 ru Exp $ +# $FreeBSD: src/etc/rc.d/diskless,v 1.23 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: diskless @@ -55,8 +55,8 @@ # If there is a global system configuration file, suck it in. # if [ -r /etc/rc.subr ]; then - . /etc/rc.subr - load_rc_config $name + . /etc/rc.subr + load_rc_config $name elif [ -r /etc/defaults/rc.conf ]; then . /etc/defaults/rc.conf source_rc_confs @@ -108,7 +108,7 @@ chmod 01777 /tmp fi -if sysctl vfs.devfs.generation > /dev/null 2>&1 ; then +if sysctl vfs.devfs.generation > /dev/null 2>&1; then # we have DEVFS, no worries... true else ==== //depot/projects/s390/etc/rc.d/fsck#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: fsck @@ -83,7 +83,7 @@ stop_boot ;; esac - ;; + ;; 12) echo "Boot interrupted." stop_boot ==== //depot/projects/s390/etc/rc.d/initdiskless#3 (text+ko) ==== @@ -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.20 2002/10/02 00:59:14 dd Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.21 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: initdiskless @@ -81,19 +81,19 @@ bootp_ipbca="" iflist=`ifconfig -l` for i in ${iflist} ; do - set `ifconfig ${i}` - while [ $# -ge 1 ] ; do - if [ "${bootp_ifc}" = "" -a "$1" = "inet" ] ; then - bootp_ifc=${i} ; bootp_ipa=${2} ; shift - fi - if [ "${bootp_ipbca}" = "" -a "$1" = "broadcast" ] ; then - bootp_ipbca=$2; shift - fi - shift - done - if [ "${bootp_ifc}" != "" ] ; then - break - fi + set `ifconfig ${i}` + while [ $# -ge 1 ] ; do + if [ "${bootp_ifc}" = "" -a "$1" = "inet" ]; then + bootp_ifc=${i} ; bootp_ipa=${2} ; shift + fi + if [ "${bootp_ipbca}" = "" -a "$1" = "broadcast" ]; then + bootp_ipbca=$2; shift + fi + shift + done + if [ "${bootp_ifc}" != "" ]; then + break + fi done echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca}" ==== //depot/projects/s390/etc/rc.d/ip6fw#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6fw,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ip6fw,v 1.2 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: ip6fw @@ -48,7 +48,7 @@ # Enable firewall logging # - if checkyesno ipv6_firewall_logging ; then + if checkyesno ipv6_firewall_logging; then echo 'IPv6 Firewall logging=YES' sysctl net.inet6.ip6.fw.verbose=1 >/dev/null fi ==== //depot/projects/s390/etc/rc.d/ipfilter#3 (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.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: ipfilter @@ -40,7 +40,7 @@ FreeBSD) # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then - if kldload ipl ; then + if kldload ipl; then echo 'IP-filter module loaded.' else warn 'IP-filter module failed to load.' @@ -79,7 +79,7 @@ case ${OSTYPE} in FreeBSD) ${ipfilter_program:-/sbin/ipf} -Fa -f \ - "${ipfilter_rules}" ${ipfilter_flags} + "${ipfilter_rules}" ${ipfilter_flags} ;; NetBSD) /sbin/ipf -E -Fa @@ -115,7 +115,7 @@ case ${OSTYPE} in FreeBSD) ${ipfilter_program:-/sbin/ipf} -I -Fa -f \ - "${ipfilter_rules}" ${ipfilter_flags} + "${ipfilter_rules}" ${ipfilter_flags} ;; NetBSD) /sbin/ipf -I -Fa ==== //depot/projects/s390/etc/rc.d/ipfw#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.2 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: ipfw @@ -18,8 +18,8 @@ ipfw_precmd() { - if ! ${SYSCTL} net.inet.ip.fw.enable > /dev/null 2>&1 ; then - if ! kldload ipfw ; then + if ! ${SYSCTL} net.inet.ip.fw.enable > /dev/null 2>&1; then + if ! kldload ipfw; then warn unable to load firewall module. return 1 fi @@ -39,10 +39,10 @@ # Network Address Translation daemon # - if checkyesno natd_enable ; then + if checkyesno natd_enable; then if [ -n "${natd_interface}" ]; then if echo ${natd_interface} | \ - grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then natd_flags="$natd_flags -a ${natd_interface}" else natd_flags="$natd_flags -n ${natd_interface}" ==== //depot/projects/s390/etc/rc.d/ipmon#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: ipmon @@ -26,10 +26,10 @@ ipmon_precmd() { - # Make sure ipfilter is loaded before continuing - if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1 ; then - return 1 - fi + # Make sure ipfilter is loaded before continuing + if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then + return 1 + fi return 0 } ==== //depot/projects/s390/etc/rc.d/ipnat#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: ipnat @@ -35,7 +35,7 @@ ipnat_precmd() { # Make sure ipfilter is loaded before continuing - if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1 ; then + if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then err 'ipnat requires ipfilter be loaded' return 1 fi @@ -56,7 +56,7 @@ echo '.' # restore filter/NAT state tables after loading the rules - if checkyesno ipfs_enable ; then + if checkyesno ipfs_enable; then if [ -r "/var/db/ipf/ipstate.ipf" ]; then echo -n ' ipfs' ${ipfs_program:-/sbin/ipfs} -R ${ipfs_flags} ==== //depot/projects/s390/etc/rc.d/isdnd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.11 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.12 2002/10/12 10:31:31 schweikh Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # @@ -65,7 +65,7 @@ # Start isdntrace # - if checkyesno isdn_trace ; then + if checkyesno isdn_trace; then echo -n ' isdntrace' nohup /usr/sbin/isdntrace ${isdn_traceflags} >/dev/null 2>&1 & echo '.' ==== //depot/projects/s390/etc/rc.d/local#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/local,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.3 2002/10/12 07:23:43 dd Exp $ # # PROVIDE: local @@ -17,16 +17,20 @@ local_start() { + echo -n 'Starting local daemons:' if [ -f /etc/rc.local ]; then . /etc/rc.local fi + echo '.' } local_stop() { + echo -n 'Shutting down loacal daemons:' if [ -f /etc/rc.shutdown.local ]; then . /etc/rc.shutdown.local fi + echo '.' } load_rc_config $name ==== //depot/projects/s390/etc/rc.d/mountcritremote#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.4 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: mountcritremote @@ -35,7 +35,7 @@ case "`mount -d -a -t nfs 2> /dev/null`" in *mount_nfs*) # Handle absent nfs client support - if ! sysctl vfs.nfs >/dev/null 2>&1 ; then + if ! sysctl vfs.nfs >/dev/null 2>&1; then kldload nfsclient || warn 'nfs mount ' \ 'requested, but no nfs client in kernel' \ return 1 @@ -55,7 +55,7 @@ mount -a -t nfs echo '.' - # Mount other network filesystems if present in /etc/fstab + # Mount other network filesystems if present in /etc/fstab. for i in ${networkfs_types}; do fstype=${i%:*} fsdecr=${i#*:} @@ -71,7 +71,7 @@ esac done - # Cleanup /var again just in case it's a network mount + # Cleanup /var again just in case it's a network mount. /etc/rc.d/cleanvar start rm -f /var/run/clean_var /var/spool/lock/clean_var ;; ==== //depot/projects/s390/etc/rc.d/mountd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.8 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.9 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: mountd @@ -23,7 +23,7 @@ FreeBSD) if ! checkyesno rpcbind_enable && \ ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then + then force_depend rpcbind || return 1 fi @@ -31,12 +31,12 @@ # case ${nfs_server_enable} in [Yy][Ee][Ss]) - if checkyesno weak_mountd_authentication ; then + if checkyesno weak_mountd_authentication; then mountd_flags="${mountd_flags} -n" fi ;; *) - if checkyesno mountd_enable ; then + if checkyesno mountd_enable; then checkyesno weak_mountd_authentication && mountd_flags="-n" fi esac ==== //depot/projects/s390/etc/rc.d/named#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/named,v 1.4 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.5 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: named @@ -52,18 +52,18 @@ cp -p /usr/libexec/named-xfer "${named_chrootdir}/usr/libexec" fi - # Copy /dev/null over, if neccessary. Preserve everything (perms, - # ownership, mod times). - # - if [ ! -c "${named_chrootdir}/dev/null" ]; then - rm -f "${named_chrootdir}/dev/null" - ( cd /dev ; /bin/pax -rw -pe null "${named_chrootdir}/dev" ) - fi + # Copy /dev/null over, if neccessary. Preserve everything (perms, + # ownership, mod times). + # + if [ ! -c "${named_chrootdir}/dev/null" ]; then + rm -f "${named_chrootdir}/dev/null" + ( cd /dev ; /bin/pax -rw -pe null "${named_chrootdir}/dev" ) + fi - # Copy local timezone information if it's not up-to-date. - # - if [ -f /etc/localtime ]; then - cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" || \ + # Copy local timezone information if it's not up-to-date. + # + if [ -f /etc/localtime ]; then + cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" || \ cp -p /etc/localtime "${named_chrootdir}/etc/localtime" fi } ==== //depot/projects/s390/etc/rc.d/network1#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -x # -# $FreeBSD: src/etc/rc.d/network1,v 1.141 2002/09/20 18:31:54 ume Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.142 2002/10/12 10:31:31 schweikh Exp $ # # PROVIDE: network1 @@ -15,50 +15,50 @@ convert_host_conf() { - host_conf=$1; shift; - nsswitch_conf=$1; shift; - awk ' \ - /^[:blank:]*#/ { next } \ - /(hosts|local|file)/ { nsswitch[c] = "files"; c++; next } \ - /(dns|bind)/ { nsswitch[c] = "dns"; c++; next } \ - /nis/ { nsswitch[c] = "nis"; c++; next } \ - { printf "Warning: unrecognized line [%s]", $0 > "/dev/stderr" } \ - END { \ - printf "hosts: "; \ - for (i in nsswitch) printf "%s ", nsswitch[i]; \ - printf "\n"; \ - }' < $host_conf > $nsswitch_conf + host_conf=$1; shift; + nsswitch_conf=$1; shift; + awk ' \ + /^[:blank:]*#/ { next } \ + /(hosts|local|file)/ { nsswitch[c] = "files"; c++; next } \ + /(dns|bind)/ { nsswitch[c] = "dns"; c++; next } \ + /nis/ { nsswitch[c] = "nis"; c++; next } \ + { printf "Warning: unrecognized line [%s]", $0 > "/dev/stderr" } \ + END { \ + printf "hosts: "; \ + for (i in nsswitch) printf "%s ", nsswitch[i]; \ + printf "\n"; \ + }' < $host_conf > $nsswitch_conf } generate_host_conf() { - nsswitch_conf=$1; shift; - host_conf=$1; shift; + nsswitch_conf=$1; shift; + host_conf=$1; shift; - awk ' -BEGIN { - xlat["files"] = "hosts"; - xlat["dns"] = "bind"; - xlat["nis"] = "nis"; - cont = 0; -} -sub(/^[\t ]*hosts:/, "") || cont { - if (!cont) - srcs = "" - sub(/#.*/, "") - gsub(/[][]/, " & ") - cont = sub(/\\$/, "") - srcs = srcs " " $0 -} -END { - print "# Auto-generated from nsswitch.conf, do not edit" - ns = split(srcs, s) - for (n = 1; n <= ns; ++n) { - if (s[n] in xlat) - print xlat[s[n]] - } -} -' <$nsswitch_conf >$host_conf + awk ' + BEGIN { + xlat["files"] = "hosts"; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210121126.g9CBQTN7098402>