From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 00:20:14 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 542C5106566B; Sat, 1 Jan 2011 00:20:14 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43E608FC1A; Sat, 1 Jan 2011 00:20:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p010KEfo092974; Sat, 1 Jan 2011 00:20:14 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p010KEk5092972; Sat, 1 Jan 2011 00:20:14 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201101010020.p010KEk5092972@svn.freebsd.org> From: Juli Mallett Date: Sat, 1 Jan 2011 00:20:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216862 - head/sys/mips/mips X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 00:20:14 -0000 Author: jmallett Date: Sat Jan 1 00:20:14 2011 New Revision: 216862 URL: http://svn.freebsd.org/changeset/base/216862 Log: o) When trying to determine whether the pcpu pointer is a managed address, check not just that it is greater than the minimal kernel virtual address, but also that it is less than the maximal kernel virtual address. On n64 kernels, the pcpup comes out of a direct-mapped address that, with an unsigned compare, is rather greater than the minimal kernel virtual address. o) Turn the panic if interrupts are disabled in cpu_idle into a KASSERT since on other architectures it's behind INVARIANTS anyway. o) Add a check that not all interrupts are masked, too. o) Add cpu_idleclock() and cpu_activeclock() use to cpu_idle as is done on other architectures. Modified: head/sys/mips/mips/machdep.c Modified: head/sys/mips/mips/machdep.c ============================================================================== --- head/sys/mips/mips/machdep.c Fri Dec 31 22:49:13 2010 (r216861) +++ head/sys/mips/mips/machdep.c Sat Jan 1 00:20:14 2011 (r216862) @@ -426,8 +426,10 @@ cpu_pcpu_init(struct pcpu *pcpu, int cpu pcpu->pc_next_asid = 1; pcpu->pc_asid_generation = 1; #ifdef SMP - if ((vm_offset_t)pcpup >= VM_MIN_KERNEL_ADDRESS) + if ((vm_offset_t)pcpup >= VM_MIN_KERNEL_ADDRESS && + (vm_offset_t)pcpup <= VM_MAX_KERNEL_ADDRESS) { mips_pcpu_tlb_init(pcpu); + } #endif } @@ -483,10 +485,20 @@ spinlock_exit(void) void cpu_idle(int busy) { - if (mips_rd_status() & MIPS_SR_INT_IE) - __asm __volatile ("wait"); - else - panic("ints disabled in idleproc!"); + KASSERT((mips_rd_status() & MIPS_SR_INT_IE) != 0, + ("interrupts disabled in idle process.")); + KASSERT((mips_rd_status() & MIPS_INT_MASK) != 0, + ("all interrupts masked in idle process.")); + + if (!busy) { + critical_enter(); + cpu_idleclock(); + } + __asm __volatile ("wait"); + if (!busy) { + cpu_activeclock(); + critical_exit(); + } } int From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 00:34:55 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72C1D1065672; Sat, 1 Jan 2011 00:34:55 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mx1.stack.nl (relay02.stack.nl [IPv6:2001:610:1108:5010::104]) by mx1.freebsd.org (Postfix) with ESMTP id 0CB688FC25; Sat, 1 Jan 2011 00:34:55 +0000 (UTC) Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132]) by mx1.stack.nl (Postfix) with ESMTP id 1E30135994D; Sat, 1 Jan 2011 01:34:54 +0100 (CET) Received: by turtle.stack.nl (Postfix, from userid 1677) id 11EED1730D; Sat, 1 Jan 2011 01:34:54 +0100 (CET) Date: Sat, 1 Jan 2011 01:34:54 +0100 From: Jilles Tjoelker To: Erik Trulsson Message-ID: <20110101003453.GA61932@stack.nl> References: <201012301806.oBUI6VcW046731@svn.freebsd.org> <20101231144308.GA55052@stack.nl> <20101231165552.GA24854@owl.midgard.homeip.net> <20101231190058.GA79467@freebsd.org> <20101231223114.GA26424@owl.midgard.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101231223114.GA26424@owl.midgard.homeip.net> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, Alexander Best , svn-src-all@freebsd.org, src-committers@freebsd.org, Pawel Jakub Dawidek Subject: Re: svn commit: r216823 - head/sbin/shutdown X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 00:34:55 -0000 On Fri, Dec 31, 2010 at 11:31:14PM +0100, Erik Trulsson wrote: > On Fri, Dec 31, 2010 at 07:00:58PM +0000, Alexander Best wrote: > > another thought: running 'reboot' instead of 'shutdown -r now' *can* cause > > harm to the system, because an important rc.shutdown script wasn't executed. > > however running 'shutdown -r now' in single-user mode e.g. will cause a few > > sterr warnings; however it *cannot* cause any harm. > Oh, yes, it can! (And I have been burnt by it once, after which I got > very careful about not using 'shutdown -r now' from single user mode.) > Take a look at /etc/rc.d/mixer > At shutdown it saves the current state of the soundcard mixer values > into a file and at start it restores the mixer values from that file. > If you boot into single user mode the start function will of course not > be executed leaving the mixer values at their default values. If you > then use 'shutdown' these default values are what will be saved, > overwriting whatever values had been saved before, while if you had > instead had used 'reboot' the old saved values would have been left > untouched. > If you never change the mixer values from their defaukt you won't notice > anything, but otherwise it might take a while to figure out why the > sound is at the 'wrong' volume. > This is one example I have found where bad things can happen if you use > 'shutdown' when you should have used 'reboot'. I am fairly sure that > there are other instances that I just haven't run into (yet.) Yes, but I consider this a bug in either init or the rc system. The problem already exists if shutdown is used from single-user. Ctrl+Alt+Del also signals init, causing proper shutdown from multi-user but mixer value loss from single-user. If it is a bug in init, init should not run rc.shutdown when it has not run any /etc/rc things, in the assumption that rc.shutdown shuts down the things that /etc/rc has started. Furthermore, this seems reasonable because rc.shutdown is also run when the system goes from multi-user to single-user; it seems strange to run it another time when the system goes down from single-user. If it is a bug in /etc/rc.d/mixer, /etc/rc.d/mixer should somehow track if it has been started, and ignore any stops if not. This seems less general than changing init. If it is a bug in /etc/rc, it should do the above tracking somehow for all scripts. -- Jilles Tjoelker From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 08:47:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84D1B106566C; Sat, 1 Jan 2011 08:47:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 72ED48FC14; Sat, 1 Jan 2011 08:47:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p018lcpj004415; Sat, 1 Jan 2011 08:47:38 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p018lcuK004412; Sat, 1 Jan 2011 08:47:38 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201101010847.p018lcuK004412@svn.freebsd.org> From: Konstantin Belousov Date: Sat, 1 Jan 2011 08:47:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216869 - in stable/8/sys: amd64/include i386/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 08:47:38 -0000 Author: kib Date: Sat Jan 1 08:47:38 2011 New Revision: 216869 URL: http://svn.freebsd.org/changeset/base/216869 Log: MFC r216524: Inform a compiler which asm statements in the x86 implementation of atomics change eflags. Modified: stable/8/sys/amd64/include/atomic.h stable/8/sys/i386/include/atomic.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/amd64/include/atomic.h ============================================================================== --- stable/8/sys/amd64/include/atomic.h Sat Jan 1 07:23:06 2011 (r216868) +++ stable/8/sys/amd64/include/atomic.h Sat Jan 1 08:47:38 2011 (r216869) @@ -108,7 +108,8 @@ atomic_##NAME##_##TYPE(volatile u_##TYPE { \ __asm __volatile(MPLOCKED OP \ : "=m" (*p) \ - : CONS (V), "m" (*p)); \ + : CONS (V), "m" (*p) \ + : "cc"); \ } \ \ static __inline void \ @@ -117,7 +118,7 @@ atomic_##NAME##_barr_##TYPE(volatile u_# __asm __volatile(MPLOCKED OP \ : "=m" (*p) \ : CONS (V), "m" (*p) \ - : "memory"); \ + : "memory", "cc"); \ } \ struct __hack @@ -145,7 +146,7 @@ atomic_cmpset_int(volatile u_int *dst, u : "r" (src), /* 2 */ "a" (exp), /* 3 */ "m" (*dst) /* 4 */ - : "memory"); + : "memory", "cc"); return (res); } @@ -166,7 +167,7 @@ atomic_cmpset_long(volatile u_long *dst, : "r" (src), /* 2 */ "a" (exp), /* 3 */ "m" (*dst) /* 4 */ - : "memory"); + : "memory", "cc"); return (res); } @@ -185,8 +186,8 @@ atomic_fetchadd_int(volatile u_int *p, u "# atomic_fetchadd_int" : "+r" (v), /* 0 (result) */ "=m" (*p) /* 1 */ - : "m" (*p)); /* 2 */ - + : "m" (*p) /* 2 */ + : "cc"); return (v); } @@ -204,8 +205,8 @@ atomic_fetchadd_long(volatile u_long *p, "# atomic_fetchadd_long" : "+r" (v), /* 0 (result) */ "=m" (*p) /* 1 */ - : "m" (*p)); /* 2 */ - + : "m" (*p) /* 2 */ + : "cc"); return (v); } @@ -249,7 +250,7 @@ atomic_load_acq_##TYPE(volatile u_##TYPE : "=a" (res), /* 0 */ \ "=m" (*p) /* 1 */ \ : "m" (*p) /* 2 */ \ - : "memory"); \ + : "memory", "cc"); \ \ return (res); \ } \ Modified: stable/8/sys/i386/include/atomic.h ============================================================================== --- stable/8/sys/i386/include/atomic.h Sat Jan 1 07:23:06 2011 (r216868) +++ stable/8/sys/i386/include/atomic.h Sat Jan 1 08:47:38 2011 (r216869) @@ -106,7 +106,8 @@ atomic_##NAME##_##TYPE(volatile u_##TYPE { \ __asm __volatile(MPLOCKED OP \ : "=m" (*p) \ - : CONS (V), "m" (*p)); \ + : CONS (V), "m" (*p) \ + : "cc"); \ } \ \ static __inline void \ @@ -115,7 +116,7 @@ atomic_##NAME##_barr_##TYPE(volatile u_# __asm __volatile(MPLOCKED OP \ : "=m" (*p) \ : CONS (V), "m" (*p) \ - : "memory"); \ + : "memory", "cc"); \ } \ struct __hack @@ -172,7 +173,7 @@ atomic_cmpset_int(volatile u_int *dst, u : "r" (src), /* 2 */ "a" (exp), /* 3 */ "m" (*dst) /* 4 */ - : "memory"); + : "memory", "cc"); return (res); } @@ -193,8 +194,8 @@ atomic_fetchadd_int(volatile u_int *p, u "# atomic_fetchadd_int" : "+r" (v), /* 0 (result) */ "=m" (*p) /* 1 */ - : "m" (*p)); /* 2 */ - + : "m" (*p) /* 2 */ + : "cc"); return (v); } @@ -238,7 +239,7 @@ atomic_load_acq_##TYPE(volatile u_##TYPE : "=a" (res), /* 0 */ \ "=m" (*p) /* 1 */ \ : "m" (*p) /* 2 */ \ - : "memory"); \ + : "memory", "cc"); \ \ return (res); \ } \ From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 13:26:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D05A5106564A; Sat, 1 Jan 2011 13:26:18 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7E6E58FC13; Sat, 1 Jan 2011 13:26:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01DQIiL011765; Sat, 1 Jan 2011 13:26:18 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01DQI8O011760; Sat, 1 Jan 2011 13:26:18 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201101011326.p01DQI8O011760@svn.freebsd.org> From: Jilles Tjoelker Date: Sat, 1 Jan 2011 13:26:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216870 - in head: bin/sh tools/regression/bin/sh/errors X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 13:26:19 -0000 Author: jilles Date: Sat Jan 1 13:26:18 2011 New Revision: 216870 URL: http://svn.freebsd.org/changeset/base/216870 Log: sh: Check readonly status for assignments on regular builtins. An error message is written, the builtin is not executed, nonzero exit status is returned but the shell does not abort. This was already checked for special builtins and external commands, with the same consequences except that the shell aborts for special builtins. Obtained from: NetBSD Added: head/tools/regression/bin/sh/errors/assignment-error2.0 (contents, props changed) Modified: head/bin/sh/eval.c head/bin/sh/var.c head/bin/sh/var.h Modified: head/bin/sh/eval.c ============================================================================== --- head/bin/sh/eval.c Sat Jan 1 08:47:38 2011 (r216869) +++ head/bin/sh/eval.c Sat Jan 1 13:26:18 2011 (r216870) @@ -997,8 +997,7 @@ evalcommand(union node *cmd, int flags, */ if (argc == 0 && !(flags & EV_BACKCMD)) cmdentry.special = 1; - if (cmdentry.special) - listsetvar(cmdenviron); + listsetvar(cmdenviron, cmdentry.special ? 0 : VNOSET); if (argc > 0) bltinsetlocale(); commandname = argv[0]; Modified: head/bin/sh/var.c ============================================================================== --- head/bin/sh/var.c Sat Jan 1 08:47:38 2011 (r216869) +++ head/bin/sh/var.c Sat Jan 1 13:26:18 2011 (r216870) @@ -333,6 +333,8 @@ setvareq(char *s, int flags) len = strchr(s, '=') - s; error("%.*s: is read only", len, s); } + if (flags & VNOSET) + return; INTOFF; if (vp->func && (flags & VNOFUNC) == 0) @@ -365,6 +367,8 @@ setvareq(char *s, int flags) } } /* not found */ + if (flags & VNOSET) + return; vp = ckmalloc(sizeof (*vp)); vp->flags = flags; vp->text = s; @@ -386,13 +390,13 @@ setvareq(char *s, int flags) */ void -listsetvar(struct strlist *list) +listsetvar(struct strlist *list, int flags) { struct strlist *lp; INTOFF; for (lp = list ; lp ; lp = lp->next) { - setvareq(savestr(lp->text), 0); + setvareq(savestr(lp->text), flags); } INTON; } Modified: head/bin/sh/var.h ============================================================================== --- head/bin/sh/var.h Sat Jan 1 08:47:38 2011 (r216869) +++ head/bin/sh/var.h Sat Jan 1 13:26:18 2011 (r216870) @@ -45,6 +45,7 @@ #define VSTACK 0x10 /* text is allocated on the stack */ #define VUNSET 0x20 /* the variable is not set */ #define VNOFUNC 0x40 /* don't call the callback function */ +#define VNOSET 0x80 /* do not set variable - just readonly test */ struct var { @@ -106,7 +107,7 @@ void initvar(void); void setvar(const char *, const char *, int); void setvareq(char *, int); struct strlist; -void listsetvar(struct strlist *); +void listsetvar(struct strlist *, int); char *lookupvar(const char *); char *bltinlookup(const char *, int); void bltinsetlocale(void); Added: head/tools/regression/bin/sh/errors/assignment-error2.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/errors/assignment-error2.0 Sat Jan 1 13:26:18 2011 (r216870) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +set -e +HOME=/ +readonly HOME +cd /sbin +{ HOME=/bin cd; } 2>/dev/null || : +[ "$(pwd)" != /bin ] From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 14:57:36 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93FC21065670; Sat, 1 Jan 2011 14:57:36 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mx1.stack.nl (relay04.stack.nl [IPv6:2001:610:1108:5010::107]) by mx1.freebsd.org (Postfix) with ESMTP id 308878FC13; Sat, 1 Jan 2011 14:57:36 +0000 (UTC) Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132]) by mx1.stack.nl (Postfix) with ESMTP id 33B9D1DD654; Sat, 1 Jan 2011 15:57:35 +0100 (CET) Received: by turtle.stack.nl (Postfix, from userid 1677) id 1C3A01730D; Sat, 1 Jan 2011 15:57:35 +0100 (CET) Date: Sat, 1 Jan 2011 15:57:35 +0100 From: Jilles Tjoelker To: Warner Losh Message-ID: <20110101145734.GA72435@stack.nl> References: <201012301806.oBUI6VcW046731@svn.freebsd.org> <20101231144308.GA55052@stack.nl> <4D1E51BD.8090707@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4D1E51BD.8090707@bsdimp.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Pawel Jakub Dawidek Subject: Re: svn commit: r216823 - head/sbin/shutdown X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 14:57:36 -0000 On Fri, Dec 31, 2010 at 02:57:17PM -0700, Warner Losh wrote: > On 12/31/2010 07:43, Jilles Tjoelker wrote: > > On Thu, Dec 30, 2010 at 06:06:31PM +0000, Pawel Jakub Dawidek wrote: > >> Author: pjd > >> Date: Thu Dec 30 18:06:31 2010 > >> New Revision: 216823 > >> URL: http://svn.freebsd.org/changeset/base/216823 > >> Log: > >> For compatibility with Linux and Solaris add poweroff(8). > >> It is implemented as a hard link to shutdown(8) and it is equivalent of: > >> # shutdown -p now > > If we go that way, then for consistency reboot(8) and halt(8) should > > also be equivalent to calling shutdown -r now and shutdown -h now > > respectively, unless conflicting options are given. Linux has a -f > > option for what's currently reboot's and halt's default action, and > > fastboot(8)/fasthalt(8) could also retain the current behaviour. > > I would be in favour of this change. > I'm not sure I'd go this far. I really *LIKE* that halt/reboot is the > low-level interface that shutdown -r now calls. I'm not sure that > moving away from this would be a good idea. It cuts out many levels of > indirection that can be useful in many instances. But that's not how it works. After printing all the warnings, shutdown(8) signals init. Ctrl+Alt+Del also signals init (and that's nontrivial to change, because it's in the kernel). Only if the strange -o option is used does shutdown execute reboot(8) or halt(8). I think the canonical low-level interface should be sending signals to init. reboot(8) and halt(8) doing things on their own should be banished to non-default options. (Something should be fixed first so that /etc/rc.d/mixer doesn't destroy the user's settings from single-user mode.) -- Jilles Tjoelker From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 15:25:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF555106564A; Sat, 1 Jan 2011 15:25:15 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BE1B38FC1B; Sat, 1 Jan 2011 15:25:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01FPFig014290; Sat, 1 Jan 2011 15:25:15 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01FPFZp014289; Sat, 1 Jan 2011 15:25:15 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201101011525.p01FPFZp014289@svn.freebsd.org> From: Jilles Tjoelker Date: Sat, 1 Jan 2011 15:25:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216871 - head/tools/regression/bin/sh/builtins X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 15:25:15 -0000 Author: jilles Date: Sat Jan 1 15:25:15 2011 New Revision: 216871 URL: http://svn.freebsd.org/changeset/base/216871 Log: sh: Test that exit $? replaces the original exit status in an EXIT trap. Added: head/tools/regression/bin/sh/builtins/exit1.0 (contents, props changed) Added: head/tools/regression/bin/sh/builtins/exit1.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/builtins/exit1.0 Sat Jan 1 15:25:15 2011 (r216871) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +# exit with an argument should overwrite the exit status in an EXIT trap. + +trap 'true; exit $?' 0 +false From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 16:59:06 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 523F9106564A; Sat, 1 Jan 2011 16:59:06 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 40E4A8FC13; Sat, 1 Jan 2011 16:59:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01Gx65C016337; Sat, 1 Jan 2011 16:59:06 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01Gx6Wq016335; Sat, 1 Jan 2011 16:59:06 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201101011659.p01Gx6Wq016335@svn.freebsd.org> From: Bruce Cran Date: Sat, 1 Jan 2011 16:59:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216873 - head/sys/vm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 16:59:06 -0000 Author: brucec Date: Sat Jan 1 16:59:05 2011 New Revision: 216873 URL: http://svn.freebsd.org/changeset/base/216873 Log: There can be more than 0x20000000 swap meta blocks allocated if a swap-backed md(4) device is used. Don't panic when deallocating such a device if swap has been used. PR: kern/133170 Discussed with: kib MFC after: 3 days Modified: head/sys/vm/swap_pager.c Modified: head/sys/vm/swap_pager.c ============================================================================== --- head/sys/vm/swap_pager.c Sat Jan 1 16:47:12 2011 (r216872) +++ head/sys/vm/swap_pager.c Sat Jan 1 16:59:05 2011 (r216873) @@ -1679,8 +1679,6 @@ swap_pager_isswapped(vm_object_t object, } } index += SWAP_META_PAGES; - if (index > 0x20000000) - panic("swap_pager_isswapped: failed to locate all swap meta blocks"); } mtx_unlock(&swhash_mtx); return (0); @@ -1995,8 +1993,6 @@ swp_pager_meta_free_all(vm_object_t obje } mtx_unlock(&swhash_mtx); index += SWAP_META_PAGES; - if (index > 0x20000000) - panic("swp_pager_meta_free_all: failed to locate all swap meta blocks"); } } From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 17:39:38 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FFE3106566B; Sat, 1 Jan 2011 17:39:38 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A8E68FC1D; Sat, 1 Jan 2011 17:39:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01Hdcjm017188; Sat, 1 Jan 2011 17:39:38 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01Hdchb017186; Sat, 1 Jan 2011 17:39:38 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201101011739.p01Hdchb017186@svn.freebsd.org> From: Alan Cox Date: Sat, 1 Jan 2011 17:39:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216874 - head/sys/vm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 17:39:38 -0000 Author: alc Date: Sat Jan 1 17:39:38 2011 New Revision: 216874 URL: http://svn.freebsd.org/changeset/base/216874 Log: Make a couple refinements to r216799 and r216810. In particular, revise a comment and move it to its proper place. Reviewed by: kib Modified: head/sys/vm/vm_object.c Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Sat Jan 1 16:59:05 2011 (r216873) +++ head/sys/vm/vm_object.c Sat Jan 1 17:39:38 2011 (r216874) @@ -755,6 +755,12 @@ vm_object_terminate(vm_object_t object) vm_object_destroy(object); } +/* + * Make the page read-only so that we can clear the object flags. However, if + * this is a nosync mmap then the object is likely to stay dirty so do not + * mess with the page and do not clear the object flags. Returns TRUE if the + * page should be flushed, and FALSE otherwise. + */ static boolean_t vm_object_page_remove_write(vm_page_t p, int flags, int *clearobjflags) { @@ -808,15 +814,7 @@ vm_object_page_clean(vm_object_t object, pagerflags |= (flags & OBJPC_INVAL) != 0 ? VM_PAGER_PUT_INVAL : 0; tend = (end == 0) ? object->size : end; - - /* - * Make the page read-only so we can then clear the object flags. - * - * However, if this is a nosync mmap then the object is likely to - * stay dirty so do not mess with the page and do not clear the - * object flags. - */ - clearobjflags = 1; + clearobjflags = start == 0 && tend == object->size; rescan: curgeneration = object->generation; @@ -847,7 +845,7 @@ rescan: VOP_FSYNC(vp, (pagerflags & VM_PAGER_PUT_SYNC) ? MNT_WAIT : 0); #endif - if (clearobjflags && start == 0 && tend == object->size) + if (clearobjflags) vm_object_clear_flag(object, OBJ_MIGHTBEDIRTY); } From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 18:50:49 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F846106566C; Sat, 1 Jan 2011 18:50:49 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 63B628FC0A; Sat, 1 Jan 2011 18:50:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01IonuL018740; Sat, 1 Jan 2011 18:50:49 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01IonC3018737; Sat, 1 Jan 2011 18:50:49 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201101011850.p01IonC3018737@svn.freebsd.org> From: Rick Macklem Date: Sat, 1 Jan 2011 18:50:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216875 - in head/sys/fs: nfs nfsserver X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 18:50:49 -0000 Author: rmacklem Date: Sat Jan 1 18:50:49 2011 New Revision: 216875 URL: http://svn.freebsd.org/changeset/base/216875 Log: Add support for shared vnode locks for the Read operation in the experimental NFSv4 server. Reviewed by: kib MFC after: 2 weeks Modified: head/sys/fs/nfs/nfs_commonsubs.c head/sys/fs/nfsserver/nfs_nfsdstate.c Modified: head/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- head/sys/fs/nfs/nfs_commonsubs.c Sat Jan 1 17:39:38 2011 (r216874) +++ head/sys/fs/nfs/nfs_commonsubs.c Sat Jan 1 18:50:49 2011 (r216875) @@ -109,7 +109,7 @@ struct nfsv4_opflag nfsv4_opflag[NFSV4OP { 1, 0, 0, 0, LK_EXCLUSIVE }, /* PutFH */ { 1, 0, 0, 0, LK_EXCLUSIVE }, /* PutPubFH */ { 1, 0, 0, 0, LK_EXCLUSIVE }, /* PutRootFH */ - { 0, 1, 0, 0, LK_EXCLUSIVE }, /* Read */ + { 0, 1, 0, 0, LK_SHARED }, /* Read */ { 0, 1, 0, 0, LK_SHARED }, /* Readdir */ { 0, 1, 0, 0, LK_SHARED }, /* ReadLink */ { 0, 2, 1, 1, LK_EXCLUSIVE }, /* Remove */ Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jan 1 17:39:38 2011 (r216874) +++ head/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jan 1 18:50:49 2011 (r216875) @@ -4217,7 +4217,7 @@ static int nfsrv_clientconflict(struct nfsclient *clp, int *haslockp, __unused vnode_t vp, NFSPROC_T *p) { - int gotlock; + int gotlock, lktype; /* * If lease hasn't expired, we can't fix it. @@ -4227,7 +4227,8 @@ nfsrv_clientconflict(struct nfsclient *c return (0); if (*haslockp == 0) { NFSUNLOCKSTATE(); - NFSVOPUNLOCK(vp, 0, p); + lktype = VOP_ISLOCKED(vp); + VOP_UNLOCK(vp, 0); NFSLOCKV4ROOTMUTEX(); nfsv4_relref(&nfsv4rootfs_lock); do { @@ -4236,7 +4237,7 @@ nfsrv_clientconflict(struct nfsclient *c } while (!gotlock); NFSUNLOCKV4ROOTMUTEX(); *haslockp = 1; - NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, lktype | LK_RETRY); return (1); } NFSUNLOCKSTATE(); @@ -4278,7 +4279,7 @@ nfsrv_delegconflict(struct nfsstate *stp vnode_t vp) { struct nfsclient *clp = stp->ls_clp; - int gotlock, error, retrycnt, zapped_clp; + int gotlock, error, lktype, retrycnt, zapped_clp; nfsv4stateid_t tstateid; fhandle_t tfh; @@ -4391,7 +4392,8 @@ nfsrv_delegconflict(struct nfsstate *stp */ if (*haslockp == 0) { NFSUNLOCKSTATE(); - NFSVOPUNLOCK(vp, 0, p); + lktype = VOP_ISLOCKED(vp); + VOP_UNLOCK(vp, 0); NFSLOCKV4ROOTMUTEX(); nfsv4_relref(&nfsv4rootfs_lock); do { @@ -4400,7 +4402,7 @@ nfsrv_delegconflict(struct nfsstate *stp } while (!gotlock); NFSUNLOCKV4ROOTMUTEX(); *haslockp = 1; - NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, lktype | LK_RETRY); return (-1); } From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 20:17:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A3EC106564A; Sat, 1 Jan 2011 20:17:30 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 282228FC17; Sat, 1 Jan 2011 20:17:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01KHU3A020708; Sat, 1 Jan 2011 20:17:30 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01KHU53020706; Sat, 1 Jan 2011 20:17:30 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201101012017.p01KHU53020706@svn.freebsd.org> From: Gavin Atkinson Date: Sat, 1 Jan 2011 20:17:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216876 - head/share/misc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 20:17:30 -0000 Author: gavin Date: Sat Jan 1 20:17:29 2011 New Revision: 216876 URL: http://svn.freebsd.org/changeset/base/216876 Log: Add nodes for current and past committers that are already referenced in relationships, so they are rendered as more than just a username. Add a couple of relationships between committers who already have existing nodes to help with the rendered output. Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot ============================================================================== --- head/share/misc/committers-src.dot Sat Jan 1 18:50:49 2011 (r216875) +++ head/share/misc/committers-src.dot Sat Jan 1 20:17:29 2011 (r216876) @@ -31,26 +31,37 @@ node [color=grey62, style=filled, bgcolo alm [label="Andrew Moore\nalm@FreeBSD.org\n1993/06/12\n????/??/??"] anholt [label="Eric Anholt\nanholt@FreeBSD.org\n2002/04/22\n2008/08/07"] archie [label="Archie Cobbs\narchie@FreeBSD.org\n1998/11/06\n2006/06/09"] +arr [label="Andrew R. Reiter\narr@FreeBSD.org\n2001/11/02\n2005/05/25"] +arun [label="Arun Sharma\narun@FreeBSD.org\n2003/03/06\n2006/12/16"] asmodai [label="Jeroen Ruigrok\nasmodai@FreeBSD.org\n1999/12/16\n2001/11/16"] benjsc [label="Benjamin Close\nbenjsc@FreeBSD.org\n2007/02/09\n2010/09/15"] +billf [label="Bill Fumerola\nbillf@FreeBSD.org\n1998/11/11\n2008/11/10"] bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"] bmilekic [label="Bosko Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"] +bushman [label="Michael Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"] cjc [label="Crist J. Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] dds [label="Diomidis Spinellis\ndds@FreeBSD.org\n2003/06/20\n2010/09/22"] dhartmei [label="Daniel Hartmeier\ndhartmei@FreeBSD.org\n2004/04/06\n2008/12/08"] dmlb [label="Duncan Barclay\ndmlb@FreeBSD.org\n2001/12/14\n2008/11/10"] eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2004/05/20\n2008/11/10"] furuta [label="Atsushi Furuta\nfuruta@FreeBSD.org\n2000/06/21\n2003/03/08"] +groudier [label="Gerard Roudier\ngroudier@FreeBSD.org\n1999/12/30\n2006/04/06"] jake [label="Jake Burkholder\njake@FreeBSD.org\n2000/05/16\n2008/11/10"] jayanth [label="Jayanth Vijayaraghavan\njayanth@FreeBSD.org\n2000/05/08\n2008/11/10"] +jb [label="John Birrell\njb@FreeBSD.org\n????/??/??\n2009/12/15"] jdp [label="John Polstra\njdp@FreeBSD.org\n????/??/??\n2008/02/26"] +jedgar [label="Chris D. Faulhaber\njedgar@FreeBSD.org\n1999/12/15\n2006/04/07"] jkh [label="Jordan K. Hubbard\njkh@FreeBSD.org\n1993/06/12\n2008/06/13"] +jlemon [label="Jonathan Lemon\njlemon@FreeBSD.org\n1997/08/14\n2008/11/10"] joe [label="Josef Karthauser\njoe@FreeBSD.org\n1999/10/22\n2008/08/10"] jtc [label="J.T. Conklin\njtc@FreeBSD.org\n1993/06/12\n????/??/??"] +kbyanc [label="Kelly Yancey\nkbyanc@FreeBSD.org\n2000/07/11\n2006/07/25"] keichii [label="Michael Wu\nkeichii@FreeBSD.org\n2001/03/07\n2006/04/28"] linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2006/09/30\n2008/05/04"] mb [label="Maxim Bolotin\nmb@FreeBSD.org\n2000/04/06\n2003/03/08"] marks [label="Mark Santcroos\nmarks@FreeBSD.org\n2004/03/18\n2008/09/29"] +mike [label="Mike Barcroft\nmike@FreeBSD.org\n2001/07/17\n2006/04/28"] +msmith [label="Mike Smith\nmsmith@FreeBSD.org\n????/??/??\n2003/12/15"] murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05\n2010/07/25"] nate [label="Nate Willams\nnate@FreeBSD.org\n1993/06/12\n2003/12/15"] njl [label="Nate Lawson\nnjl@FreeBSD.org\n2002/08/07\n2008/02/16"] @@ -58,7 +69,9 @@ non [label="Noriaki Mitsnaga\nnon@FreeBS onoe [label="Atsushi Onoe\nonoe@FreeBSD.org\n2000/07/21\n2008/11/10"] rgrimes [label="Rod Grimes\nrgrimes@FreeBSD.org\n1993/06/12\n2003/03/08"] rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16\n2010/11/04"] +robert [label="Robert Drehmel\nrobert@FreeBSD.org\n2001/08/23\n2006/05/13"] rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25\n2010/12/03"] +sah [label="Sam Hopkins\nsah@FreeBSD.org\n2004/12/15\n2008/11/10"] shafeeq [label="Shafeeq Sinnamohideen\nshafeeq@FreeBSD.org\n2000/06/19\n2006/04/06"] sheldonh [label="Sheldon Hearn\nsheldonh@FreeBSD.org\n1999/06/14\n2006/05/13"] shiba [label="Takeshi Shibagaki\nshiba@FreeBSD.org\n2000/06/19\n2008/11/10"] @@ -69,6 +82,7 @@ toshi [label="Toshihiko Arai\ntoshi@Free tshiozak [label="Takuya SHIOZAKI\ntshiozak@FreeBSD.org\n2001/04/25\n2003/03/08"] uch [label="UCHIYAMA Yasushi\nuch@FreeBSD.org\n2000/06/21\n2002/04/24"] + node [color=lightblue2, style=filled, bgcolor=black]; # Current src committers go here. Try to keep things sorted. @@ -95,17 +109,22 @@ bruno [label="Bruno Ducrot\nbruno@FreeBS bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"] bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"] ceri [label="Ceri Davies\nceri@FreeBSD.org\n2006/11/07"] +cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2002/10/09"] cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"] csjp [label="Christian S.J. Peron\ncsjp@FreeBSD.org\n2004/05/04"] davidxu [label="David Xu\ndavidxu@FreeBSD.org\n2002/09/02"] +dchagin [label="Dmitry Chagin\ndchagin@FreeBSD.org\n2009/02/28"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] des [label="Dag-Erling Smorgrav\ndes@FreeBSD.org\n1998/04/03"] +dfr [label="Doug Rabson\ndfr@FreeBSD.org\n????/??/??"] dg [label="David Greenman\ndg@FreeBSD.org\n1993/06/14"] dim [label="Dimitry Andric\ndim@FreeBSD.org\n2010/08/30"] +dougb [label="Doug Barton\ndougb@FreeBSD.org\n2000/10/26"] dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"] +eivind [label="Eivind Eklund\neivind@FreeBSD.org\n????/??/??"] emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"] emax [label="Maksim Yevmenkin\nemax@FreeBSD.org\n2003/10/12"] eri [label="Ermal Luci\neri@FreeBSD.org\n2008/06/11"] @@ -120,14 +139,18 @@ gavin [label="Gavin Atkinson\ngavin@Free gibbs [label="Justin T. Gibbs\ngibbs@FreeBSD.org\n????/??/??"] glebius [label="Gleb Smirnoff\nglebius@FreeBSD.org\n2004/07/14"] gnn [label="George V. Neville-Neil\ngnn@FreeBSD.org\n2004/10/11"] +gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2002/05/17"] grehan [label="Peter Grehan\ngrehan@FreeBSD.org\n2002/08/08"] grog [label="Greg Lehey\ngrog@FreeBSD.org\n1998/08/30"] gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org\n2000/07/12"] +harti [label="Hartmut Brandt\nharti@FreeBSD.org\n2003/01/29"] +hmp [label="Hiten Pandya\nhmp@FreeBSD.org\n2004/03/23"] iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"] imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"] ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"] jamie [label="Jamie Gritton\njamie@FreeBSD.org\n2009/01/28"] jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"] +jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"] jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"] jhb [label="John Baldwin\njhb@FreeBSD.org\n1999/08/23"] jilles [label="Jilles Tjoelker\njilles@FreeBSD.org\n2009/05/22"] @@ -140,6 +163,7 @@ jon [label="Jonathan Chen\njon@FreeBSD.o jonathan [label="Jonathan Anderson\njonathan@FreeBSD.org\n2010/10/07"] julian [label="Julian Elischer\njulian@FreeBSD.org\n1993/??/??"] kaiw [label="Kai Wang\nkaiw@FreeBSD.org\n2007/09/26"] +kan [label="Alexander Kabaev\nkan@FreeBSD.org\n2002/07/21"] kensmith [label="Ken Smith\nkensmith@FreeBSD.org\n2004/01/23"] kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2006/07/23"] kib [label="Konstantin Belousov\nkib@FreeBSD.org\n2006/06/03"] @@ -148,15 +172,18 @@ le [label="Lukas Ertl\nle@FreeBSD.org\n2 lstewart [label="Lawrence Stewart\nlstewart@FreeBSD.org\n2008/10/06"] lulf [label="Ulf Lilleengen\nlulf@FreeBSD.org\n2007/10/24"] marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03"] +marius [label="Marius Strobl\nmarius@FreeBSD.org\n2004/04/17"] markm [label="Mark Murray\nmarkm@FreeBSD.org\n199?/??/??"] markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2006/06/01"] matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"] mav [label="Alexander Motin\nmav@FreeBSD.org\n2007/04/12"] maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002/02/07"] mdf [label="Matthew Fleming\nmdf@FreeBSD.org\n2010/06/04"] +mdodd [label="Matthew N. Dodd\nmdodd@FreeBSD.org\n1999/07/27"] mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"] mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] +mux [label="Maxime Henrion\nmux@FreeBSD.org\n2002/03/03"] neel [label="Neel Natu\nneel@FreeBSD.org\n2009/09/20"] netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2005/03/31"] nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2009/06/09"] @@ -175,8 +202,10 @@ ps [label="Paul Saab\nps@FreeBSD.org\n20 qingli [label="Qing Li\nqingli@FreeBSD.org\n2005/04/13"] rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2007/01/31"] randi [label="Randi Harper\nrandi@FreeBSD.org\n2010/04/20"] +rdivacky [label="Roman Divacky\nrdivacky@FreeBSD.org\n2008/03/13"] remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"] rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"] +rmacklem [label="Rick Macklem\nrmacklem@FreeBSD.org\n2009/03/27"] rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/09/15"] roberto [label="Ollivier Robert\nroberto@FreeBSD.org\n1995/02/22"] rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"] @@ -188,10 +217,14 @@ sam [label="Sam Leffler\nsam@FreeBSD.org sanpei [label="MIHIRA Sanpei Yoshiro\nsanpei@FreeBSD.org\n2000/06/19"] scf [label="Sean C. Farley\nscf@FreeBSD.org\n2007/06/24"] schweikh [label="Jens Schweikhardt\nschweikh@FreeBSD.org\n2001/04/06"] +scottl [label="Scott Long\nscottl@FreeBSD.org\n2000/09/28"] +sephe [label="Sepherosa Ziehau\nsephe@FreeBSD.org\n2007/03/28"] sepotvin [label="Stephane E. Potvin\nsepotvin@FreeBSD.org\n2007/02/15"] simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2006/03/07"] sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n2001/07/25"] +sos [label="Soren Schmidt\nsos@FreeBSD.org\n????/??/??"] sson [label="Stacey Son\nsson@FreeBSD.org\n2008/07/08"] +stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2008/08/22"] suz [label="SUZUKI Shinsuke\nsuz@FreeBSD.org\n2002/03/26"] syrinx [label="Shteryana Shopova\nsyrinx@FreeBSD.org\n2006/10/07"] takawata [label="Takanori Watanabe\ntakawata@FreeBSD.org\n2000/07/06"] @@ -208,11 +241,13 @@ versus [label="Konrad Jankowski\nversus@ weongyo [label="Weongyo Jeong\nweongyo@FreeBSD.org\n2007/12/21"] wes [label="Wes Peters\nwes@FreeBSD.org\n1998/11/25"] wilko [label="Wilko Bulte\nwilko@FreeBSD.org\n2000/01/13"] +wollman [label="Garrett Wollman\nwollman@FreeBSD.org\n????/??/??"] wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"] yar [label="Yar Tikhiy\nyar@FreeBSD.org\n2001/03/25"] yongari [label="Pyun YongHyeon\nyongari@FreeBSD.org\n2004/08/01"] zack [label="Zack Kirsch\nzack@FreeBSD.org\n2010/11/05"] zec [label="Marko Zec\nzec@FreeBSD.org\n2008/06/22"] +zml [label="Zachary Loafman\nzml@FreeBSD.org\n2009/05/27"] # Pseudo target representing rev 1.1 of commit.allow day1 [label="Birth of FreeBSD"] @@ -257,6 +292,8 @@ bz -> anchie bz -> jamie bz -> syrinx +cognet -> kevlo + cperciva -> flz cperciva -> randi cperciva -> simon @@ -274,6 +311,8 @@ des -> ru dds -> versus +dfr -> zml + dwmalone -> fanf dwmalone -> peadar dwmalone -> snb @@ -310,6 +349,7 @@ grog -> le imp -> akiyama imp -> ambrisko +imp -> andrew imp -> bmah imp -> bruno imp -> dmlb @@ -410,6 +450,8 @@ msmith -> scottl murray -> delphij +mux -> cognet + netchild -> ariff njl -> marks From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 20:35:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E1AB106566B; Sat, 1 Jan 2011 20:35:04 +0000 (UTC) (envelope-from gavin@ury.york.ac.uk) Received: from gse-mta-27.emailfiltering.com (gse-mta-27-tx.emailfiltering.com [194.116.198.158]) by mx1.freebsd.org (Postfix) with ESMTP id 9006E8FC15; Sat, 1 Jan 2011 20:35:03 +0000 (UTC) Received: from mail-gw12.york.ac.uk ([144.32.129.162]) by gse-mta-27.emailfiltering.com with emfmta (version 4.6.0.72) by TLS id 859477920 for gljennjohn@googlemail.com; 42a76fbd948f5bf; Sat, 01 Jan 2011 20:24:05 +0000 Received: from ury.york.ac.uk ([144.32.108.81]:42851) by mail-gw12.york.ac.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1PZ7zg-00089E-Cy; Sat, 01 Jan 2011 20:24:04 +0000 Received: from gavin (helo=localhost) by ury.york.ac.uk with local-esmtp (Exim 4.72) (envelope-from ) id 1PZ7zg-00065E-6K; Sat, 01 Jan 2011 20:24:04 +0000 Date: Sat, 1 Jan 2011 20:24:04 +0000 (GMT) From: Gavin Atkinson X-X-Sender: gavin@"ury.york.ac.uk." To: Gary Jennejohn In-Reply-To: <20101231155146.6ca5d336@ernst.jennejohn.org> Message-ID: References: <201012311155.oBVBtdFc071921@svn.freebsd.org> <20101231155146.6ca5d336@ernst.jennejohn.org> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216836 - head/share/misc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 20:35:04 -0000 On Fri, 31 Dec 2010, Gary Jennejohn wrote: > On Fri, 31 Dec 2010 11:55:39 +0000 (UTC) > Gavin Atkinson wrote: > > > Author: gavin > > Date: Fri Dec 31 11:55:39 2010 > > New Revision: 216836 > > URL: http://svn.freebsd.org/changeset/base/216836 > > > > Log: > > For committers listed as alumni, add the date that their commit bit was > > returned where this information is missing and easy to determine. Move > > adrian@ back to the "Active committers" section. > > > > Hmm, I (gj@) should be in there somewhere, since I was a src committer > from about 1995 until about 2007 or so. Can't find myself :( > > For that matter, I'm not in committers-ports.dot either, although I am > still active as a ports committer. As bz@ said, feel free to add yourself. It would be nice if these files were more complete, currently there are a large number of current and ex-committers, and mentor relationships missing. The current rendered output is at http://people.freebsd.org/~gavin/comm-src.png - it would be especially nice if the mentor relationships were documented for the "loose" head nodes on the righ of the diagram. Gavin From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 22:18:36 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 206B5106566C; Sat, 1 Jan 2011 22:18:36 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id B57FF8FC14; Sat, 1 Jan 2011 22:18:35 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id p01MCPXE043178; Sat, 1 Jan 2011 15:12:25 -0700 (MST) (envelope-from imp@bsdimp.com) Message-ID: <4D1FA6C9.2040309@bsdimp.com> Date: Sat, 01 Jan 2011 15:12:25 -0700 From: Warner Losh User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.12) Gecko/20101029 Thunderbird/3.1.6 MIME-Version: 1.0 To: Jilles Tjoelker References: <201012301806.oBUI6VcW046731@svn.freebsd.org> <20101231144308.GA55052@stack.nl> <4D1E51BD.8090707@bsdimp.com> <20110101145734.GA72435@stack.nl> In-Reply-To: <20110101145734.GA72435@stack.nl> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Pawel Jakub Dawidek Subject: Re: svn commit: r216823 - head/sbin/shutdown X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 22:18:36 -0000 On 01/01/2011 07:57, Jilles Tjoelker wrote: > On Fri, Dec 31, 2010 at 02:57:17PM -0700, Warner Losh wrote: >> On 12/31/2010 07:43, Jilles Tjoelker wrote: >>> On Thu, Dec 30, 2010 at 06:06:31PM +0000, Pawel Jakub Dawidek wrote: >>>> Author: pjd >>>> Date: Thu Dec 30 18:06:31 2010 >>>> New Revision: 216823 >>>> URL: http://svn.freebsd.org/changeset/base/216823 >>>> Log: >>>> For compatibility with Linux and Solaris add poweroff(8). >>>> It is implemented as a hard link to shutdown(8) and it is equivalent of: >>>> # shutdown -p now >>> If we go that way, then for consistency reboot(8) and halt(8) should >>> also be equivalent to calling shutdown -r now and shutdown -h now >>> respectively, unless conflicting options are given. Linux has a -f >>> option for what's currently reboot's and halt's default action, and >>> fastboot(8)/fasthalt(8) could also retain the current behaviour. >>> I would be in favour of this change. >> I'm not sure I'd go this far. I really *LIKE* that halt/reboot is the >> low-level interface that shutdown -r now calls. I'm not sure that >> moving away from this would be a good idea. It cuts out many levels of >> indirection that can be useful in many instances. > But that's not how it works. After printing all the warnings, > shutdown(8) signals init. Ctrl+Alt+Del also signals init (and that's > nontrivial to change, because it's in the kernel). > > Only if the strange -o option is used does shutdown execute reboot(8) or > halt(8). > > I think the canonical low-level interface should be sending signals to > init. reboot(8) and halt(8) doing things on their own should be banished > to non-default options. (Something should be fixed first so that > /etc/rc.d/mixer doesn't destroy the user's settings from single-user > mode.) I still strongly disagree with this change, however, the proper place to talk about it is on arch@. reboot and halt purposely stop init, kill everything and call reboot. That's what I mean that they are a lower-level interface than shutdown, which signals init to do its more complicated, higher level thing asyncrhonously in the background... Warner From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 22:22:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EDE9106566B; Sat, 1 Jan 2011 22:22:57 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7ECCB8FC21; Sat, 1 Jan 2011 22:22:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01MMvPq023361; Sat, 1 Jan 2011 22:22:57 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01MMvD1023359; Sat, 1 Jan 2011 22:22:57 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201101012222.p01MMvD1023359@svn.freebsd.org> From: Michael Tuexen Date: Sat, 1 Jan 2011 22:22:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216878 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 22:22:57 -0000 Author: tuexen Date: Sat Jan 1 22:22:57 2011 New Revision: 216878 URL: http://svn.freebsd.org/changeset/base/216878 Log: Fix a typo. MFC after: 3 months. Modified: head/sys/netinet/sctp_uio.h Modified: head/sys/netinet/sctp_uio.h ============================================================================== --- head/sys/netinet/sctp_uio.h Sat Jan 1 20:33:46 2011 (r216877) +++ head/sys/netinet/sctp_uio.h Sat Jan 1 22:22:57 2011 (r216878) @@ -417,7 +417,7 @@ union sctp_notification { #define SCTP_AUTHENTICATION_EVENT 0x0008 #define SCTP_STREAM_RESET_EVENT 0x0009 #define SCTP_SENDER_DRY_EVENT 0x000a -#define SCTP__NOTIFICATIONS_STOPPED_EVENT 0x000b /* we don't send this */ +#define SCTP_NOTIFICATIONS_STOPPED_EVENT 0x000b /* we don't send this */ /* * socket option structs */ From owner-svn-src-all@FreeBSD.ORG Sat Jan 1 22:31:31 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 564C2106566B; Sat, 1 Jan 2011 22:31:31 +0000 (UTC) (envelope-from yar.tikhiy@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 8E0AA8FC08; Sat, 1 Jan 2011 22:31:30 +0000 (UTC) Received: by wyf19 with SMTP id 19so12353114wyf.13 for ; Sat, 01 Jan 2011 14:31:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=c5MPbsAqIHzEZLTuzX+nJ9IZvC2BG4huBvDGwFn3Y18=; b=GAfCqz/pZII0KGeUd7QW0HESJJqc/o+zmM+5x6Q/m2h5lhP8PsvwhBUH3Ux70nqNqD Md4AXkLgClvJv6IYDgw6C+sb+/Ayc3jbwWBRQ5g2NnHMWhcF3GJtSg7CDadePAJM2sWr oEcdf2rmTDXXyf7bLOClAy/c/rTAlikyQvco0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=n1J+JQXbMqosAgO4JuHUwKECJ8ZEzCyj5sZmIwtlEl4D/JeGciuK618S4Qox0vIh0n f3KYZGdD/5M8Dnpe5d8UEzG6u9X9hYo8LSwwGosBJMtSuSPZnPhQcT2Z5YTybHx/NS2O pgdYtKN8DXVhDZzNn4NqgY3mlNF8MAe5zYViM= MIME-Version: 1.0 Received: by 10.227.129.7 with SMTP id m7mr10908037wbs.59.1293919763969; Sat, 01 Jan 2011 14:09:23 -0800 (PST) Sender: yar.tikhiy@gmail.com Received: by 10.227.143.134 with HTTP; Sat, 1 Jan 2011 14:09:23 -0800 (PST) In-Reply-To: <20110101145734.GA72435@stack.nl> References: <201012301806.oBUI6VcW046731@svn.freebsd.org> <20101231144308.GA55052@stack.nl> <4D1E51BD.8090707@bsdimp.com> <20110101145734.GA72435@stack.nl> Date: Sun, 2 Jan 2011 09:09:23 +1100 X-Google-Sender-Auth: wX00s9Q7yOH5NWZURjE5ls5_A1M Message-ID: From: Yar Tikhiy To: Jilles Tjoelker Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Pawel Jakub Dawidek , Warner Losh Subject: Re: svn commit: r216823 - head/sbin/shutdown X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 22:31:31 -0000 On Sun, Jan 2, 2011 at 1:57 AM, Jilles Tjoelker wrote: > On Fri, Dec 31, 2010 at 02:57:17PM -0700, Warner Losh wrote: >> On 12/31/2010 07:43, Jilles Tjoelker wrote: >> > On Thu, Dec 30, 2010 at 06:06:31PM +0000, Pawel Jakub Dawidek wrote: >> >> Author: pjd >> >> Date: Thu Dec 30 18:06:31 2010 >> >> New Revision: 216823 >> >> URL: http://svn.freebsd.org/changeset/base/216823 >> >> Log: >> >> =A0 =A0For compatibility with Linux and Solaris add poweroff(8). >> >> =A0 =A0It is implemented as a hard link to shutdown(8) and it is equi= valent of: >> >> =A0 =A0 =A0 =A0 =A0 =A0# shutdown -p now >> > If we go that way, then for consistency reboot(8) and halt(8) should >> > also be equivalent to calling shutdown -r now and shutdown -h now >> > respectively, unless conflicting options are given. Linux has a -f >> > option for what's currently reboot's and halt's default action, and >> > fastboot(8)/fasthalt(8) could also retain the current behaviour. > >> > I would be in favour of this change. >> I'm not sure I'd go this far. =A0I really *LIKE* that halt/reboot is the >> low-level interface that shutdown -r now calls. =A0I'm not sure that >> moving away from this would be a good idea. =A0It cuts out many levels o= f >> indirection that can be useful in many instances. > > But that's not how it works. After printing all the warnings, > shutdown(8) signals init. Ctrl+Alt+Del also signals init (and that's > nontrivial to change, because it's in the kernel). > > Only if the strange -o option is used does shutdown execute reboot(8) or > halt(8). > > I think the canonical low-level interface should be sending signals to > init. reboot(8) and halt(8) doing things on their own should be banished > to non-default options. (Something should be fixed first so that > /etc/rc.d/mixer doesn't destroy the user's settings from single-user > mode.) I'd say we've got two different, if related, issues here. One is how to prevent people from foot-shooting and the system from doing unforeseen harm to itself when the multi-user shutdown procedure is triggered while in single-user mode. Init(8) should know which mode the system is currently in, so it can a) refrain from running /etc/rc.shutdown unless /etc/rc ran, and b) expose the current mode via a sysctl writeable by PID 1 only for the benefit of other system components. The other issue is whether it is OK to change the traditional BSD semantics of reboot(8) and halt(8). At first glance, this doesn't seem to be a good idea. However, it might be that, as soon as issue 1 is fixed, the residual difference between shutdown and reboot/halt won't be that important. Moreover, I dare guess that BSD beginners can be confused by the current reboot/halt semantics and so they can be prone to foot-shooting by leaving no chance to a big and slow daemon to stop properly when in multi-user mode. What seems obvious to us old Unix fogeys isn't necessarily intuitive, natural or optimal. See . :-) Yar