Re: svn commit: r251958 - head/contrib/bmake
On Tue, Jun 18, 2013 at 02:25:15PM -0700, Garrett Cooper wrote: On Tue, Jun 18, 2013 at 12:35 PM, Simon J. Gerraty s...@freebsd.org wrote: Author: sjg Date: Tue Jun 18 19:35:51 2013 New Revision: 251958 URL: http://svnweb.freebsd.org/changeset/base/251958 Was this the source of the huge ignoring stale .depend messages? Also seen that shit, quite scary. ;-) Thanks for fixing it and making -current more usable! ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251886 - in head: contrib/apr contrib/apr-util contrib/serf contrib/sqlite3 contrib/subversion share/mk usr.bin usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libapr usr.bin/svn/lib/liba
On 18 Jun, Peter Wemm wrote:
Added: head/usr.bin/svn/Makefile.inc
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/svn/Makefile.inc Tue Jun 18 02:53:45 2013
(r251886)
@@ -0,0 +1,61 @@
+# $FreeBSD$
+
+.include bsd.own.mk
+
+.if ${MK_SVN} == yes
+SVNLITE?=
+.else
+SVNLITE?=lite
+.endif
+
+.if !defined(SVNDIR)
+
+SVNDIR= ${.CURDIR}/../../../contrib/subversion/subversion
+APRU=${.CURDIR}/../../../contrib/apr-util
+APR= ${.CURDIR}/../../../contrib/apr
+SQLITE= ${.CURDIR}/../../../contrib/sqlite3
+WARNS?= 0 # defintely not warns friendly
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include ${.CURDIR}/../../Makefile.inc
+.endif
+
+LIBAPRDIR= ${.OBJDIR}/../lib/libapr
+LIBAPR_UTILDIR= ${.OBJDIR}/../lib/libapr_util
+LIBSQLITEDIR=${.OBJDIR}/../lib/libsqlite3
+LIBSERFDIR= ${.OBJDIR}/../lib/libserf
+
+LIBSVN_CLIENTDIR=${.OBJDIR}/../lib/libsvn_client
+LIBSVN_DELTADIR= ${.OBJDIR}/../lib/libsvn_delta
+LIBSVN_DIFFDIR= ${.OBJDIR}/../lib/libsvn_diff
+LIBSVN_FSDIR=${.OBJDIR}/../lib/libsvn_fs
+LIBSVN_FS_FSDIR= ${.OBJDIR}/../lib/libsvn_fs_fs
+LIBSVN_FS_UTILDIR= ${.OBJDIR}/../lib/libsvn_fs_util
+LIBSVN_RADIR=${.OBJDIR}/../lib/libsvn_ra
+LIBSVN_RA_LOCALDIR= ${.OBJDIR}/../lib/libsvn_ra_local
+LIBSVN_RA_SVNDIR=${.OBJDIR}/../lib/libsvn_ra_svn
+LIBSVN_RA_SERFDIR= ${.OBJDIR}/../lib/libsvn_ra_serf
+LIBSVN_REPOSDIR= ${.OBJDIR}/../lib/libsvn_repos
+LIBSVN_SUBRDIR= ${.OBJDIR}/../lib/libsvn_subr
+LIBSVN_WCDIR=${.OBJDIR}/../lib/libsvn_wc
+
+LIBAPR= ${LIBAPRDIR}/libapr.a
+LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr_util.a
+LIBSQLITE= ${LIBSQLITEDIR}/libsqlite3.a
+LIBSERF= ${LIBSQLITEDIR}/libserf.a
Should the last line be
+LIBSERF= ${LIBSERFDIR}/libserf.a
I'm seeing the following buildworld failure on this machine:
FreeBSD scratch.catspoiler.org 10.0-CURRENT FreeBSD 10.0-CURRENT #28
r250744: Fri May 17 15:15:52 PDT 2013
d...@scratch.catspoiler.org:/usr/obj/usr/src/sys/GENERICSMB i386
cc -O2 -pipe -march=athlon64 -I/usr/src/usr.bin/svn/svn/../../../contrib/subver
sion/subversion/include -I/usr/src/usr.bin/svn/svn/../../../contrib/subversion/s
ubversion -I/usr/src/usr.bin/svn/svn/.. -I/usr/src/usr.bin/svn/svn/../lib/libap
r -I/usr/src/usr.bin/svn/svn/../../../contrib/apr/include/arch/unix -I/usr/src
/usr.bin/svn/svn/../../../contrib/apr/include -I/usr/src/usr.bin/svn/svn/../lib
/libapr_util -I/usr/src/usr.bin/svn/svn/../../../contrib/apr-util/include/priva
te -I/usr/src/usr.bin/svn/svn/../../../contrib/apr-util/include -std=gnu99 -Qun
used-arguments -fstack-protector -Wno-pointer-sign -Wno-empty-body -Wno-string-p
lus-int -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -W
no-unused-function -Wno-conversion -Wno-switch -Wno-switch-enum -Wno-knr-promote
d-parameter -Wno-parentheses -c /usr/src/usr.bin/svn/svn/../../../contrib/subver
sion/subversion/svn/util.c
make: don't know how to make /usr/obj/usr/src/usr.bin/svn/svn/../lib/libsqlite3/
libserf.a. Stop
*** [all] Error code 2
Stop in /usr/src/usr.bin/svn.
*** [all] Error code 1
Stop in /usr/src/usr.bin.
It looks like make is looking for libserf.a in the wrong directory.
# ls /usr/obj/usr/src/usr.bin/svn/lib/libsqlite3
.depend libsqlite3.asqlite3.o
ls /usr/obj/usr/src/usr.bin/svn/lib/libserf
.depend bwtp_buckets.o limit_buckets.o
aggregate_buckets.o chunk_buckets.o mmap_buckets.o
allocator.o context.o outgoing.o
auth.o dechunk_buckets.o request_buckets.o
auth_basic.odeflate_buckets.o response_body_buckets.o
auth_digest.o file_buckets.o response_buckets.o
auth_kerb.o headers_buckets.o simple_buckets.o
auth_kerb_gss.o incoming.o socket_buckets.o
barrier_buckets.o iovec_buckets.o ssl_buckets.o
buckets.o libserf.a ssltunnel.o
I've got two other questions. Why isn't anyone else (or the tinderbox)
seeing this problem? Why does the svnlite build succeed if I run make
from /usr/src/usr.bin/svn/svn?
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251886 - in head: contrib/apr contrib/apr-util contrib/serf contrib/sqlite3 contrib/subversion share/mk usr.bin usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libapr usr.bin/svn/lib/liba
On 2013/06/19 13:50, Alexey Dokuchaev wrote: On Tue, Jun 18, 2013 at 03:47:44PM -0400, Garance A Drosehn wrote: Note that a major change to the FreeBSD repo would require that users install a new 'svn' anyway, even if they did install 'svn' back when they first installed FreeBSD. IMO, I think this 'svnlite' idea is a good move. I wouldn't want a full-blown official 'svn' in the base system, but just enough that a user can immediately get freebsd-specific updates without first needing to install some port. Frankly I find it somehow wrong that user who wants to immediately get freebsd-specific updates should use any source-control tools and compile stuff from sources. That what developers usually do, not users. Users, in their majority, do not like to build things, and that makes perfect sense. As Ubuntu user at $work, I never had to worry about how and where shall we get updates, yet the system somehow gets them, installs them, only occasionally asking for a reboot. To do this, one has to put everything in a package managment system, let the system resolve what should be upgraded via package dependence. Now, if our user is showing developer's attitude and wants to make world, then it's fair to assume that he knows how to install things from ports, or has his own static svn client with him all the time, or mounts /usr/src over NFS -- whatever works better for him. ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251741 - head/sys/contrib/dev/ath/ath_hal/ar9300
Replying to random ath commit. Now my ath wireless device does not work. It was broken some time after 8 Jun (after my last update at 8 Jun it worked, now after today's update to r251945 it does not). It spams log and console with messages: Jun 19 10:04:27 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) Jun 19 10:04:58 gpr last message repeated 101 times Jun 19 10:05:42 gpr last message repeated 143 times Jun 19 10:05:42 gpr kernel: ath0: ath_raw_xmit: sc_inreset_cnt 0; bailing Jun 19 10:05:42 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) Jun 19 10:05:47 gpr last message repeated 11 times Jun 19 10:05:47 gpr kernel: ath0: ath_raw_xmit: sc_inreset_cnt 0; bailing Jun 19 10:05:47 gpr kernel: ath0: ath_raw_xmit: sc_inreset_cnt 0; bailing Jun 19 10:05:47 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) Jun 19 10:05:53 gpr last message repeated 19 times ... Jun 19 10:06:20 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) Jun 19 10:06:21 gpr last message repeated 4 times Jun 19 10:06:22 gpr kernel: ath0: ath_tx_should_swq_frame: f0:4f:7c:fc:b3:22: Node is asleep; sending mgmt (type=0, subtype=176) Jun 19 10:06:22 gpr kernel: ath0: ath_tx_should_swq_frame: f0:4f:7c:fc:b3:22: Node is asleep; sending mgmt (type=0, subtype=176) Jun 19 10:06:22 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) Jun 19 10:06:23 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) Jun 19 10:06:23 gpr kernel: ath0: ath_tx_node_wakeup: an=0xff8002322000: node was already awake Jun 19 10:06:24 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) Jun 19 10:06:25 gpr kernel: ath0: stuck beacon; resetting (bmiss count 4) # uname -a FreeBSD gpr.nnz-home.ru 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r251945+1330981: Wed Jun 19 08:09:32 MSK 2013 g...@gpr.nnz-home.ru:/usr/obj/usr/src/freebsd-head/sys/GPR amd64 Boot log device info: Jun 19 10:04:18 gpr kernel: ath0: Atheros 5212 mem 0xfbdf-0xfbdf irq 19 at device 10.0 on pci0 Jun 19 10:04:18 gpr kernel: ath0: AR2413 mac 7.9 RF2413 phy 4.5 Jun 19 10:04:18 gpr kernel: ath0: 2GHz radio: 0x; 5GHz radio: 0x0056 # pciconf -lv ath0@pci0:0:10:0: class=0x02 card=0x2051168c chip=0x0013168c rev=0x01 hdr=0x00 vendor = 'Atheros Communications Inc.' device = 'AR5212/AR5213 Wireless Network Adapter' class = network subclass = ethernet # rc.conf wlans_ath0=wlan0 create_args_wlan0=wlandev ath0 wlanmode hostap ifconfig_wlan0=10.X.X.X/24 hostapd_enable=YES I can do additional tests or submit more info, if necessary. On Fri, Jun 14, 2013 at 08:15:28AM +, Adrian Chadd wrote: Author: adrian Date: Fri Jun 14 08:15:28 2013 New Revision: 251741 URL: http://svnweb.freebsd.org/changeset/base/251741 Log: The AR9300 HAL uses this config to program AR_PHY_SWITCH_COM_2 on AR9485 NICs which have bluetooth coexistence enabled. The WB225 NIC has the common antenna switch configuration set to 0x0 which disables all external switch bit setting. This obviously won't work when doing coexistence. This value is a magic value from the windows .inf files. It _looks_ right but I haven't yet verified it - unfortunately my AR9285+AR3012 BT combo has an earlier BT device which doesn't actually _have_ firmware on it. So I have to fix ath3kfw to handle loading in firmware into the newer NICs before I can finish testing this. This may not hold true for CUS198, which is another custom AR9485 board. Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c == --- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c Fri Jun 14 08:13:21 2013(r251740) +++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c Fri Jun 14 08:15:28 2013(r251741) @@ -249,6 +249,9 @@ ar9300_attach_freebsd_ops(struct ath_hal /* LNA diversity functions */ ah-ah_divLnaConfGet = ar9300_ant_div_comb_get_config; ah-ah_divLnaConfSet = ar9300_ant_div_comb_set_config; + + /* Setup HAL configuration defaults */ + ah-ah_config.ath_hal_ant_ctrl_comm2g_switch_enable = 0x000bbb88; } HAL_BOOL ___ svn-src-h...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251843 - in head: contrib/dialog contrib/dialog/package contrib/dialog/package/debian contrib/dialog/po contrib/dialog/samples contrib/dialog/samples/copifuncs contrib/dialog/samples/
On 06/17/13 10:17, Baptiste Daroussin wrote: On Mon, Jun 17, 2013 at 08:37:37AM -0500, Nathan Whitehorn wrote: On 06/17/13 08:36, Baptiste Daroussin wrote: On Mon, Jun 17, 2013 at 08:28:47AM -0500, Nathan Whitehorn wrote: On 06/17/13 05:28, Baptiste Daroussin wrote: Author: bapt Date: Mon Jun 17 10:28:55 2013 New Revision: 251843 URL: http://svnweb.freebsd.org/changeset/base/251843 Log: Update dialog to 1.2-20130523 Level up WARNS This seems to have broken bsdinstall. In particular, it is no longer possible to get focus in the text input boxes in the partition editor's (sade/bsdinstall partedit) Add Partition or Modify Partition dialogs. Any chance you could try to figure out why? My Ncurses debugging skills are unfortunately not great. I'm on it, yes, it seems like the dlg_forms is leaking the bindings from the diskeditors form. I have a working patch but it is ugly. I'm trying to figure out the clean way to do so. regards, Bapt Thanks much! Please let me know if I can do anything to help. I committed a workaround, I dicovered that the key on the Partition Editor window are not the one we expect to be, I see no errors yet in libdialog code, I'll continue investigating, but waiting for a proper fix, it is usable again. regards, Bapt Thanks very much, both for this and the dialog update! I really appreciate it. -Nathan ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251886 - in head: contrib/apr contrib/apr-util contrib/serf contrib/sqlite3 contrib/subversion share/mk usr.bin usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libapr usr.bin/svn/lib/liba
On 2013-06-19 03:37, Warner Losh wrote: On Jun 18, 2013, at 11:36 AM, Peter Wemm wrote: Installing SVN from ports is very painful because of the huge dependency chain it carries, with the largest being Python and Perl IIRC. That was one of my main motivations. A 2 year old machine builds this in ~35 seconds with *no* footprint. The dependency abomination in ports tests my non-violent nature. This is a major source of pain on the freebsd.org cluster and after the stealth perl ABI changes without a version bump.. well.. Thanks for doing something! Although it came as a surprise (and seems to have broken mips), I have found the developer load for svn isn't building it once (that's easy, even if it does bring in the kitchen sink). The problem comes when I update some OTHER port that updates pyhton or something and boom, svn is busted until I rebuild it Python and Perl are pulled in by devel/apr1. I've sent a patch that splits up and simplifies this port to apache@ for discussion. I'll check the other subversion dependencies to see if more can be removed. Getting back to the discussion, the arguments I've seen so far are all about how bad the port is, but those are just reasons to fix the port not to tie the repo to releases. The transition period for the cvs-to- svn switch was way too long (several years) and despite that the switch was still disruptive to everybody's work flow. And now we're setting up exactly the same infrastructure just s/cvs/svn/? I'm also not convinced svnup in base would be good, because it still pulls src directly from svn and that would not be the case with a portsnap-like tool. With portsnap code distribution is separated from the underlying vcs. signature.asc Description: OpenPGP digital signature
svn commit: r251994 - stable/9/sys/dev/agp
Author: marius
Date: Wed Jun 19 15:12:10 2013
New Revision: 251994
URL: http://svnweb.freebsd.org/changeset/base/251994
Log:
MFC: r238172 (partial)
Don't use Maxmem when the amount of memory is meant. Use realmem instead.
Maxmem is not only a MD variable, it represents the highest physical memory
address in use. On systems where memory is sparsely layed-out the highest
memory address and the amount of memory are not interchangeable. Scaling the
AGP aperture based on the actual amount of memory (= realmem) rather than
the available memory (= physmem) makes sure there's consistent behaviour
across architectures.
Modified:
stable/9/sys/dev/agp/agp.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/agp/agp.c
==
--- stable/9/sys/dev/agp/agp.c Wed Jun 19 13:37:29 2013(r251993)
+++ stable/9/sys/dev/agp/agp.c Wed Jun 19 15:12:10 2013(r251994)
@@ -56,7 +56,6 @@ __FBSDID($FreeBSD$);
#include vm/vm_pageout.h
#include vm/pmap.h
-#include machine/md_var.h
#include machine/bus.h
#include machine/resource.h
#include sys/rman.h
@@ -235,7 +234,7 @@ agp_generic_attach(device_t dev)
* Work out an upper bound for agp memory allocation. This
* uses a heurisitc table from the Linux driver.
*/
- memsize = ptoa(Maxmem) 20;
+ memsize = ptoa(realmem) 20;
for (i = 0; i agp_max_size; i++) {
if (memsize = agp_max[i][0])
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r251995 - head/sys/netinet6
Author: ae
Date: Wed Jun 19 15:59:21 2013
New Revision: 251995
URL: http://svnweb.freebsd.org/changeset/base/251995
Log:
Use ICMP6STAT_INC() macro for ICMPv6 errors accounting.
MFC after:2 weeks
Modified:
head/sys/netinet6/icmp6.c
Modified: head/sys/netinet6/icmp6.c
==
--- head/sys/netinet6/icmp6.c Wed Jun 19 15:12:10 2013(r251994)
+++ head/sys/netinet6/icmp6.c Wed Jun 19 15:59:21 2013(r251995)
@@ -130,7 +130,7 @@ VNET_DECLARE(int, icmp6_nodeinfo);
#defineV_icmp6errppslim_last VNET(icmp6errppslim_last)
#defineV_icmp6_nodeinfoVNET(icmp6_nodeinfo)
-static void icmp6_errcount(struct icmp6errstat *, int, int);
+static void icmp6_errcount(int, int);
static int icmp6_rip6_input(struct mbuf **, int);
static int icmp6_ratelimit(const struct in6_addr *, const int, const int);
static const char *icmp6_redirect_diag(struct in6_addr *,
@@ -159,59 +159,59 @@ kmod_icmp6stat_inc(int statnum)
}
static void
-icmp6_errcount(struct icmp6errstat *stat, int type, int code)
+icmp6_errcount(int type, int code)
{
switch (type) {
case ICMP6_DST_UNREACH:
switch (code) {
case ICMP6_DST_UNREACH_NOROUTE:
- stat-icp6errs_dst_unreach_noroute++;
+ ICMP6STAT_INC(icp6s_odst_unreach_noroute);
return;
case ICMP6_DST_UNREACH_ADMIN:
- stat-icp6errs_dst_unreach_admin++;
+ ICMP6STAT_INC(icp6s_odst_unreach_admin);
return;
case ICMP6_DST_UNREACH_BEYONDSCOPE:
- stat-icp6errs_dst_unreach_beyondscope++;
+ ICMP6STAT_INC(icp6s_odst_unreach_beyondscope);
return;
case ICMP6_DST_UNREACH_ADDR:
- stat-icp6errs_dst_unreach_addr++;
+ ICMP6STAT_INC(icp6s_odst_unreach_addr);
return;
case ICMP6_DST_UNREACH_NOPORT:
- stat-icp6errs_dst_unreach_noport++;
+ ICMP6STAT_INC(icp6s_odst_unreach_noport);
return;
}
break;
case ICMP6_PACKET_TOO_BIG:
- stat-icp6errs_packet_too_big++;
+ ICMP6STAT_INC(icp6s_opacket_too_big);
return;
case ICMP6_TIME_EXCEEDED:
switch (code) {
case ICMP6_TIME_EXCEED_TRANSIT:
- stat-icp6errs_time_exceed_transit++;
+ ICMP6STAT_INC(icp6s_otime_exceed_transit);
return;
case ICMP6_TIME_EXCEED_REASSEMBLY:
- stat-icp6errs_time_exceed_reassembly++;
+ ICMP6STAT_INC(icp6s_otime_exceed_reassembly);
return;
}
break;
case ICMP6_PARAM_PROB:
switch (code) {
case ICMP6_PARAMPROB_HEADER:
- stat-icp6errs_paramprob_header++;
+ ICMP6STAT_INC(icp6s_oparamprob_header);
return;
case ICMP6_PARAMPROB_NEXTHEADER:
- stat-icp6errs_paramprob_nextheader++;
+ ICMP6STAT_INC(icp6s_oparamprob_nextheader);
return;
case ICMP6_PARAMPROB_OPTION:
- stat-icp6errs_paramprob_option++;
+ ICMP6STAT_INC(icp6s_oparamprob_option);
return;
}
break;
case ND_REDIRECT:
- stat-icp6errs_redirect++;
+ ICMP6STAT_INC(icp6s_oredirect);
return;
}
- stat-icp6errs_unknown++;
+ ICMP6STAT_INC(icp6s_ounknown);
}
/*
@@ -262,7 +262,7 @@ icmp6_error(struct mbuf *m, int type, in
ICMP6STAT_INC(icp6s_error);
/* count per-type-code statistics */
- icmp6_errcount(V_icmp6stat.icp6s_outerrhist, type, code);
+ icmp6_errcount(type, code);
#ifdef M_DECRYPTED /*not openbsd*/
if (m-m_flags M_DECRYPTED) {
@@ -2530,7 +2530,7 @@ icmp6_redirect_output(struct mbuf *m0, s
struct ifnet *outif = NULL;
struct sockaddr_in6 src_sa;
- icmp6_errcount(V_icmp6stat.icp6s_outerrhist, ND_REDIRECT, 0);
+ icmp6_errcount(ND_REDIRECT, 0);
/* if we are not router, we don't send icmp6 redirect */
if (!V_ip6_forwarding)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r251996 - head/usr.sbin/bsdconfig/share
Author: dteske Date: Wed Jun 19 17:13:16 2013 New Revision: 251996 URL: http://svnweb.freebsd.org/changeset/base/251996 Log: Alphabetize includes. Modified: head/usr.sbin/bsdconfig/share/script.subr Modified: head/usr.sbin/bsdconfig/share/script.subr == --- head/usr.sbin/bsdconfig/share/script.subr Wed Jun 19 15:59:21 2013 (r251995) +++ head/usr.sbin/bsdconfig/share/script.subr Wed Jun 19 17:13:16 2013 (r251996) @@ -32,10 +32,10 @@ BSDCFG_SHARE=/usr/share/bsdconfig . $BSDCFG_SHARE/common.subr || exit 1 f_dprintf %s: loading includes... script.subr f_include $BSDCFG_SHARE/device.subr -f_include $BSDCFG_SHARE/variable.subr f_include $BSDCFG_SHARE/media/any.subr f_include $BSDCFG_SHARE/media/tcpip.subr f_include $BSDCFG_SHARE/packages/packages.subr +f_include $BSDCFG_SHARE/variable.subr GLOBALS ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r251997 - head/usr.sbin/bsdconfig/share
Author: dteske Date: Wed Jun 19 17:14:59 2013 New Revision: 251997 URL: http://svnweb.freebsd.org/changeset/base/251997 Log: Alphabetize reserved-word (resword) registration. Modified: head/usr.sbin/bsdconfig/share/script.subr Modified: head/usr.sbin/bsdconfig/share/script.subr == --- head/usr.sbin/bsdconfig/share/script.subr Wed Jun 19 17:13:16 2013 (r251996) +++ head/usr.sbin/bsdconfig/share/script.subr Wed Jun 19 17:14:59 2013 (r251997) @@ -159,10 +159,6 @@ f_resword_new loadConfig f_script_load # device.subr f_resword_new deviceRescan f_device_rescan -# variable.subr -f_resword_new installVarDefaults f_variable_set_defaults -f_resword_new dumpVariablesf_dump_variables - # media/common.subr f_resword_new mediaOpenf_media_open f_resword_new mediaClose f_media_close @@ -192,6 +188,10 @@ f_resword_new mediaSetHTTPProxyf_media_ # packages/packages.subr f_resword_new configPackages f_package_config +# variable.subr +f_resword_new installVarDefaults f_variable_set_defaults +f_resword_new dumpVariablesf_dump_variables + f_dprintf %s: Successfully loaded. script.subr fi # ! $_SCRIPT_SUBR ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251886 - in head: contrib/apr contrib/apr-util contrib/serf contrib/sqlite3 contrib/subversion share/mk usr.bin usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libapr usr.bin/svn/lib/liba
On Wednesday, June 19, 2013 11:01:17 am Tijl Coosemans wrote: I'm also not convinced svnup in base would be good, because it still pulls src directly from svn and that would not be the case with a portsnap-like tool. With portsnap code distribution is separated from the underlying vcs. portsnap does not work for src. (I thought we had already covered that in earlier threads?) portsnap only moves forward. It is a very important feature for our users that whatever tool they use for source updating be bidirectional. In particular it is very common practice to use a bisect operation to isolate changes responsible for regressions. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r251998 - stable/9/sbin/mount
Author: jh Date: Wed Jun 19 18:00:00 2013 New Revision: 251998 URL: http://svnweb.freebsd.org/changeset/base/251998 Log: MFC r251485: Revert r238399. The failok option doesn't have any effect at all unless specified in fstab(5) and combined with the -a flag. The failok option is already documented in fstab(5). PR: 177630 Modified: stable/9/sbin/mount/mount.8 Directory Properties: stable/9/sbin/mount/ (props changed) Modified: stable/9/sbin/mount/mount.8 == --- stable/9/sbin/mount/mount.8 Wed Jun 19 17:14:59 2013(r251997) +++ stable/9/sbin/mount/mount.8 Wed Jun 19 18:00:00 2013(r251998) @@ -28,7 +28,7 @@ .\ @(#)mount.88.8 (Berkeley) 6/16/94 .\ $FreeBSD$ .\ -.Dd July 12, 2012 +.Dd June 6, 2011 .Dt MOUNT 8 .Os .Sh NAME @@ -145,11 +145,6 @@ When used with the .Fl u flag, this is the same as specifying the options currently in effect for the mounted file system. -.It Cm failok -If this option is specified, -.Nm -will return 0 even if an error occurs -during the mount of the filesystem. .It Cm force The same as .Fl f ; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r251999 - stable/8/sbin/mount
Author: jh Date: Wed Jun 19 18:01:37 2013 New Revision: 251999 URL: http://svnweb.freebsd.org/changeset/base/251999 Log: MFC r251485: Revert r238399. The failok option doesn't have any effect at all unless specified in fstab(5) and combined with the -a flag. The failok option is already documented in fstab(5). PR: 177630 Modified: stable/8/sbin/mount/mount.8 Directory Properties: stable/8/sbin/mount/ (props changed) Modified: stable/8/sbin/mount/mount.8 == --- stable/8/sbin/mount/mount.8 Wed Jun 19 18:00:00 2013(r251998) +++ stable/8/sbin/mount/mount.8 Wed Jun 19 18:01:37 2013(r251999) @@ -28,7 +28,7 @@ .\ @(#)mount.88.8 (Berkeley) 6/16/94 .\ $FreeBSD$ .\ -.Dd July 12, 2012 +.Dd June 6, 2011 .Dt MOUNT 8 .Os .Sh NAME @@ -145,11 +145,6 @@ When used with the .Fl u flag, this is the same as specifying the options currently in effect for the mounted file system. -.It Cm failok -If this option is specified, -.Nm -will return 0 even if an error occurs -during the mount of the filesystem. .It Cm force The same as .Fl f ; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252000 - in head/usr.sbin/bsdconfig: . password security startup usermgmt
Author: dteske
Date: Wed Jun 19 18:13:58 2013
New Revision: 252000
URL: http://svnweb.freebsd.org/changeset/base/252000
Log:
Whitespace and comments.
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/password/password
head/usr.sbin/bsdconfig/security/security
head/usr.sbin/bsdconfig/startup/rcconf
head/usr.sbin/bsdconfig/startup/rcedit
head/usr.sbin/bsdconfig/usermgmt/userinput
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Wed Jun 19 18:01:37 2013
(r251999)
+++ head/usr.sbin/bsdconfig/bsdconfig Wed Jun 19 18:13:58 2013
(r252000)
@@ -180,8 +180,7 @@ dialog_menu_main()
case $menu_program in
/*) : already fully qualified ;;
- *)
- menu_program=$menuitem/$menu_program
+*) menu_program=$menuitem/$menu_program
esac
f_shell_escape $menu_title menu_title
Modified: head/usr.sbin/bsdconfig/password/password
==
--- head/usr.sbin/bsdconfig/password/password Wed Jun 19 18:01:37 2013
(r251999)
+++ head/usr.sbin/bsdconfig/password/password Wed Jun 19 18:13:58 2013
(r252000)
@@ -69,6 +69,9 @@ f_dialog_title $msg_root_password
f_dialog_backtitle ${ipgm:+bsdconfig }$pgm
f_mustberoot_init
+#
+# Prompt the user to input a new password (and change it if they don't cancel)
+#
if f_dialog_input_password; then
err=$( echo $pw_password | pw usermod $USER_ROOT -h 0 21 ) ||
f_die $? %s $err
Modified: head/usr.sbin/bsdconfig/security/security
==
--- head/usr.sbin/bsdconfig/security/security Wed Jun 19 18:01:37 2013
(r251999)
+++ head/usr.sbin/bsdconfig/security/security Wed Jun 19 18:13:58 2013
(r252000)
@@ -162,9 +162,9 @@ while :; do
2 [?] $msg_securelevel) # Configure securelevels for the system
$BSDCFG_LIBE/$APP_DIR/kern_securelevel ${USE_XDIALOG:+-X} ;;
3 [X] $msg_nfs_port) # Require that NFS clients use reserved ports
- f_sysrc_set nfs_reserved_port_only NO;;
+ f_sysrc_set nfs_reserved_port_only NO ;;
3 [ ] $msg_nfs_port) # Same; Toggle value
- f_sysrc_set nfs_reserved_port_only YES;;
+ f_sysrc_set nfs_reserved_port_only YES ;;
esac
done
Modified: head/usr.sbin/bsdconfig/startup/rcconf
==
--- head/usr.sbin/bsdconfig/startup/rcconf Wed Jun 19 18:01:37 2013
(r251999)
+++ head/usr.sbin/bsdconfig/startup/rcconf Wed Jun 19 18:13:58 2013
(r252000)
@@ -246,9 +246,7 @@ while :; do
case $mtag in
X $msg_exit) break ;;
-$msg_add_new)
- $BSDCFG_LIBE/$APP_DIR/rcadd ${USE_XDIALOG:+-X}
- ;;
+$msg_add_new) $BSDCFG_LIBE/$APP_DIR/rcadd ${USE_XDIALOG:+-X} ;;
$msg_delete)
# rcdelete has a similar interface that can inherit the below:
export SHOW_VALUE SHOW_DESC SHOW_DEFAULT_VALUE SHOW_CONFIGURED
Modified: head/usr.sbin/bsdconfig/startup/rcedit
==
--- head/usr.sbin/bsdconfig/startup/rcedit Wed Jun 19 18:01:37 2013
(r251999)
+++ head/usr.sbin/bsdconfig/startup/rcedit Wed Jun 19 18:13:58 2013
(r252000)
@@ -62,6 +62,9 @@ shift $(( $OPTIND - 1 ))
f_dialog_backtitle ${ipgm:+bsdconfig }$pgm
f_mustberoot_init
+#
+# Edit the rc.conf(5) variable(s) passed as argument(s)
+#
f_dialog_rcedit $@
Modified: head/usr.sbin/bsdconfig/usermgmt/userinput
==
--- head/usr.sbin/bsdconfig/usermgmt/userinput Wed Jun 19 18:01:37 2013
(r251999)
+++ head/usr.sbin/bsdconfig/usermgmt/userinput Wed Jun 19 18:13:58 2013
(r252000)
@@ -530,7 +530,6 @@ while :; do
esac
;;
esac
-
done
exit $SUCCESS
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252001 - in head/usr.sbin/bsdconfig: networking usermgmt
Author: dteske
Date: Wed Jun 19 18:32:18 2013
New Revision: 252001
URL: http://svnweb.freebsd.org/changeset/base/252001
Log:
Whitespace.
Modified:
head/usr.sbin/bsdconfig/networking/devices
head/usr.sbin/bsdconfig/usermgmt/userinput
Modified: head/usr.sbin/bsdconfig/networking/devices
==
--- head/usr.sbin/bsdconfig/networking/devices Wed Jun 19 18:13:58 2013
(r252000)
+++ head/usr.sbin/bsdconfig/networking/devices Wed Jun 19 18:32:18 2013
(r252001)
@@ -83,7 +83,7 @@ while :; do
# from the device name if present.
#
case $interface in
- *\*) interface=${interface%?};;
+ *\*) interface=${interface%?} ;;
esac
#
@@ -104,30 +104,31 @@ while :; do
# If DHCP, get IP address/netmask later from ifconfig(8)
glob=[Dd][Hh][Cc][Pp]
case $_ifconfig in
- $glob) dhcp=1;;
- [Ss][Yy][Nn][Cc]$glob) dhcp=1;;
- [Nn][Oo][Ss][Yy][Nn][Cc]$glob) dhcp=1;;
+ $glob) dhcp=1 ;;
+ [Ss][Yy][Nn][Cc]$glob) dhcp=1 ;;
+ [Nn][Oo][Ss][Yy][Nn][Cc]$glob) dhcp=1 ;;
*)
#
# Get IP address/netmask from rc.conf(5) configuration
#
dhcp=
- eval $( exec 2 /dev/null
-set -- $_ifconfig
-while [ $# -gt 0 ]; do
- case $1 in
- inet)
- shift 1
- echo _ipaddr='$1'
- ;;
- netmask)
- shift 1
- echo _netmask='$1'
- ;;
- esac
- shift 1
-done
- )
+ eval $(
+ exec 2 /dev/null
+ set -- $_ifconfig
+ while [ $# -gt 0 ]; do
+ case $1 in
+ inet)
+ shift 1
+ echo _ipaddr='$1'
+ ;;
+ netmask)
+ shift 1
+ echo _netmask='$1'
+ ;;
+ esac
+ shift 1
+ done
+ )
;;
esac
fi
Modified: head/usr.sbin/bsdconfig/usermgmt/userinput
==
--- head/usr.sbin/bsdconfig/usermgmt/userinput Wed Jun 19 18:13:58 2013
(r252000)
+++ head/usr.sbin/bsdconfig/usermgmt/userinput Wed Jun 19 18:32:18 2013
(r252001)
@@ -475,35 +475,25 @@ while :; do
esac
;;
2) # Full Name
- f_dialog_input_gecos $pw_gecos
- ;;
+ f_dialog_input_gecos $pw_gecos ;;
3) # Password
- f_dialog_input_password
- ;;
+ f_dialog_input_password ;;
4) # UID
- f_dialog_input_uid $pw_uid
- ;;
+ f_dialog_input_uid $pw_uid ;;
5) # Default Group
- f_dialog_input_gid $pw_gid
- ;;
+ f_dialog_input_gid $pw_gid ;;
6) # Member of Groups
- f_dialog_input_member_groups $pw_member_groups
- ;;
+ f_dialog_input_member_groups $pw_member_groups ;;
7) # Login Class
- f_dialog_input_class $pw_class
- ;;
+ f_dialog_input_class $pw_class ;;
8) # Password Expire on
- f_dialog_input_expire_password $pw_password_expire
- ;;
+ f_dialog_input_expire_password $pw_password_expire ;;
9) # Account Expire on
- f_dialog_input_expire_account $pw_account_expire
- ;;
+ f_dialog_input_expire_account $pw_account_expire ;;
A) # Home Directory
- f_dialog_input_home_dir $pw_home_dir
- ;;
+ f_dialog_input_home_dir $pw_home_dir ;;
B) # Shell
- f_dialog_input_shell $pw_shell
- ;;
+ f_dialog_input_shell $pw_shell ;;
esac
case $mode in
___
svn-src-all@freebsd.org mailing list
svn commit: r252002 - head/usr.sbin/bsdconfig/startup
Author: dteske Date: Wed Jun 19 18:44:55 2013 New Revision: 252002 URL: http://svnweb.freebsd.org/changeset/base/252002 Log: Style -- no ;; needed on fallback clause within case-statement. Modified: head/usr.sbin/bsdconfig/startup/misc head/usr.sbin/bsdconfig/startup/rcvar Modified: head/usr.sbin/bsdconfig/startup/misc == --- head/usr.sbin/bsdconfig/startup/miscWed Jun 19 18:32:18 2013 (r252001) +++ head/usr.sbin/bsdconfig/startup/miscWed Jun 19 18:44:55 2013 (r252002) @@ -347,7 +347,7 @@ while :; do case $mtag in X $msg_exit) break ;; ? [X] *) toggled=1 ;; - *) toggled= ;; + *) toggled= esac case $mtag in Modified: head/usr.sbin/bsdconfig/startup/rcvar == --- head/usr.sbin/bsdconfig/startup/rcvar Wed Jun 19 18:32:18 2013 (r252001) +++ head/usr.sbin/bsdconfig/startup/rcvar Wed Jun 19 18:44:55 2013 (r252002) @@ -205,8 +205,8 @@ while :; do # Determine the new [toggled] value to use case $value in - [X]*) value=NO ;; -*) value=YES ;; + [X]*) value=NO ;; +*) value=YES esac err=$( f_sysrc_set $rcvar $value 21 ) || ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252003 - head/usr.bin/svn
Author: truckman
Date: Wed Jun 19 19:44:57 2013
New Revision: 252003
URL: http://svnweb.freebsd.org/changeset/base/252003
Log:
Fix a couple of typos that broke buildworld for me.
Reviewed by: peter
Modified:
head/usr.bin/svn/Makefile.inc
Modified: head/usr.bin/svn/Makefile.inc
==
--- head/usr.bin/svn/Makefile.inc Wed Jun 19 18:44:55 2013
(r252002)
+++ head/usr.bin/svn/Makefile.inc Wed Jun 19 19:44:57 2013
(r252003)
@@ -40,9 +40,9 @@ LIBSVN_SUBRDIR= ${.OBJDIR}/../lib/libsv
LIBSVN_WCDIR= ${.OBJDIR}/../lib/libsvn_wc
LIBAPR=${LIBAPRDIR}/libapr.a
-LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr_util.a
+LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util.a
LIBSQLITE= ${LIBSQLITEDIR}/libsqlite3.a
-LIBSERF= ${LIBSQLITEDIR}/libserf.a
+LIBSERF= ${LIBSERFDIR}/libserf.a
LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client.a
LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta.a
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252007 - head/sys/netinet6
Author: ae
Date: Wed Jun 19 20:48:34 2013
New Revision: 252007
URL: http://svnweb.freebsd.org/changeset/base/252007
Log:
Use RIP6STAT_INC() macro for raw ip6 statistics accounting.
MFC after:2 weeks
Modified:
head/sys/netinet6/raw_ip6.c
head/sys/netinet6/raw_ip6.h
Modified: head/sys/netinet6/raw_ip6.c
==
--- head/sys/netinet6/raw_ip6.c Wed Jun 19 20:37:13 2013(r252006)
+++ head/sys/netinet6/raw_ip6.c Wed Jun 19 20:48:34 2013(r252007)
@@ -160,7 +160,7 @@ rip6_input(struct mbuf **mp, int *offp,
struct mbuf *opts = NULL;
struct sockaddr_in6 fromsa;
- V_rip6stat.rip6s_ipackets++;
+ RIP6STAT_INC(rip6s_ipackets);
if (faithprefix_p != NULL (*faithprefix_p)(ip6-ip6_dst)) {
/* XXX Send icmp6 host/port unreach? */
@@ -199,11 +199,11 @@ rip6_input(struct mbuf **mp, int *offp,
}
INP_RLOCK(in6p);
if (in6p-in6p_cksum != -1) {
- V_rip6stat.rip6s_isum++;
+ RIP6STAT_INC(rip6s_isum);
if (in6_cksum(m, proto, *offp,
m-m_pkthdr.len - *offp)) {
INP_RUNLOCK(in6p);
- V_rip6stat.rip6s_badsum++;
+ RIP6STAT_INC(rip6s_badsum);
continue;
}
}
@@ -279,7 +279,7 @@ rip6_input(struct mbuf **mp, int *offp,
m_freem(n);
if (opts)
m_freem(opts);
- V_rip6stat.rip6s_fullsock++;
+ RIP6STAT_INC(rip6s_fullsock);
} else
sorwakeup(last-inp_socket);
opts = NULL;
@@ -312,14 +312,14 @@ rip6_input(struct mbuf **mp, int *offp,
m_freem(m);
if (opts)
m_freem(opts);
- V_rip6stat.rip6s_fullsock++;
+ RIP6STAT_INC(rip6s_fullsock);
} else
sorwakeup(last-inp_socket);
INP_RUNLOCK(last);
} else {
- V_rip6stat.rip6s_nosock++;
+ RIP6STAT_INC(rip6s_nosock);
if (m-m_flags M_MCAST)
- V_rip6stat.rip6s_nosockmcast++;
+ RIP6STAT_INC(rip6s_nosockmcast);
if (proto == IPPROTO_NONE)
m_freem(m);
else {
@@ -559,7 +559,7 @@ rip6_output(m, va_alist)
icmp6_ifoutstat_inc(oifp, type, code);
ICMP6STAT_INC(icp6s_outhist[type]);
} else
- V_rip6stat.rip6s_opackets++;
+ RIP6STAT_INC(rip6s_opackets);
goto freectl;
Modified: head/sys/netinet6/raw_ip6.h
==
--- head/sys/netinet6/raw_ip6.h Wed Jun 19 20:37:13 2013(r252006)
+++ head/sys/netinet6/raw_ip6.h Wed Jun 19 20:48:34 2013(r252007)
@@ -48,6 +48,8 @@ struct rip6stat {
};
#ifdef _KERNEL
+#defineRIP6STAT_ADD(name, val) V_rip6stat.name += (val)
+#defineRIP6STAT_INC(name) RIP6STAT_ADD(name, 1)
VNET_DECLARE(struct rip6stat, rip6stat);
#defineV_rip6stat VNET(rip6stat)
#endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252010 - head/sys/geom/mirror
Author: scottl
Date: Wed Jun 19 21:52:32 2013
New Revision: 252010
URL: http://svnweb.freebsd.org/changeset/base/252010
Log:
Mark geom_mirror as capable of unmapped i/o
Obtained from:Netflix
MFC after:3 days
Modified:
head/sys/geom/mirror/g_mirror.c
Modified: head/sys/geom/mirror/g_mirror.c
==
--- head/sys/geom/mirror/g_mirror.c Wed Jun 19 21:50:17 2013
(r252009)
+++ head/sys/geom/mirror/g_mirror.c Wed Jun 19 21:52:32 2013
(r252010)
@@ -2028,7 +2028,7 @@ static void
g_mirror_launch_provider(struct g_mirror_softc *sc)
{
struct g_mirror_disk *disk;
- struct g_provider *pp;
+ struct g_provider *pp, *dp;
sx_assert(sc-sc_lock, SX_LOCKED);
@@ -2038,11 +2038,24 @@ g_mirror_launch_provider(struct g_mirror
pp-sectorsize = sc-sc_sectorsize;
pp-stripesize = 0;
pp-stripeoffset = 0;
+
+ /* Splitting of unmapped BIO's could work but isn't implemented now */
+ if (sc-sc_balance != G_MIRROR_BALANCE_SPLIT)
+ pp-flags |= G_PF_ACCEPT_UNMAPPED;
+
LIST_FOREACH(disk, sc-sc_disks, d_next) {
- if (disk-d_consumer disk-d_consumer-provider
- disk-d_consumer-provider-stripesize pp-stripesize) {
- pp-stripesize = disk-d_consumer-provider-stripesize;
- pp-stripeoffset =
disk-d_consumer-provider-stripeoffset;
+ if (disk-d_consumer disk-d_consumer-provider) {
+ dp = disk-d_consumer-provider;
+ if (dp-stripesize pp-stripesize) {
+ pp-stripesize = dp-stripesize;
+ pp-stripeoffset = dp-stripeoffset;
+ }
+ /* A provider underneath us doesn't support unmapped */
+ if ((dp-flags G_PF_ACCEPT_UNMAPPED) == 0) {
+ G_MIRROR_DEBUG(0, cancelling unmapped
+ because of %s\n, dp-name);
+ pp-flags = ~G_PF_ACCEPT_UNMAPPED;
+ }
}
}
sc-sc_provider = pp;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251886 - in head: contrib/apr contrib/apr-util contrib/serf contrib/sqlite3 contrib/subversion share/mk usr.bin usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libapr usr.bin/svn/lib/liba
On 19 Jun 2013, at 16:13, John Baldwin j...@freebsd.org wrote: portsnap does not work for src. (I thought we had already covered that in earlier threads?) portsnap only moves forward. It is a very important feature for our users that whatever tool they use for source updating be bidirectional. In particular it is very common practice to use a bisect operation to isolate changes responsible for regressions. Freebsd-update can manage the src tree. I'm not entirely clear on what use-case we are addressing here. Is it: - FreeBSD developers, who are probably okay with installing a port, but would prefer a version that didn't depend on kitchen/sink? - Users, who wish to be able to update the source tree and then either build world, or build some optional parts that are not part of the default install? - Some other category of svn consumer? I think having a definitive statement as to the intention of svnlite would help frame the discussion in a more productive format. David ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252011 - head/sys/geom/mirror
Author: scottl
Date: Wed Jun 19 23:09:10 2013
New Revision: 252011
URL: http://svnweb.freebsd.org/changeset/base/252011
Log:
Fix a mystery cut-n-paste corruption from the previous commit.
Submitted by: Brenden Fabeny
Modified:
head/sys/geom/mirror/g_mirror.c
Modified: head/sys/geom/mirror/g_mirror.c
==
--- head/sys/geom/mirror/g_mirror.c Wed Jun 19 21:52:32 2013
(r252010)
+++ head/sys/geom/mirror/g_mirror.c Wed Jun 19 23:09:10 2013
(r252011)
@@ -2040,7 +2040,7 @@ g_mirror_launch_provider(struct g_mirror
pp-stripeoffset = 0;
/* Splitting of unmapped BIO's could work but isn't implemented now */
- if (sc-sc_balance != G_MIRROR_BALANCE_SPLIT)
+ if (sc-sc_balance != G_MIRROR_BALANCE_SPLIT)
pp-flags |= G_PF_ACCEPT_UNMAPPED;
LIST_FOREACH(disk, sc-sc_disks, d_next) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r251886 - in head: contrib/apr contrib/apr-util contrib/serf contrib/sqlite3 contrib/subversion share/mk usr.bin usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libapr usr.bin/svn/lib/liba
On Jun 19, 2013, at 4:49 PM, David Chisnall wrote: On 19 Jun 2013, at 16:13, John Baldwin j...@freebsd.org wrote: portsnap does not work for src. (I thought we had already covered that in earlier threads?) portsnap only moves forward. It is a very important feature for our users that whatever tool they use for source updating be bidirectional. In particular it is very common practice to use a bisect operation to isolate changes responsible for regressions. Freebsd-update can manage the src tree. I'm not entirely clear on what use-case we are addressing here. Is it: - FreeBSD developers, who are probably okay with installing a port, but would prefer a version that didn't depend on kitchen/sink? - Users, who wish to be able to update the source tree and then either build world, or build some optional parts that are not part of the default install? - Some other category of svn consumer? I think having a definitive statement as to the intention of svnlite would help frame the discussion in a more productive format. How do I roll back to last week with FreeBSD-update? Warner ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252012 - head/sys/fs/ext2fs
Author: pfg
Date: Thu Jun 20 00:00:33 2013
New Revision: 252012
URL: http://svnweb.freebsd.org/changeset/base/252012
Log:
Rename some prefixes in the Block Group Descriptor fields to ext4bgd_
Change prefix to avoid confusion and denote that these fields
are generally only available starting with ext4.
MFC after:3 days
Modified:
head/sys/fs/ext2fs/ext2fs.h
Modified: head/sys/fs/ext2fs/ext2fs.h
==
--- head/sys/fs/ext2fs/ext2fs.h Wed Jun 19 23:09:10 2013(r252011)
+++ head/sys/fs/ext2fs/ext2fs.h Thu Jun 20 00:00:33 2013(r252012)
@@ -237,12 +237,12 @@ struct ext2_gd {
uint16_t ext2bgd_nbfree;/* number of free blocks */
uint16_t ext2bgd_nifree;/* number of free inodes */
uint16_t ext2bgd_ndirs; /* number of directories */
- uint16_t ext2bgd_flags; /* block group flags */
- uint32_t ext2bgd_x_bitmap; /* snapshot exclusion bitmap loc. */
- uint16_t ext2bgd_b_bmap_csum; /* block bitmap checksum */
- uint16_t ext2bgd_i_bmap_csum; /* inode bitmap checksum */
- uint16_t ext2bgd_i_unused; /* unused inode count */
- uint16_t ext2bgd_csum; /* group descriptor checksum */
+ uint16_t ext4bgd_flags; /* block group flags */
+ uint32_t ext4bgd_x_bitmap; /* snapshot exclusion bitmap loc. */
+ uint16_t ext4bgd_b_bmap_csum; /* block bitmap checksum */
+ uint16_t ext4bgd_i_bmap_csum; /* inode bitmap checksum */
+ uint16_t ext4bgd_i_unused; /* unused inode count */
+ uint16_t ext4bgd_csum; /* group descriptor checksum */
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252013 - head/contrib/apr/include
Author: kientzle Date: Thu Jun 20 02:04:03 2013 New Revision: 252013 URL: http://svnweb.freebsd.org/changeset/base/252013 Log: Try to fix build of apr on FreeBSD/arm. Modified: head/contrib/apr/include/apr_general.h Modified: head/contrib/apr/include/apr_general.h == --- head/contrib/apr/include/apr_general.h Thu Jun 20 00:00:33 2013 (r252012) +++ head/contrib/apr/include/apr_general.h Thu Jun 20 02:04:03 2013 (r252013) @@ -76,7 +76,7 @@ typedef int apr_signum_t; * @return offset */ -#if defined(CRAY) || (defined(__arm) !defined(LINUX)) +#if defined(CRAY) || (defined(__arm) !defined(LINUX) !defined(__FreeBSD__)) #ifdef __STDC__ #define APR_OFFSET(p_type,field) _Offsetof(p_type,field) #else ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252014 - head/usr.bin
Author: peter
Date: Thu Jun 20 02:26:32 2013
New Revision: 252014
URL: http://svnweb.freebsd.org/changeset/base/252014
Log:
Only enable svn on amd64/ia64/sparc64/i386.
Modified:
head/usr.bin/Makefile
Modified: head/usr.bin/Makefile
==
--- head/usr.bin/Makefile Thu Jun 20 02:04:03 2013(r252013)
+++ head/usr.bin/Makefile Thu Jun 20 02:26:32 2013(r252014)
@@ -366,7 +366,7 @@ SUBDIR+=users
SUBDIR+= who
.endif
-.if ${MACHINE_ARCH} != mips # mips is broken with pthread
+.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == ia64 || ${MACHINE_ARCH}
== sparc64 || ${MACHINE_ARCH} == i386
.if ${MK_SVN} == yes || ${MK_SVNLITE} == yes
SUBDIR+= svn
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252015 - in head: etc share/man/man5
Author: hrs
Date: Thu Jun 20 02:29:49 2013
New Revision: 252015
URL: http://svnweb.freebsd.org/changeset/base/252015
Log:
- Add CIDR notation support like 192.168.1-2.10-16/24 to $ifconfig_IF_aliasN.
This is an extended version of ipv4_addr_IF which supports both IPv4 and
IPv6, and multiple range specifications. To avoid to generate too many
addresses, the maximum number of the generated addresses is currently
limited to 31.
- Add $ifconfig_IF_aliases, which accepts multiple IP aliases in a variable.
- ipv6_prefix_IF now supports !/64 prefix length. In addition to the old
64-bit format (2001:db8:1:1), a full 128-bit format like 2001:db8:1:1::/64
is supported.
- Replace ifconfig command with $IFCONFIG_CMD variable to support
a dry-run mode in the future.
- Remove IP aliases before removing all of IPv4 addresses when doing
rc.d/netif down.
- Add a DAD wait to network6_getladdr() because it is possible to fail to
configure an EUI64 address when ipv6_prefix_IF is specified.
A summary of the supported ifconfig_* variables is as follows:
# IPv4 configuration.
ifconfig_em0=inet 192.168.0.1
# IPv6 configuration.
ifconfig_em0_ipv6=inet6 2001:db8::1/64
# IPv4 address range spec. Now deprecated.
ipv4_addr_em0=10.2.1.1-10
# IPv6 alias.
ifconfig_em0_alias0=inet6 2001:db8:5::1 prefixlen 70
# IPv4 alias.
ifconfig_em0_alias1=inet 10.2.2.1/24
# IPv4 alias with range spec w/o AF keyword (backward compat).
ifconfig_em0_alias2=10.3.1.1-10/32
# IPv6 alias with range spec.
ifconfig_em0_alias3=inet6 2001:db8:20-2f::1/64
# ifconfig_IF_aliases is just like ifconfig_IF_aliasN.
ifconfig_em0_aliases=inet 10.3.3.201-204/24 inet6 2001:db8:210-213::1/64
inet 10.1.1.1/24
# IPv6 alias (backward compat)
ipv6_ifconfig_em0_alias0=inet6 2001:db8:f::1/64
# IPv6 alias w/o AF keyword (backward compat)
ipv6_ifconfig_em0_alias1=2001:db8:f:1::1/64
# IPv6 prefix.
ipv6_prefix_em0=2001:db8::/64
Tested by:Kimmo Paasiala
Modified:
head/etc/network.subr
head/share/man/man5/rc.conf.5
Modified: head/etc/network.subr
==
--- head/etc/network.subr Thu Jun 20 02:26:32 2013(r252014)
+++ head/etc/network.subr Thu Jun 20 02:29:49 2013(r252015)
@@ -24,6 +24,10 @@
#
# $FreeBSD$
#
+IFCONFIG_CMD=/sbin/ifconfig
+
+# Maximum number of addresses expanded from a address range specification.
+_IPEXPANDMAX=31
#
# Subroutines commonly used from network startup scripts.
@@ -94,7 +98,7 @@ ifconfig_up()
# ifconfig_IF
ifconfig_args=`ifconfig_getargs $1`
if [ -n ${ifconfig_args} ]; then
- eval ifconfig $1 ${ifconfig_args}
+ eval ${IFCONFIG_CMD} $1 ${ifconfig_args}
_cfg=0
fi
@@ -122,7 +126,7 @@ ifconfig_up()
esac
if [ -n ${_ipv6_opts} ]; then
- ifconfig $1 inet6 ${_ipv6_opts}
+ ${IFCONFIG_CMD} $1 inet6 ${_ipv6_opts}
fi
# ifconfig_IF_ipv6
@@ -136,8 +140,8 @@ ifconfig_up()
ifconfig_args=inet6 ${ifconfig_args}
;;
esac
- ifconfig $1 inet6 -ifdisabled
- eval ifconfig $1 ${ifconfig_args}
+ ${IFCONFIG_CMD} $1 inet6 -ifdisabled
+ eval ${IFCONFIG_CMD} $1 ${ifconfig_args}
_cfg=0
fi
@@ -145,7 +149,7 @@ ifconfig_up()
# ipv6_prefix_hostid_addr_common().
ifconfig_args=`get_if_var $1 ipv6_prefix_IF`
if [ -n ${ifconfig_args} ]; then
- ifconfig $1 inet6 -ifdisabled
+ ${IFCONFIG_CMD} $1 inet6 -ifdisabled
_cfg=0
fi
@@ -154,14 +158,14 @@ ifconfig_up()
if [ -n ${ifconfig_args} ]; then
warn \$ipv6_ifconfig_$1 is obsolete. \
Use ifconfig_$1_ipv6 instead.
- ifconfig $1 inet6 -ifdisabled
- eval ifconfig $1 inet6 ${ifconfig_args}
+ ${IFCONFIG_CMD} $1 inet6 -ifdisabled
+ eval ${IFCONFIG_CMD} $1 inet6 ${ifconfig_args}
_cfg=0
fi
fi
if [ ${_cfg} -eq 0 ]; then
- ifconfig $1 up
+ ${IFCONFIG_CMD} $1 up
fi
if wpaif $1; then
@@ -171,7 +175,7 @@ ifconfig_up()
if dhcpif $1; then
if [ $_cfg -ne 0 ] ; then
- ifconfig $1 up
+ ${IFCONFIG_CMD} $1 up
fi
if syncdhcpif $1; then
/etc/rc.d/dhclient start $1
@@ -202,7 +206,7 @@ ifconfig_down()
fi
svn commit: r252016 - svnadmin/hooks/scripts
Author: peter Date: Thu Jun 20 03:55:41 2013 New Revision: 252016 URL: http://svnweb.freebsd.org/changeset/base/252016 Log: Move /usr/local/bin in front of /usr/bin, just to be sure. Modified: svnadmin/hooks/scripts/env.sh Modified: svnadmin/hooks/scripts/env.sh == --- svnadmin/hooks/scripts/env.sh Thu Jun 20 02:29:49 2013 (r252015) +++ svnadmin/hooks/scripts/env.sh Thu Jun 20 03:55:41 2013 (r252016) @@ -1,6 +1,6 @@ # source this file # $FreeBSD$ -PATH=/s/svn/base/hooks/scripts:/usr/bin:/bin:/usr/local/bin:/usr/sbin:/sbin:/usr/local/sbin +PATH=/s/svn/base/hooks/scripts:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin export PATH cd /s/svn/base umask 002 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252017 - in head/usr.sbin/bsdconfig/security: . include
Author: dteske Date: Thu Jun 20 05:40:11 2013 New Revision: 252017 URL: http://svnweb.freebsd.org/changeset/base/252017 Log: Add debugging (for a case that shouldn't arise, but makes it more obvious if a menu addition is made in one plce but forgotten in another). Modified: head/usr.sbin/bsdconfig/security/include/messages.subr head/usr.sbin/bsdconfig/security/kern_securelevel head/usr.sbin/bsdconfig/security/security Modified: head/usr.sbin/bsdconfig/security/include/messages.subr == --- head/usr.sbin/bsdconfig/security/include/messages.subr Thu Jun 20 03:55:41 2013(r252016) +++ head/usr.sbin/bsdconfig/security/include/messages.subr Thu Jun 20 05:40:11 2013(r252017) @@ -46,3 +46,5 @@ msg_securelevel_desc=Configure securele msg_securelevels_menu_text=This menu allows you to select the securelevel your system runs with.\nWhen operating at a securelevel, certain root privileges are disabled,\nwhich may increase resistance to exploits and protect system integrity.\nIn secure mode system flags may not be overridden by the root user,\naccess to direct kernel memory is limited, and kernel modules may not\nbe changed. In highly secure mode, mounted file systems may not be\nmodified on-disk, tampering with the system clock is prohibited. In\nnetwork secure mode configuration changes to firewalling are prohibited.\n msg_securelevels_menu_title=Securelevel Configuration Menu msg_system_security_options_menu=System Security Options Menu +msg_unknown_kern_securelevel_selection=Unknown kern.securelevel selection +msg_unknown_security_menu_selection=Unknown security menu selection Modified: head/usr.sbin/bsdconfig/security/kern_securelevel == --- head/usr.sbin/bsdconfig/security/kern_securelevel Thu Jun 20 03:55:41 2013(r252016) +++ head/usr.sbin/bsdconfig/security/kern_securelevel Thu Jun 20 05:40:11 2013(r252017) @@ -158,6 +158,8 @@ case $mtag in f_sysrc_set kern_securelevel_enable YES f_sysrc_set kern_securelevel 3 ;; +*) + f_die 1 $msg_unknown_kern_securelevel_selection esac exit $SUCCESS Modified: head/usr.sbin/bsdconfig/security/security == --- head/usr.sbin/bsdconfig/security/security Thu Jun 20 03:55:41 2013 (r252016) +++ head/usr.sbin/bsdconfig/security/security Thu Jun 20 05:40:11 2013 (r252017) @@ -165,6 +165,8 @@ while :; do f_sysrc_set nfs_reserved_port_only NO ;; 3 [ ] $msg_nfs_port) # Same; Toggle value f_sysrc_set nfs_reserved_port_only YES ;; + *) + f_die 1 $msg_unknown_security_menu_selection esac done ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252018 - head/usr.sbin/bsdconfig/startup
Author: dteske
Date: Thu Jun 20 05:42:21 2013
New Revision: 252018
URL: http://svnweb.freebsd.org/changeset/base/252018
Log:
Remove pedanticism and consolidate some logic.
Modified:
head/usr.sbin/bsdconfig/startup/rcdelete
Modified: head/usr.sbin/bsdconfig/startup/rcdelete
==
--- head/usr.sbin/bsdconfig/startup/rcdeleteThu Jun 20 05:40:11 2013
(r252017)
+++ head/usr.sbin/bsdconfig/startup/rcdeleteThu Jun 20 05:42:21 2013
(r252018)
@@ -367,19 +367,16 @@ while :; do
[ $( eval echo \$_${var}_delete ) ] || continue
delete_vars=$delete_vars${delete_vars:+ }$var
done
- unset var # no longer needed
if dialog_menu_confirm_delete $delete_vars; then
f_dialog_title $msg_info
f_dialog_info $msg_deleting_selected_directives
f_dialog_title_restore
for var in $delete_vars; do
- err=$( f_sysrc_delete $var 21 )
- if [ $? -ne $SUCCESS ]; then
+ if ! err=$( f_sysrc_delete $var 21 ); then
f_dialog_msgbox $err\n
break
fi
done
- unset var # no longer needed
dialog_create_main
fi
;;
@@ -388,7 +385,6 @@ while :; do
setvar _${var}_delete 1
export _${var}_delete
done
- unset var # no longer needed
;;
$msg_none)
var_list=$( set | awk -F=
@@ -398,7 +394,6 @@ while :; do
}
)
[ $var_list ] unset $var_list
- unset var_list # no longer needed
;;
*) # Anything else is a variable to edit
var=${mtag# }
@@ -410,7 +405,6 @@ while :; do
setvar _${var}_delete 1
export _${var}_delete
fi
- unset var # no longer needed
esac
done
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r252019 - in head/usr.sbin/bsdconfig: . startup usermgmt
Author: dteske
Date: Thu Jun 20 05:48:08 2013
New Revision: 252019
URL: http://svnweb.freebsd.org/changeset/base/252019
Log:
When the fall-back of a case-statement is the last thing executed in a
while-loop _and_ all prior matches in the same case-statement either break
or continue, we can safely break the fall-back out of the case-statement.
This should improve readability and allow for longer-lines by reducing the
level of indentation by-one for the fall-back case.
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/startup/rcadd
head/usr.sbin/bsdconfig/usermgmt/groupedit
head/usr.sbin/bsdconfig/usermgmt/userdel
head/usr.sbin/bsdconfig/usermgmt/useredit
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Thu Jun 20 05:42:21 2013
(r252018)
+++ head/usr.sbin/bsdconfig/bsdconfig Thu Jun 20 05:48:08 2013
(r252019)
@@ -330,25 +330,21 @@ while :; do
fi
case $mtag in
- X) # Exit
- break
- ;;
-
+ X) break ;;
1) # Usage
f_show_help $USAGE_HELPFILE
continue
- ;;
+ esac
- *) # Dynamically loaded menuitem
- f_getvar menu_program$mtag menu_program
- case $menu_program in
- /*) cmd=$menu_program;;
- *) cmd=$BSDCFG_LIBE/$menu_program
- esac
- f_dprintf cmd=[%s] $cmd
- $cmd ${USE_XDIALOG:+-X}
+ # Anything else is a dynamically loaded menuitem
+ f_getvar menu_program$mtag menu_program
+ case $menu_program in
+ /*) cmd=$menu_program;;
+*) cmd=$BSDCFG_LIBE/$menu_program
esac
+ f_dprintf cmd=[%s] $cmd
+ $cmd ${USE_XDIALOG:+-X}
done
exit $SUCCESS
Modified: head/usr.sbin/bsdconfig/startup/rcadd
==
--- head/usr.sbin/bsdconfig/startup/rcadd Thu Jun 20 05:42:21 2013
(r252018)
+++ head/usr.sbin/bsdconfig/startup/rcadd Thu Jun 20 05:48:08 2013
(r252019)
@@ -127,13 +127,12 @@ while :; do
f_dialog_menutag_fetch mtag
defaultitem=$mtag
- case $mtag in
- X $msg_exit ) break ;;
- *) # Anything else is a directive
- rcvar=${mtag# }
- $BSDCFG_LIBE/$APP_DIR/rcedit \
- ${USE_XDIALOG:+-X} $rcvar
- esac
+ [ $mtag = X $msg_exit ] break
+
+ # Anything else is a directive
+
+ $BSDCFG_LIBE/$APP_DIR/rcedit ${USE_XDIALOG:+-X} \
+${mtag# }
done
;;
2) # Add Custom
Modified: head/usr.sbin/bsdconfig/usermgmt/groupedit
==
--- head/usr.sbin/bsdconfig/usermgmt/groupedit Thu Jun 20 05:42:21 2013
(r252018)
+++ head/usr.sbin/bsdconfig/usermgmt/groupedit Thu Jun 20 05:48:08 2013
(r252019)
@@ -77,13 +77,12 @@ while :; do
[ $retval -eq 0 ] || f_die
- case $mtag in
- X $msg_exit) break ;;
- *) # anything else is a group name
- $BSDCFG_LIBE/$APP_DIR/groupinput \
- ${USE_XDIALOG:+-X} mode=Edit/View group=$mtag
- ;;
- esac
+ [ $mtag = X $msg_exit ] break
+
+ # Anything else is a group name
+
+ $BSDCFG_LIBE/$APP_DIR/groupinput \
+ ${USE_XDIALOG:+-X} mode=Edit/View group=$mtag
done
exit $SUCCESS
Modified: head/usr.sbin/bsdconfig/usermgmt/userdel
==
--- head/usr.sbin/bsdconfig/usermgmt/userdelThu Jun 20 05:42:21 2013
(r252018)
+++ head/usr.sbin/bsdconfig/usermgmt/userdelThu Jun 20 05:48:08 2013
(r252019)
@@ -77,13 +77,12 @@ while :; do
[ $retval -eq 0 ] || f_die
- case $mtag in
- X $msg_exit) break ;;
- *) # anything else is a userid
- $BSDCFG_LIBE/$APP_DIR/userinput \
- ${USE_XDIALOG:+-X} mode=Delete user=$mtag
- ;;
- esac
+ [ $mtag = X $msg_exit ] break
+
+ # Anything else is a userid
+
+ $BSDCFG_LIBE/$APP_DIR/userinput \
+ ${USE_XDIALOG:+-X} mode=Delete user=$mtag
done
exit $SUCCESS
Modified: head/usr.sbin/bsdconfig/usermgmt/useredit
==
--- head/usr.sbin/bsdconfig/usermgmt/useredit Thu Jun 20 05:42:21 2013
(r252018)
+++ head/usr.sbin/bsdconfig/usermgmt/useredit Thu Jun 20 05:48:08 2013
(r252019)
@@ -77,13 +77,12 @@ while :; do
[ $retval -eq 0 ] || f_die
- case $mtag in
- X
svn commit: r252020 - in head/usr.sbin/bsdconfig: startup usermgmt
Author: dteske
Date: Thu Jun 20 05:51:44 2013
New Revision: 252020
URL: http://svnweb.freebsd.org/changeset/base/252020
Log:
When the fall-back of a case-statement is the last thing executed in a
while-loop _and_ all prior matches in the same case-statement either break
or continue, we can safely break the fall-back out of the case-statement.
This should improve readability and allow for longer-lines by reducing the
level of indentation by-one for the fall-back case.
(a continuation of SVN r252019)
Modified:
head/usr.sbin/bsdconfig/startup/rcvar
head/usr.sbin/bsdconfig/usermgmt/groupdel
Modified: head/usr.sbin/bsdconfig/startup/rcvar
==
--- head/usr.sbin/bsdconfig/startup/rcvar Thu Jun 20 05:48:08 2013
(r252019)
+++ head/usr.sbin/bsdconfig/startup/rcvar Thu Jun 20 05:51:44 2013
(r252020)
@@ -197,21 +197,20 @@ while :; do
dialog_menu_main || f_die
f_dialog_menutag_fetch mtag
- case $mtag in
- X $msg_exit) break ;;
- *) # Anything else is an rcvar to toggle
- rcvar=${mtag# }
- f_dialog_menuitem_fetch value
-
- # Determine the new [toggled] value to use
- case $value in
- [X]*) value=NO ;;
-*) value=YES
- esac
+ [ $mtag = X $msg_exit ] break
- err=$( f_sysrc_set $rcvar $value 21 ) ||
- f_dialog_msgbox $err
+ # Anything else is an rcvar to toggle
+
+ rcvar=${mtag# }
+ f_dialog_menuitem_fetch value
+
+ # Determine the new [toggled] value to use
+ case $value in
+ [X]*) value=NO ;;
+*) value=YES
esac
+
+ err=$( f_sysrc_set $rcvar $value 21 ) || f_dialog_msgbox $err
done
exit $SUCCESS
Modified: head/usr.sbin/bsdconfig/usermgmt/groupdel
==
--- head/usr.sbin/bsdconfig/usermgmt/groupdel Thu Jun 20 05:48:08 2013
(r252019)
+++ head/usr.sbin/bsdconfig/usermgmt/groupdel Thu Jun 20 05:51:44 2013
(r252020)
@@ -77,13 +77,12 @@ while :; do
[ $retval -eq 0 ] || f_die
- case $mtag in
- X $msg_exit) break ;;
- *) # anything else is a group name
- $BSDCFG_LIBE/$APP_DIR/groupinput \
- ${USE_XDIALOG:+-X} mode=Delete group=$mtag
- ;;
- esac
+ [ $mtag = X $msg_exit ] break
+
+ # Anything else is a group name
+
+ $BSDCFG_LIBE/$APP_DIR/groupinput \
+ ${USE_XDIALOG:+-X} mode=Delete group=$mtag
done
exit $SUCCESS
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
