Date: Fri, 28 Oct 2011 02:54:08 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r226874 - in user/attilio/vmcontention: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/gcc contrib/top contrib/tzcode/stdtime contrib/tzdata etc e... Message-ID: <201110280254.p9S2s8M9038012@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Fri Oct 28 02:54:07 2011 New Revision: 226874 URL: http://svn.freebsd.org/changeset/base/226874 Log: MFC Added: user/attilio/vmcontention/sys/boot/i386/common/edd.h - copied unchanged from r226873, head/sys/boot/i386/common/edd.h Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h user/attilio/vmcontention/contrib/gcc/BASE-VER user/attilio/vmcontention/contrib/gcc/DEV-PHASE user/attilio/vmcontention/contrib/tzcode/stdtime/localtime.c user/attilio/vmcontention/contrib/tzdata/asia user/attilio/vmcontention/contrib/tzdata/australasia user/attilio/vmcontention/contrib/tzdata/backward user/attilio/vmcontention/contrib/tzdata/europe user/attilio/vmcontention/contrib/tzdata/northamerica user/attilio/vmcontention/contrib/tzdata/southamerica user/attilio/vmcontention/contrib/tzdata/zone.tab user/attilio/vmcontention/etc/defaults/periodic.conf user/attilio/vmcontention/etc/devd.conf user/attilio/vmcontention/etc/devfs.conf user/attilio/vmcontention/etc/periodic/daily/800.scrub-zfs user/attilio/vmcontention/gnu/usr.bin/cc/Makefile.ver user/attilio/vmcontention/lib/libc/gen/getutxent.3 user/attilio/vmcontention/lib/libc/gen/pututxline.c user/attilio/vmcontention/lib/libc/sys/timer_create.2 user/attilio/vmcontention/sbin/devd/devd.cc user/attilio/vmcontention/sbin/devd/devd.conf.5 user/attilio/vmcontention/sbin/devd/devd.hh user/attilio/vmcontention/sbin/fsck/fsck.8 user/attilio/vmcontention/sbin/fsck/fsck.c user/attilio/vmcontention/sbin/geom/class/eli/geli.8 user/attilio/vmcontention/sbin/geom/class/eli/geom_eli.c user/attilio/vmcontention/sbin/geom/class/raid/graid.8 user/attilio/vmcontention/sbin/geom/misc/subr.c user/attilio/vmcontention/sbin/hastd/hast.conf.5 user/attilio/vmcontention/sbin/hastd/parse.y user/attilio/vmcontention/sbin/hastd/primary.c user/attilio/vmcontention/sbin/hastd/secondary.c user/attilio/vmcontention/sbin/swapon/Makefile user/attilio/vmcontention/sbin/swapon/swapon.8 user/attilio/vmcontention/sbin/swapon/swapon.c user/attilio/vmcontention/share/man/man4/axe.4 user/attilio/vmcontention/share/man/man4/dc.4 user/attilio/vmcontention/share/man/man4/vlan.4 user/attilio/vmcontention/sys/amd64/amd64/pmap.c user/attilio/vmcontention/sys/amd64/amd64/uma_machdep.c user/attilio/vmcontention/sys/amd64/conf/GENERIC user/attilio/vmcontention/sys/arm/at91/at91.c user/attilio/vmcontention/sys/arm/econa/econa.c user/attilio/vmcontention/sys/arm/xscale/i80321/iq80321.c user/attilio/vmcontention/sys/arm/xscale/i8134x/i81342.c user/attilio/vmcontention/sys/arm/xscale/ixp425/ixp425.c user/attilio/vmcontention/sys/arm/xscale/pxa/pxa_obio.c user/attilio/vmcontention/sys/boot/forth/loader.conf user/attilio/vmcontention/sys/boot/i386/boot2/boot2.c user/attilio/vmcontention/sys/boot/i386/btx/lib/btxv86.h user/attilio/vmcontention/sys/boot/i386/common/cons.c user/attilio/vmcontention/sys/boot/i386/common/drv.c user/attilio/vmcontention/sys/boot/i386/libi386/Makefile user/attilio/vmcontention/sys/boot/i386/libi386/bioscd.c user/attilio/vmcontention/sys/boot/i386/libi386/biosdisk.c user/attilio/vmcontention/sys/boot/i386/libi386/biosmem.c user/attilio/vmcontention/sys/boot/i386/libi386/biospci.c user/attilio/vmcontention/sys/boot/i386/libi386/biossmap.c user/attilio/vmcontention/sys/boot/i386/libi386/libi386.h user/attilio/vmcontention/sys/boot/i386/libi386/vidconsole.c user/attilio/vmcontention/sys/boot/pc98/boot2/boot2.c user/attilio/vmcontention/sys/boot/pc98/btx/lib/btxv86.h user/attilio/vmcontention/sys/boot/pc98/libpc98/bioscd.c user/attilio/vmcontention/sys/boot/pc98/libpc98/vidconsole.c user/attilio/vmcontention/sys/boot/pc98/loader/main.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/attilio/vmcontention/sys/conf/files.arm user/attilio/vmcontention/sys/conf/kern.mk user/attilio/vmcontention/sys/conf/newvers.sh user/attilio/vmcontention/sys/contrib/pf/net/if_pfsync.c user/attilio/vmcontention/sys/crypto/aesni/aesni_wrap.c user/attilio/vmcontention/sys/dev/ata/ata-isa.c user/attilio/vmcontention/sys/dev/ata/ata-pci.c user/attilio/vmcontention/sys/dev/ata/ata-pci.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ah.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_desc.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5212/ar5212.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416desc.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416reg.h user/attilio/vmcontention/sys/dev/ath/if_ath_sysctl.c user/attilio/vmcontention/sys/dev/ath/if_athioctl.h user/attilio/vmcontention/sys/dev/bge/if_bge.c user/attilio/vmcontention/sys/dev/bge/if_bgereg.h user/attilio/vmcontention/sys/dev/dc/if_dc.c user/attilio/vmcontention/sys/dev/dc/if_dcreg.h user/attilio/vmcontention/sys/dev/iwn/if_iwn.c user/attilio/vmcontention/sys/dev/mii/brgphy.c user/attilio/vmcontention/sys/dev/mii/miidevs user/attilio/vmcontention/sys/dev/usb/controller/xhci.c user/attilio/vmcontention/sys/dev/usb/controller/xhcireg.h user/attilio/vmcontention/sys/dev/usb/net/if_axe.c user/attilio/vmcontention/sys/dev/usb/net/if_axereg.h user/attilio/vmcontention/sys/dev/usb/net/usb_ethernet.c user/attilio/vmcontention/sys/dev/usb/net/usb_ethernet.h user/attilio/vmcontention/sys/dev/usb/usb.h user/attilio/vmcontention/sys/dev/usb/usb_hub.c user/attilio/vmcontention/sys/dev/xen/balloon/balloon.c user/attilio/vmcontention/sys/fs/nullfs/null_vfsops.c user/attilio/vmcontention/sys/geom/eli/g_eli.c user/attilio/vmcontention/sys/geom/eli/g_eli.h user/attilio/vmcontention/sys/geom/geom_disk.c user/attilio/vmcontention/sys/geom/raid/md_intel.c user/attilio/vmcontention/sys/geom/raid/md_nvidia.c user/attilio/vmcontention/sys/geom/raid/md_promise.c user/attilio/vmcontention/sys/i386/conf/GENERIC user/attilio/vmcontention/sys/i386/i386/pmap.c user/attilio/vmcontention/sys/i386/xen/pmap.c user/attilio/vmcontention/sys/ia64/conf/GENERIC user/attilio/vmcontention/sys/kern/init_main.c user/attilio/vmcontention/sys/kern/kern_malloc.c user/attilio/vmcontention/sys/kern/subr_witness.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/kern/vfs_subr.c user/attilio/vmcontention/sys/modules/zfs/Makefile user/attilio/vmcontention/sys/net/if_var.h user/attilio/vmcontention/sys/net/route.c user/attilio/vmcontention/sys/netgraph/netgraph.h user/attilio/vmcontention/sys/netgraph/ng_base.c user/attilio/vmcontention/sys/netinet/in.c user/attilio/vmcontention/sys/netinet/sctp_output.c user/attilio/vmcontention/sys/netinet/sctp_pcb.c user/attilio/vmcontention/sys/pc98/conf/GENERIC user/attilio/vmcontention/sys/powerpc/conf/GENERIC user/attilio/vmcontention/sys/sparc64/conf/GENERIC user/attilio/vmcontention/sys/sys/fcntl.h user/attilio/vmcontention/sys/vm/vm_contig.c user/attilio/vmcontention/sys/vm/vm_kern.c user/attilio/vmcontention/sys/vm/vm_page.c user/attilio/vmcontention/tools/regression/geom_eli/resize.t user/attilio/vmcontention/tools/tools/ath/athstats/athstats.c user/attilio/vmcontention/usr.bin/getent/getent.c user/attilio/vmcontention/usr.sbin/boot0cfg/boot0cfg.c user/attilio/vmcontention/usr.sbin/bsdinstall/partedit/partedit.c user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/netconfig user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def user/attilio/vmcontention/usr.sbin/pkg_install/info/show.c user/attilio/vmcontention/usr.sbin/ypbind/ypbind.c user/attilio/vmcontention/usr.sbin/ypserv/yp_main.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/bind9/ (props changed) user/attilio/vmcontention/contrib/binutils/ (props changed) user/attilio/vmcontention/contrib/bzip2/ (props changed) user/attilio/vmcontention/contrib/com_err/ (props changed) user/attilio/vmcontention/contrib/compiler-rt/ (props changed) user/attilio/vmcontention/contrib/dialog/ (props changed) user/attilio/vmcontention/contrib/ee/ (props changed) user/attilio/vmcontention/contrib/expat/ (props changed) user/attilio/vmcontention/contrib/file/ (props changed) user/attilio/vmcontention/contrib/gcc/ (props changed) user/attilio/vmcontention/contrib/gdb/ (props changed) user/attilio/vmcontention/contrib/gdtoa/ (props changed) user/attilio/vmcontention/contrib/gnu-sort/ (props changed) user/attilio/vmcontention/contrib/groff/ (props changed) user/attilio/vmcontention/contrib/less/ (props changed) user/attilio/vmcontention/contrib/libpcap/ (props changed) user/attilio/vmcontention/contrib/libstdc++/ (props changed) user/attilio/vmcontention/contrib/llvm/ (props changed) user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed) user/attilio/vmcontention/contrib/ncurses/ (props changed) user/attilio/vmcontention/contrib/netcat/ (props changed) user/attilio/vmcontention/contrib/ntp/ (props changed) user/attilio/vmcontention/contrib/one-true-awk/ (props changed) user/attilio/vmcontention/contrib/openbsm/ (props changed) user/attilio/vmcontention/contrib/openpam/ (props changed) user/attilio/vmcontention/contrib/openresolv/ (props changed) user/attilio/vmcontention/contrib/pf/ (props changed) user/attilio/vmcontention/contrib/sendmail/ (props changed) user/attilio/vmcontention/contrib/tcpdump/ (props changed) user/attilio/vmcontention/contrib/tcsh/ (props changed) user/attilio/vmcontention/contrib/tnftp/ (props changed) user/attilio/vmcontention/contrib/top/ (props changed) user/attilio/vmcontention/contrib/top/install-sh (props changed) user/attilio/vmcontention/contrib/tzcode/stdtime/ (props changed) user/attilio/vmcontention/contrib/tzcode/zic/ (props changed) user/attilio/vmcontention/contrib/tzdata/ (props changed) user/attilio/vmcontention/contrib/wpa/ (props changed) user/attilio/vmcontention/contrib/xz/ (props changed) user/attilio/vmcontention/crypto/heimdal/ (props changed) user/attilio/vmcontention/crypto/openssh/ (props changed) user/attilio/vmcontention/crypto/openssl/ (props changed) user/attilio/vmcontention/gnu/lib/ (props changed) user/attilio/vmcontention/gnu/usr.bin/binutils/ (props changed) user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/ (props changed) user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/lib/libc/stdtime/ (props changed) user/attilio/vmcontention/lib/libutil/ (props changed) user/attilio/vmcontention/lib/libz/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sbin/ipfw/ (props changed) user/attilio/vmcontention/share/mk/bsd.arch.inc.mk (props changed) user/attilio/vmcontention/share/zoneinfo/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/amd64/include/xen/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/boot/i386/efi/ (props changed) user/attilio/vmcontention/sys/boot/ia64/efi/ (props changed) user/attilio/vmcontention/sys/boot/ia64/ski/ (props changed) user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/ (props changed) user/attilio/vmcontention/sys/boot/powerpc/ofw/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/sys/contrib/dev/acpica/ (props changed) user/attilio/vmcontention/sys/contrib/octeon-sdk/ (props changed) user/attilio/vmcontention/sys/contrib/pf/ (props changed) user/attilio/vmcontention/sys/contrib/x86emu/ (props changed) user/attilio/vmcontention/usr.bin/calendar/ (props changed) user/attilio/vmcontention/usr.bin/csup/ (props changed) user/attilio/vmcontention/usr.bin/procstat/ (props changed) user/attilio/vmcontention/usr.sbin/ndiscvt/ (props changed) user/attilio/vmcontention/usr.sbin/rtadvctl/ (props changed) user/attilio/vmcontention/usr.sbin/rtadvd/ (props changed) user/attilio/vmcontention/usr.sbin/rtsold/ (props changed) user/attilio/vmcontention/usr.sbin/zic/ (props changed) Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/Makefile.inc1 Fri Oct 28 02:54:07 2011 (r226874) @@ -1018,7 +1018,8 @@ _yacc= usr.bin/yacc _awk= usr.bin/awk .endif -.if ${BOOTSTRAPPING} < 700018 +.if ${MK_BSNMP} != "no" && \ + (${BOOTSTRAPPING} < 700018 || !exists(/usr/sbin/gensnmptree)) _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Oct 28 02:54:07 2011 (r226874) @@ -76,6 +76,11 @@ zfs \- configures ZFS file systems .LP .nf +\fBzfs\fR \fBrename\fR \fB-u\fR [\fB-p\fR] \fIfilesystem\fR \fIfilesystem\fR +.fi + +.LP +.nf \fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-H\fR][\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]] [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ... .fi @@ -1479,6 +1484,10 @@ The snapshot that was cloned, and any sn .na \fB\fBzfs rename\fR [\fB-p\fR] \fIfilesystem\fR|\fIvolume\fR \fIfilesystem\fR|\fIvolume\fR\fR .ad +.br +.na +\fB\fBzfs rename\fR \fB-u\fR [\fB-p\fR] \fIfilesystem\fR \fIfilesystem\fR\fR +.ad .sp .6 .RS 4n Renames the given dataset. The new target can be located anywhere in the \fBZFS\fR hierarchy, with the exception of snapshots. Snapshots can only be renamed within the parent file system or volume. When renaming a snapshot, the parent file system of the snapshot does not need to be specified as part of the second argument. Renamed file systems can inherit new mount points, in which case they are unmounted and remounted at the new mount point. @@ -1493,6 +1502,17 @@ Renames the given dataset. The new targe Creates all the nonexistent parent datasets. Datasets created in this manner are automatically mounted according to the \fBmountpoint\fR property inherited from their parent. .RE +.sp +.ne 2 +.mk +.na +\fB\fB-u\fR\fR +.ad +.sp .6 +.RS 4n +Do not remount file systems during rename. If a file system's \fBmountpoint\fR property is set to \fBlegacy\fR or \fBnone\fR, file system is not unmounted even if this option is not given. +.RE + .RE .sp Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Oct 28 02:54:07 2011 (r226874) @@ -22,6 +22,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #include <assert.h> @@ -253,7 +255,8 @@ get_usage(zfs_help_t idx) return (gettext("\trename <filesystem|volume|snapshot> " "<filesystem|volume|snapshot>\n" "\trename -p <filesystem|volume> <filesystem|volume>\n" - "\trename -r <snapshot> <snapshot>")); + "\trename -r <snapshot> <snapshot>\n" + "\trename -u [-p] <filesystem> <filesystem>")); case HELP_ROLLBACK: return (gettext("\trollback [-rRf] <snapshot>\n")); case HELP_SEND: @@ -2851,6 +2854,7 @@ zfs_do_list(int argc, char **argv) * zfs rename <fs | snap | vol> <fs | snap | vol> * zfs rename -p <fs | vol> <fs | vol> * zfs rename -r <snap> <snap> + * zfs rename -u [-p] <fs> <fs> * * Renames the given dataset to another of the same type. * @@ -2861,19 +2865,21 @@ static int zfs_do_rename(int argc, char **argv) { zfs_handle_t *zhp; - int c; - int ret; - boolean_t recurse = B_FALSE; + renameflags_t flags = { 0 }; + int c, ret, types; boolean_t parents = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, "pr")) != -1) { + while ((c = getopt(argc, argv, "pru")) != -1) { switch (c) { case 'p': parents = B_TRUE; break; case 'r': - recurse = B_TRUE; + flags.recurse = B_TRUE; + break; + case 'u': + flags.nounmount = B_TRUE; break; case '?': default: @@ -2902,20 +2908,32 @@ zfs_do_rename(int argc, char **argv) usage(B_FALSE); } - if (recurse && parents) { + if (flags.recurse && parents) { (void) fprintf(stderr, gettext("-p and -r options are mutually " "exclusive\n")); usage(B_FALSE); } - if (recurse && strchr(argv[0], '@') == 0) { + if (flags.recurse && strchr(argv[0], '@') == 0) { (void) fprintf(stderr, gettext("source dataset for recursive " "rename must be a snapshot\n")); usage(B_FALSE); } - if ((zhp = zfs_open(g_zfs, argv[0], parents ? ZFS_TYPE_FILESYSTEM | - ZFS_TYPE_VOLUME : ZFS_TYPE_DATASET)) == NULL) + if (flags.nounmount && parents) { + (void) fprintf(stderr, gettext("-u and -r options are mutually " + "exclusive\n")); + usage(B_FALSE); + } + + if (flags.nounmount) + types = ZFS_TYPE_FILESYSTEM; + else if (parents) + types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME; + else + types = ZFS_TYPE_DATASET; + + if ((zhp = zfs_open(g_zfs, argv[0], types)) == NULL) return (1); /* If we were asked and the name looks good, try to create ancestors. */ @@ -2925,7 +2943,7 @@ zfs_do_rename(int argc, char **argv) return (1); } - ret = (zfs_rename(zhp, argv[1], recurse) != 0); + ret = (zfs_rename(zhp, argv[1], flags) != 0); zfs_close(zhp); return (ret); Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Oct 28 02:54:07 2011 (r226874) @@ -22,6 +22,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #ifndef _LIBZFS_H @@ -518,7 +520,16 @@ extern int zfs_destroy_snaps(zfs_handle_ extern int zfs_clone(zfs_handle_t *, const char *, nvlist_t *); extern int zfs_snapshot(libzfs_handle_t *, const char *, boolean_t, nvlist_t *); extern int zfs_rollback(zfs_handle_t *, zfs_handle_t *, boolean_t); -extern int zfs_rename(zfs_handle_t *, const char *, boolean_t); + +typedef struct renameflags { + /* recursive rename */ + int recurse : 1; + + /* don't unmount file systems */ + int nounmount : 1; +} renameflags_t; + +extern int zfs_rename(zfs_handle_t *, const char *, renameflags_t flags); typedef struct sendflags { /* print informational messages (ie, -v was specified) */ Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Fri Oct 28 02:54:07 2011 (r226874) @@ -24,6 +24,9 @@ * Use is subject to license terms. * * Portions Copyright 2007 Ramprakash Jelari + * + * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #include <libintl.h> @@ -122,6 +125,8 @@ changelist_prefix(prop_changelist_t *clp */ switch (clp->cl_prop) { case ZFS_PROP_MOUNTPOINT: + if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT) + break; if (zfs_unmount(cn->cn_handle, NULL, clp->cl_mflags) != 0) { ret = -1; @@ -168,8 +173,10 @@ changelist_postfix(prop_changelist_t *cl if ((cn = uu_list_last(clp->cl_list)) == NULL) return (0); - if (clp->cl_prop == ZFS_PROP_MOUNTPOINT) + if (clp->cl_prop == ZFS_PROP_MOUNTPOINT && + !(clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)) { remove_mountpoint(cn->cn_handle); + } /* * It is possible that the changelist_prefix() used libshare @@ -224,7 +231,8 @@ changelist_postfix(prop_changelist_t *cl shareopts, sizeof (shareopts), NULL, NULL, 0, B_FALSE) == 0) && (strcmp(shareopts, "off") != 0)); - mounted = zfs_is_mounted(cn->cn_handle, NULL); + mounted = (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT) || + zfs_is_mounted(cn->cn_handle, NULL); if (!mounted && (cn->cn_mounted || ((sharenfs || sharesmb || clp->cl_waslegacy) && Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Oct 28 02:54:07 2011 (r226874) @@ -23,6 +23,8 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #include <ctype.h> @@ -3480,7 +3482,7 @@ zfs_iter_dependents(zfs_handle_t *zhp, b * Renames the given dataset. */ int -zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive) +zfs_rename(zfs_handle_t *zhp, const char *target, renameflags_t flags) { int ret; zfs_cmd_t zc = { 0 }; @@ -3489,6 +3491,7 @@ zfs_rename(zfs_handle_t *zhp, const char zfs_handle_t *zhrp = NULL; char *parentname = NULL; char parent[ZFS_MAXNAMELEN]; + char property[ZFS_MAXPROPLEN]; libzfs_handle_t *hdl = zhp->zfs_hdl; char errbuf[1024]; @@ -3535,7 +3538,7 @@ zfs_rename(zfs_handle_t *zhp, const char if (!zfs_validate_name(hdl, target, zhp->zfs_type, B_TRUE)) return (zfs_error(hdl, EZFS_INVALIDNAME, errbuf)); } else { - if (recursive) { + if (flags.recurse) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "recursive rename must be a snapshot")); return (zfs_error(hdl, EZFS_BADTYPE, errbuf)); @@ -3576,7 +3579,20 @@ zfs_rename(zfs_handle_t *zhp, const char return (zfs_error(hdl, EZFS_ZONED, errbuf)); } - if (recursive) { + /* + * Avoid unmounting file systems with mountpoint property set to + * 'legacy' or 'none' even if -u option is not given. + */ + if (zhp->zfs_type == ZFS_TYPE_FILESYSTEM && + !flags.recurse && !flags.nounmount && + zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, property, + sizeof (property), NULL, NULL, 0, B_FALSE) == 0 && + (strcmp(property, "legacy") == 0 || + strcmp(property, "none") == 0)) { + flags.nounmount = B_TRUE; + } + + if (flags.recurse) { parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name); if (parentname == NULL) { @@ -3592,8 +3608,10 @@ zfs_rename(zfs_handle_t *zhp, const char } } else { - if ((cl = changelist_gather(zhp, ZFS_PROP_NAME, 0, 0)) == NULL) + if ((cl = changelist_gather(zhp, ZFS_PROP_NAME, + flags.nounmount ? CL_GATHER_DONT_UNMOUNT : 0, 0)) == NULL) { return (-1); + } if (changelist_haszonedchild(cl)) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, @@ -3615,7 +3633,9 @@ zfs_rename(zfs_handle_t *zhp, const char (void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name)); (void) strlcpy(zc.zc_value, target, sizeof (zc.zc_value)); - zc.zc_cookie = recursive; + zc.zc_cookie = flags.recurse ? 1 : 0; + if (flags.nounmount) + zc.zc_cookie |= 2; if ((ret = zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_RENAME, &zc)) != 0) { /* @@ -3625,7 +3645,7 @@ zfs_rename(zfs_handle_t *zhp, const char (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, "cannot rename '%s'"), zc.zc_name); - if (recursive && errno == EEXIST) { + if (flags.recurse && errno == EEXIST) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "a child dataset already has a snapshot " "with the new name")); @@ -3638,10 +3658,10 @@ zfs_rename(zfs_handle_t *zhp, const char * On failure, we still want to remount any filesystems that * were previously mounted, so we don't alter the system state. */ - if (!recursive) + if (!flags.recurse) (void) changelist_postfix(cl); } else { - if (!recursive) { + if (!flags.recurse) { changelist_rename(cl, zfs_get_name(zhp), target); ret = changelist_postfix(cl); } Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h Fri Oct 28 02:54:07 2011 (r226874) @@ -21,6 +21,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #ifndef _LIBFS_IMPL_H @@ -158,7 +160,11 @@ int zprop_expand_list(libzfs_handle_t *h * on each change node regardless of whether or not it is currently * mounted. */ -#define CL_GATHER_MOUNT_ALWAYS 1 +#define CL_GATHER_MOUNT_ALWAYS 0x01 +/* + * Use this changelist_gather() flag to prevent unmounting of file systems. + */ +#define CL_GATHER_DONT_UNMOUNT 0x02 typedef struct prop_changelist prop_changelist_t; Modified: user/attilio/vmcontention/contrib/gcc/BASE-VER ============================================================================== --- user/attilio/vmcontention/contrib/gcc/BASE-VER Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/gcc/BASE-VER Fri Oct 28 02:54:07 2011 (r226874) @@ -1 +1 @@ -4.2.2 +4.2.1 Modified: user/attilio/vmcontention/contrib/gcc/DEV-PHASE ============================================================================== --- user/attilio/vmcontention/contrib/gcc/DEV-PHASE Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/gcc/DEV-PHASE Fri Oct 28 02:54:07 2011 (r226874) @@ -1 +1 @@ -prerelease +patched Modified: user/attilio/vmcontention/contrib/tzcode/stdtime/localtime.c ============================================================================== --- user/attilio/vmcontention/contrib/tzcode/stdtime/localtime.c Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzcode/stdtime/localtime.c Fri Oct 28 02:54:07 2011 (r226874) @@ -450,6 +450,7 @@ register const int doextend; _close(fid); return -1; } + free(fullname); } u = malloc(sizeof(*u)); if (u == NULL) Modified: user/attilio/vmcontention/contrib/tzdata/asia ============================================================================== --- user/attilio/vmcontention/contrib/tzdata/asia Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzdata/asia Fri Oct 28 02:54:07 2011 (r226874) @@ -1,4 +1,4 @@ -# @(#)asia 8.68 +# @(#)asia 8.69 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: user/attilio/vmcontention/contrib/tzdata/australasia ============================================================================== --- user/attilio/vmcontention/contrib/tzdata/australasia Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzdata/australasia Fri Oct 28 02:54:07 2011 (r226874) @@ -1,5 +1,5 @@ # <pre> -# @(#)australasia 8.27 +# @(#)australasia 8.28 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: user/attilio/vmcontention/contrib/tzdata/backward ============================================================================== --- user/attilio/vmcontention/contrib/tzdata/backward Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzdata/backward Fri Oct 28 02:54:07 2011 (r226874) @@ -1,5 +1,5 @@ # <pre> -# @(#)backward 8.9 +# @(#)backward 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -67,7 +67,6 @@ Link America/Havana Cuba Link Africa/Cairo Egypt Link Europe/Dublin Eire Link Europe/London Europe/Belfast -Link Europe/Chisinau Europe/Tiraspol Link Europe/London GB Link Europe/London GB-Eire Link Etc/GMT GMT+0 Modified: user/attilio/vmcontention/contrib/tzdata/europe ============================================================================== --- user/attilio/vmcontention/contrib/tzdata/europe Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzdata/europe Fri Oct 28 02:54:07 2011 (r226874) @@ -1,5 +1,5 @@ # <pre> -# @(#)europe 8.38 +# @(#)europe 8.39 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1655,6 +1655,29 @@ Zone Europe/Malta 0:58:04 - LMT 1893 Nov # But [two people] separately reported via # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau. # The Tiraspol entry has therefore been removed for now. +# +# From Alexander Krivenyshev (2011-10-17): +# Pridnestrovian Moldavian Republic (PMR, also known as +# "Pridnestrovie") has abolished seasonal clock change (no transition +# to the Winter Time). +# +# News (in Russian): +# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">; +# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html +# </a> +# +# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">; +# http://www.allmoldova.com/moldova-news/1249064116.html +# </a> +# +# The substance of this change (reinstatement of the Tiraspol entry) +# is from a patch from Petr Machata (2011-10-17) +# +# From Tim Parenti (2011-10-19) +# In addition, being situated at +4651+2938 would give Tiraspol +# a pre-1880 LMT offset of 1:58:32. +# +# (which agrees with the earlier entry that had been removed) # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Chisinau 1:55:20 - LMT 1880 @@ -1671,6 +1694,21 @@ Zone Europe/Chisinau 1:55:20 - LMT 1880 # See Romania commentary for the guessed 1997 transition to EU rules. 2:00 EU EE%sT +Zone Europe/Tiraspol 1:58:32 - LMT 1880 + 1:55 - CMT 1918 Feb 15 # Chisinau MT + 1:44:24 - BMT 1931 Jul 24 # Bucharest MT + 2:00 Romania EE%sT 1940 Aug 15 + 2:00 1:00 EEST 1941 Jul 17 + 1:00 C-Eur CE%sT 1944 Aug 24 + 3:00 Russia MSK/MSD 1990 + 3:00 - MSK 1990 May 6 + 2:00 - EET 1991 + 2:00 Russia EE%sT 1992 + 2:00 E-Eur EE%sT 1997 +# See Romania commentary for the guessed 1997 transition to EU rules. + 2:00 EU EE%sT 2011 Mar lastSun 1:00u + 3:00 - FET # Further-eastern European Time + # Monaco # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. @@ -2651,6 +2689,28 @@ Link Europe/Istanbul Asia/Istanbul # Ist # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">; # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/ # </a> +# +# From Philip Pizzey (2011-10-18): +# Today my Ukrainian colleagues have informed me that the +# Ukrainian parliament have decided that they will go to winter +# time this year after all. +# +# From Udo Schwedt (2011-10-18): +# As far as I understand, the recent change to the Ukranian time zone +# (Europe/Kiev) to introduce permanent daylight saving time (similar +# to Russia) was reverted today: +# +# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">; +# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995 +# </a> +# +# Also reported by Alexander Bokovoy (2011-10-18) who also noted: +# The law documents themselves are at +# +# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">; +# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484 +# </a> + # Zone NAME GMTOFF RULES FORMAT [UNTIL] # Most of Ukraine since 1970 has been like Kiev. @@ -2665,8 +2725,7 @@ Zone Europe/Kiev 2:02:04 - LMT 1880 3:00 - MSK 1990 Jul 1 2:00 2:00 - EET 1992 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Ruthenia used CET 1990/1991. # "Uzhhorod" is the transliteration of the Ukrainian name, but # "Uzhgorod" is more common in English. @@ -2680,8 +2739,7 @@ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 1:00 - CET 1991 Mar 31 3:00 2:00 - EET 1992 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. # "Zaporizhia" is the transliteration of the Ukrainian name, but # "Zaporozh'ye" is more common in English. Use the common English @@ -2694,8 +2752,7 @@ Zone Europe/Zaporozhye 2:20:40 - LMT 188 1:00 C-Eur CE%sT 1943 Oct 25 3:00 Russia MSK/MSD 1991 Mar 31 2:00 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Central Crimea used Moscow time 1994/1997. Zone Europe/Simferopol 2:16:24 - LMT 1880 2:16 - SMT 1924 May 2 # Simferopol Mean T @@ -2720,8 +2777,7 @@ Zone Europe/Simferopol 2:16:24 - LMT 188 # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT ############################################################################### Modified: user/attilio/vmcontention/contrib/tzdata/northamerica ============================================================================== --- user/attilio/vmcontention/contrib/tzdata/northamerica Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzdata/northamerica Fri Oct 28 02:54:07 2011 (r226874) @@ -1,5 +1,5 @@ # <pre> -# @(#)northamerica 8.49 +# @(#)northamerica 8.50 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: user/attilio/vmcontention/contrib/tzdata/southamerica ============================================================================== --- user/attilio/vmcontention/contrib/tzdata/southamerica Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzdata/southamerica Fri Oct 28 02:54:07 2011 (r226874) @@ -1,5 +1,5 @@ # <pre> -# @(#)southamerica 8.50 +# @(#)southamerica 8.52 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -818,6 +818,19 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # oficial agency about time in Brazil, and she confirmed that the old rule is # still in force. +# From Guilherme Bernardes Rodrigues (2011-10-14) +# It's official, the President signed a decree that includes Bahia in summer +# time. +# [ and in a second message (same day): ] +# I found the decree. +# +# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011 +# Link : +# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">; +# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6 +# </a> + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a>; (1931-10-01) # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a>; (1932-01-10) @@ -1054,10 +1067,8 @@ Zone America/Maceio -2:22:52 - LMT 1914 # of America/Salvador. Zone America/Bahia -2:34:04 - LMT 1914 -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT -# as noted above, not yet in operation. -# -3:00 - BRT 2011 Oct 16 -# -3:00 Brazil BR%sT + -3:00 - BRT 2011 Oct 16 + -3:00 Brazil BR%sT # # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), Modified: user/attilio/vmcontention/contrib/tzdata/zone.tab ============================================================================== --- user/attilio/vmcontention/contrib/tzdata/zone.tab Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/contrib/tzdata/zone.tab Fri Oct 28 02:54:07 2011 (r226874) @@ -1,5 +1,5 @@ # <pre> -# @(#)zone.tab 8.49 +# @(#)zone.tab 8.50 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -257,7 +257,8 @@ LV +5657+02406 Europe/Riga LY +3254+01311 Africa/Tripoli MA +3339-00735 Africa/Casablanca MC +4342+00723 Europe/Monaco -MD +4700+02850 Europe/Chisinau +MD +4700+02850 Europe/Chisinau most locations +MD +4651+02938 Europe/Tiraspol Pridnestrovie ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo Modified: user/attilio/vmcontention/etc/defaults/periodic.conf ============================================================================== --- user/attilio/vmcontention/etc/defaults/periodic.conf Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/etc/defaults/periodic.conf Fri Oct 28 02:54:07 2011 (r226874) @@ -150,8 +150,8 @@ daily_submit_queuerun="YES" # Also su # 800.scrub-zfs daily_scrub_zfs_enable="NO" daily_scrub_zfs_pools="" # empty string selects all pools -daily_scrub_zfs_default_threshold="30" # days between scrubs -#daily_scrub_zfs_${poolname}_threshold="30" # pool specific threshold +daily_scrub_zfs_default_threshold="35" # days between scrubs +#daily_scrub_zfs_${poolname}_threshold="35" # pool specific threshold # 999.local daily_local="/etc/daily.local" # Local scripts Modified: user/attilio/vmcontention/etc/devd.conf ============================================================================== --- user/attilio/vmcontention/etc/devd.conf Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/etc/devd.conf Fri Oct 28 02:54:07 2011 (r226874) @@ -38,6 +38,7 @@ options { # notify 0 { match "system" "IFNET"; + match "subsystem" "!usbus[0-9]+"; match "type" "ATTACH"; action "/etc/pccard_ether $subsystem start"; }; Modified: user/attilio/vmcontention/etc/devfs.conf ============================================================================== --- user/attilio/vmcontention/etc/devfs.conf Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/etc/devfs.conf Fri Oct 28 02:54:07 2011 (r226874) @@ -31,11 +31,9 @@ # # Examples: -# Historically X depended on this, but version 4.3.0 doesn't seem to anymore -#link ttyv0 vga - # Commonly used by many ports -#link acd0 cdrom +#link cd0 cdrom +#link cd0 dvd # Allow a user in the wheel group to query the smb0 device #perm smb0 0660 Modified: user/attilio/vmcontention/etc/periodic/daily/800.scrub-zfs ============================================================================== --- user/attilio/vmcontention/etc/periodic/daily/800.scrub-zfs Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/etc/periodic/daily/800.scrub-zfs Fri Oct 28 02:54:07 2011 (r226874) @@ -15,7 +15,7 @@ then source_periodic_confs fi -: ${daily_scrub_zfs_default_threshold=30} +: ${daily_scrub_zfs_default_threshold=35} case "$daily_scrub_zfs_enable" in [Yy][Ee][Ss]) Modified: user/attilio/vmcontention/gnu/usr.bin/cc/Makefile.ver ============================================================================== --- user/attilio/vmcontention/gnu/usr.bin/cc/Makefile.ver Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/gnu/usr.bin/cc/Makefile.ver Fri Oct 28 02:54:07 2011 (r226874) @@ -4,7 +4,7 @@ BASEVER!= cat ${GCCDIR}/BASE-VER DATESTAMP!= cat ${GCCDIR}/DATESTAMP DEVPHASE!= cat ${GCCDIR}/DEV-PHASE -version.o: version.c +version.o: version.c ${GCCDIR}/BASE-VER ${GCCDIR}/DATESTAMP ${GCCDIR}/DEV-PHASE ${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \ -DDATESTAMP=\"\ ${DATESTAMP}\" \ -DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC} Modified: user/attilio/vmcontention/lib/libc/gen/getutxent.3 ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/getutxent.3 Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/lib/libc/gen/getutxent.3 Fri Oct 28 02:54:07 2011 (r226874) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 19, 2011 +.Dd October 27, 2011 .Dt GETUTXENT 3 .Os .Sh NAME @@ -301,7 +301,6 @@ The value of determines which databases are modified. .Pp Entries of type -.Dv BOOT_TIME , .Dv SHUTDOWN_TIME , .Dv OLD_TIME and @@ -335,7 +334,7 @@ In addition, entries of type .Dv BOOT_TIME and .Dv SHUTDOWN_TIME -will cause all entries in +will cause all existing entries in .Pa /var/run/utx.active to be discarded. .Pp @@ -386,10 +385,10 @@ Otherwise, -1 is returned and the global is set to indicate the error. .Sh ERRORS In addition to the error conditions described in +.Xr open 2 , .Xr fdopen 3 , .Xr fopen 3 , .Xr fseek 3 , -.Xr open 3 , the .Fn pututxline function can generate the following errors: Modified: user/attilio/vmcontention/lib/libc/gen/pututxline.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/pututxline.c Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/lib/libc/gen/pututxline.c Fri Oct 28 02:54:07 2011 (r226874) @@ -86,6 +86,9 @@ utx_active_add(const struct futx *fu) return (-1); while (fread(&fe, sizeof(fe), 1, fp) == 1) { switch (fe.fu_type) { + case BOOT_TIME: + /* Leave these intact. */ + break; case USER_PROCESS: case INIT_PROCESS: case LOGIN_PROCESS: @@ -171,6 +174,19 @@ utx_active_remove(struct futx *fu) } static void +utx_active_init(const struct futx *fu) +{ + int fd; + + /* Initialize utx.active with a single BOOT_TIME record. */ + fd = _open(_PATH_UTX_ACTIVE, O_CREAT|O_RDWR|O_TRUNC, 0644); + if (fd < 0) + return; + _write(fd, fu, sizeof(*fu)); + _close(fd); +} + +static void utx_active_purge(void) { @@ -277,9 +293,11 @@ pututxline(const struct utmpx *utmpx) switch (fu.fu_type) { case BOOT_TIME: + utx_active_init(&fu); + utx_lastlogin_upgrade(); + break; case SHUTDOWN_TIME: utx_active_purge(); - utx_lastlogin_upgrade(); break; case OLD_TIME: case NEW_TIME: Modified: user/attilio/vmcontention/lib/libc/sys/timer_create.2 ============================================================================== --- user/attilio/vmcontention/lib/libc/sys/timer_create.2 Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/lib/libc/sys/timer_create.2 Fri Oct 28 02:54:07 2011 (r226874) @@ -151,7 +151,7 @@ memory protection fault. .Sh SEE ALSO .Xr clock_getres 2 , .Xr timer_delete 2 , -.Xr timer_getoverun 2 , +.Xr timer_getoverrun 2 , .Xr siginfo 3 .Sh STANDARDS The Modified: user/attilio/vmcontention/sbin/devd/devd.cc ============================================================================== --- user/attilio/vmcontention/sbin/devd/devd.cc Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/sbin/devd/devd.cc Fri Oct 28 02:54:07 2011 (r226874) @@ -251,7 +251,14 @@ match::match(config &c, const char *var, : _var(var) { _re = "^"; - _re.append(c.expand_string(string(re))); + if (!c.expand_string(string(re)).empty() && + c.expand_string(string(re)).at(0) == '!') { + _re.append(c.expand_string(string(re)).substr(1)); + _inv = 1; + } else { + _re.append(c.expand_string(string(re))); + _inv = 0; + } _re.append("$"); regcomp(&_regex, _re.c_str(), REG_EXTENDED | REG_NOSUB | REG_ICASE); } @@ -268,10 +275,13 @@ match::do_match(config &c) bool retval; if (Dflag) - fprintf(stderr, "Testing %s=%s against %s\n", _var.c_str(), - value.c_str(), _re.c_str()); + fprintf(stderr, "Testing %s=%s against %s, invert=%d\n", + _var.c_str(), value.c_str(), _re.c_str(), _inv); retval = (regexec(&_regex, value.c_str(), 0, NULL, 0) == 0); + if (_inv == 1) + retval = (retval == 0) ? 1 : 0; + return retval; } Modified: user/attilio/vmcontention/sbin/devd/devd.conf.5 ============================================================================== --- user/attilio/vmcontention/sbin/devd/devd.conf.5 Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/sbin/devd/devd.conf.5 Fri Oct 28 02:54:07 2011 (r226874) @@ -41,7 +41,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.Dd March 8, 2009 +.Dd October 25, 2011 .Dt DEVD.CONF 5 .Os .Sh NAME @@ -121,6 +121,10 @@ Creates a regular expression and assigns .Ar regexp-name . The variable is available throughout the rest of the configuration file. +If the string begins with +.Ql \&! , +it matches if the regular expression formed by the rest of the string +does not match. All regular expressions have an implicit .Ql ^$ around them. Modified: user/attilio/vmcontention/sbin/devd/devd.hh ============================================================================== --- user/attilio/vmcontention/sbin/devd/devd.hh Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/sbin/devd/devd.hh Fri Oct 28 02:54:07 2011 (r226874) @@ -92,6 +92,7 @@ public: private: std::string _var; std::string _re; + bool _inv; regex_t _regex; }; Modified: user/attilio/vmcontention/sbin/fsck/fsck.8 ============================================================================== --- user/attilio/vmcontention/sbin/fsck/fsck.8 Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/sbin/fsck/fsck.8 Fri Oct 28 02:54:07 2011 (r226874) @@ -41,6 +41,7 @@ .Op Fl B | F .Op Fl T Ar fstype : Ns Ar fsoptions .Op Fl t Ar fstype +.Op Fl c Ar fstab .Oo Ar special | node Oc ... .Sh DESCRIPTION The @@ -117,6 +118,10 @@ Check if the .Dq clean flag is set in the superblock and skip file system checks if file system was properly dismounted and marked clean. +.It Fl c Ar fstab +Specify the +.Pa fstab +file to use. .It Fl d Debugging mode. Just print the commands without executing them. Modified: user/attilio/vmcontention/sbin/fsck/fsck.c ============================================================================== --- user/attilio/vmcontention/sbin/fsck/fsck.c Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/sbin/fsck/fsck.c Fri Oct 28 02:54:07 2011 (r226874) @@ -96,6 +96,7 @@ main(int argc, char *argv[]) int i, rval = 0; const char *vfstype = NULL; char globopt[3]; + const char *etc_fstab; globopt[0] = '-'; globopt[2] = '\0'; @@ -103,7 +104,8 @@ main(int argc, char *argv[]) TAILQ_INIT(&selhead); TAILQ_INIT(&opthead); - while ((i = getopt(argc, argv, "BCdvpfFnyl:t:T:")) != -1) + etc_fstab = NULL; + while ((i = getopt(argc, argv, "BCdvpfFnyl:t:T:c:")) != -1) switch (i) { case 'B': if (flags & CHECK_BACKGRD) @@ -160,6 +162,10 @@ main(int argc, char *argv[]) vfstype = optarg; break; + case 'c': + etc_fstab = optarg; + break; + case '?': default: usage(); @@ -169,6 +175,9 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + if (etc_fstab != NULL) + setfstab(etc_fstab); + if (argc == 0) return checkfstab(flags, isok, checkfs); @@ -571,7 +580,7 @@ static void usage(void) { static const char common[] = - "[-Cdfnpvy] [-B | -F] [-T fstype:fsoptions] [-t fstype]"; + "[-Cdfnpvy] [-B | -F] [-T fstype:fsoptions] [-t fstype] [-c fstab]"; (void)fprintf(stderr, "usage: %s %s [special | node] ...\n", getprogname(), common); Modified: user/attilio/vmcontention/sbin/geom/class/eli/geli.8 ============================================================================== --- user/attilio/vmcontention/sbin/geom/class/eli/geli.8 Fri Oct 28 01:56:36 2011 (r226873) +++ user/attilio/vmcontention/sbin/geom/class/eli/geli.8 Fri Oct 28 02:54:07 2011 (r226874) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 9, 2011 +.Dd October 25, 2011 .Dt GELI 8 .Os .Sh NAME @@ -60,6 +60,7 @@ utility: .Op Fl K Ar newkeyfile .Op Fl l Ar keylen .Op Fl s Ar sectorsize +.Op Fl V Ar version .Ar prov .Nm .Cm label - an alias for @@ -134,6 +135,9 @@ utility: .Fl s Ar oldsize .Ar prov .Nm +.Cm version +.Op Ar prov ... +.Nm .Cm clear .Op Fl v .Ar prov ... @@ -319,6 +323,15 @@ Change decrypted provider's sector size. Increasing sector size allows to increase performance, because we need to generate an IV and do encrypt/decrypt for every single sector - less number of sectors means less work to do. +.It Fl V Ar version +Metadata version to use. +This option is helpful when creating provider that may be used by older +.Nm FreeBSD/GELI +versions. +Consult the +.Sx HISTORY +section to find which metadata version is supported by which FreeBSD version. +Note that using older metadata version may limit numer of features available. .El .It Cm attach Attach the given provider. @@ -597,6 +610,18 @@ Additional options include: .It Fl s Ar oldsize The size of the provider before it was resized. .El +.It Cm version +If no arguments are given, the +.Cm version +subcommand will print the version of +.Nm +userland utility as well as the version of the +.Nm ELI +GEOM class. +.Pp +If GEOM providers are specified, the +.Cm version +subcommand will print metadata version used by each of them. .It Cm clear Clear metadata from the given providers. .It Cm dump @@ -916,5 +941,33 @@ Support for .Nm Camellia block cipher is implemented by Yoshisato Yanagisawa in .Fx 7.0 . +.Pp +Highest +.Nm GELI +metadata version supported by the given FreeBSD version: +.Pp +.Bl -column -offset indent ".Sy FreeBSD" ".Sy version" +.It Sy FreeBSD Ta Sy GELI +.It Sy version Ta Sy version +.Pp +.It Li 6.0 Ta 0 +.It Li 6.1 Ta 0 +.It Li 6.2 Ta 3 +.It Li 6.3 Ta 3 +.It Li 6.4 Ta 3 +.Pp +.It Li 7.0 Ta 3 +.It Li 7.1 Ta 3 +.It Li 7.2 Ta 3 +.It Li 7.3 Ta 3 +.It Li 7.4 Ta 3 +.Pp +.It Li 8.0 Ta 3 +.It Li 8.1 Ta 3 +.It Li 8.2 Ta 5 +.Pp +.It Li 9.0 Ta 6 +.El *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110280254.p9S2s8M9038012>