[PATCH][YAKKETY][ZESTY] UBUNTU: SAUCE: (noup) Update spl to 0.6.5.8-2, zfs to 0.6.5.8-0ubuntu4 (LP: #1635656)
Colin Ian King
colin.king at canonical.com
Fri Oct 21 15:37:36 UTC 2016
oops, forgot buglink, sending V2.
On 21/10/16 16:35, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> SPL (spl-linux) is currently now sync'd to the Debian package 0.6.5.8-2
> and ZFS (zfsutils-linux) has been updated to -0ubuntu4, so sync these
> changes to yakkety as a SRU.
>
> Changes to the kernel are minimal, just to spl/module/spl/spl-generic.c,
> where a redundant (and somewhat alarming) warning message has been
> removed. The changes are mainly in the zfsutils-linux and spl-linux
> packaging, so this update is minimal so the regression potential is tiny.
> Other than that, the changes are just to do with the autotools config
> scripts.
>
> Tested against the kernel-team autotest-client-tests ZFS
> regression tests.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
> spl/META | 2 +-
> spl/Makefile.am | 2 +-
> spl/Makefile.in | 4 +-
> spl/config/config.guess | 111 +++++++++++++++++++++-----------------
> spl/config/config.sub | 20 +++----
> spl/dkms.conf | 2 +-
> spl/module/spl/spl-generic.c | 6 +--
> zfs/META | 2 +-
> zfs/config/config.guess | 111 +++++++++++++++++++++-----------------
> zfs/config/config.sub | 20 +++----
> zfs/contrib/initramfs/scripts/zfs | 7 ++-
> 11 files changed, 156 insertions(+), 131 deletions(-)
>
> diff --git a/spl/META b/spl/META
> index 416d8a8..59fa607 100644
> --- a/spl/META
> +++ b/spl/META
> @@ -2,7 +2,7 @@ Meta: 1
> Name: spl
> Branch: 1.0
> Version: 0.6.5.8
> -Release: 0ubuntu1
> +Release: 2
> Release-Tags: relext
> License: GPL
> Author: OpenZFS on Linux
> diff --git a/spl/Makefile.am b/spl/Makefile.am
> index 89950ed..4977448 100644
> --- a/spl/Makefile.am
> +++ b/spl/Makefile.am
> @@ -20,7 +20,7 @@ nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
> endif
>
> AUTOMAKE_OPTIONS = foreign
> -EXTRA_DIST = autogen.sh META DISCLAIMER copy-builtin COPYING
> +EXTRA_DIST = autogen.sh META DISCLAIMER copy-builtin
> EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
>
> distclean-local::
> diff --git a/spl/Makefile.in b/spl/Makefile.in
> index 7632a36..c451112 100644
> --- a/spl/Makefile.in
> +++ b/spl/Makefile.in
> @@ -464,8 +464,8 @@ SUBDIRS = include rpm $(am__append_1) $(am__append_2)
> @CONFIG_KERNEL_TRUE at kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
> @CONFIG_KERNEL_TRUE at nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
> AUTOMAKE_OPTIONS = foreign
> -EXTRA_DIST = autogen.sh META DISCLAIMER copy-builtin COPYING \
> - config/config.awk config/rpm.am config/deb.am config/tgz.am
> +EXTRA_DIST = autogen.sh META DISCLAIMER copy-builtin config/config.awk \
> + config/rpm.am config/deb.am config/tgz.am
> all: spl_config.h
> $(MAKE) $(AM_MAKEFLAGS) all-recursive
>
> diff --git a/spl/config/config.guess b/spl/config/config.guess
> index 1659250..0967f2a 100755
> --- a/spl/config/config.guess
> +++ b/spl/config/config.guess
> @@ -1,8 +1,8 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> -# Copyright 1992-2015 Free Software Foundation, Inc.
> +# Copyright 1992-2016 Free Software Foundation, Inc.
>
> -timestamp='2015-08-20'
> +timestamp='2016-04-02'
>
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
> @@ -27,7 +27,7 @@ timestamp='2015-08-20'
> # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
> #
> # You can get the latest version of this script from:
> -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
> #
> # Please send patches to <config-patches at gnu.org>.
>
> @@ -50,7 +50,7 @@ version="\
> GNU config.guess ($timestamp)
>
> Originally written by Per Bothner.
> -Copyright 1992-2015 Free Software Foundation, Inc.
> +Copyright 1992-2016 Free Software Foundation, Inc.
>
> This is free software; see the source for copying conditions. There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
> @@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
> echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
> exit ;;
> + *:LibertyBSD:*:*)
> + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
> + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
> + exit ;;
> *:ekkoBSD:*:*)
> echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> exit ;;
> @@ -268,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
> case "$ALPHA_CPU_TYPE" in
> "EV4 (21064)")
> - UNAME_MACHINE="alpha" ;;
> + UNAME_MACHINE=alpha ;;
> "EV4.5 (21064)")
> - UNAME_MACHINE="alpha" ;;
> + UNAME_MACHINE=alpha ;;
> "LCA4 (21066/21068)")
> - UNAME_MACHINE="alpha" ;;
> + UNAME_MACHINE=alpha ;;
> "EV5 (21164)")
> - UNAME_MACHINE="alphaev5" ;;
> + UNAME_MACHINE=alphaev5 ;;
> "EV5.6 (21164A)")
> - UNAME_MACHINE="alphaev56" ;;
> + UNAME_MACHINE=alphaev56 ;;
> "EV5.6 (21164PC)")
> - UNAME_MACHINE="alphapca56" ;;
> + UNAME_MACHINE=alphapca56 ;;
> "EV5.7 (21164PC)")
> - UNAME_MACHINE="alphapca57" ;;
> + UNAME_MACHINE=alphapca57 ;;
> "EV6 (21264)")
> - UNAME_MACHINE="alphaev6" ;;
> + UNAME_MACHINE=alphaev6 ;;
> "EV6.7 (21264A)")
> - UNAME_MACHINE="alphaev67" ;;
> + UNAME_MACHINE=alphaev67 ;;
> "EV6.8CB (21264C)")
> - UNAME_MACHINE="alphaev68" ;;
> + UNAME_MACHINE=alphaev68 ;;
> "EV6.8AL (21264B)")
> - UNAME_MACHINE="alphaev68" ;;
> + UNAME_MACHINE=alphaev68 ;;
> "EV6.8CX (21264D)")
> - UNAME_MACHINE="alphaev68" ;;
> + UNAME_MACHINE=alphaev68 ;;
> "EV6.9A (21264/EV69A)")
> - UNAME_MACHINE="alphaev69" ;;
> + UNAME_MACHINE=alphaev69 ;;
> "EV7 (21364)")
> - UNAME_MACHINE="alphaev7" ;;
> + UNAME_MACHINE=alphaev7 ;;
> "EV7.9 (21364A)")
> - UNAME_MACHINE="alphaev79" ;;
> + UNAME_MACHINE=alphaev79 ;;
> esac
> # A Pn.n version is a patched version.
> # A Vn.n version is a released version.
> # A Tn.n version is a released field test version.
> # A Xn.n version is an unreleased experimental baselevel.
> # 1.2 uses "1.2" for uname -r.
> - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
> # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
> exitcode=$?
> trap '' 0
> @@ -376,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> exit ;;
> i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
> eval $set_cc_for_build
> - SUN_ARCH="i386"
> + SUN_ARCH=i386
> # If there is a compiler, see if it is configured for 64-bit objects.
> # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
> # This test works for both compilers.
> - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
> + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
> if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
> - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
> + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
> grep IS_64BIT_ARCH >/dev/null
> then
> - SUN_ARCH="x86_64"
> + SUN_ARCH=x86_64
> fi
> fi
> echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> @@ -410,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> exit ;;
> sun*:*:4.2BSD:*)
> UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
> - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
> + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
> case "`/bin/arch`" in
> sun3)
> echo m68k-sun-sunos${UNAME_RELEASE}
> @@ -635,13 +639,13 @@ EOF
> sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
> sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
> case "${sc_cpu_version}" in
> - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
> - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
> + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
> + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
> 532) # CPU_PA_RISC2_0
> case "${sc_kernel_bits}" in
> - 32) HP_ARCH="hppa2.0n" ;;
> - 64) HP_ARCH="hppa2.0w" ;;
> - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
> + 32) HP_ARCH=hppa2.0n ;;
> + 64) HP_ARCH=hppa2.0w ;;
> + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
> esac ;;
> esac
> fi
> @@ -680,11 +684,11 @@ EOF
> exit (0);
> }
> EOF
> - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
> + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
> test -z "$HP_ARCH" && HP_ARCH=hppa
> fi ;;
> esac
> - if [ ${HP_ARCH} = "hppa2.0w" ]
> + if [ ${HP_ARCH} = hppa2.0w ]
> then
> eval $set_cc_for_build
>
> @@ -697,12 +701,12 @@ EOF
> # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
> # => hppa64-hp-hpux11.23
>
> - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
> + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
> grep -q __LP64__
> then
> - HP_ARCH="hppa2.0w"
> + HP_ARCH=hppa2.0w
> else
> - HP_ARCH="hppa64"
> + HP_ARCH=hppa64
> fi
> fi
> echo ${HP_ARCH}-hp-hpux${HPUX_REV}
> @@ -807,14 +811,14 @@ EOF
> echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> exit ;;
> F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
> - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
> + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
> + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
> FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
> echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
> exit ;;
> 5000:UNIX_System_V:4.*:*)
> - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
> - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
> + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
> + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
> echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
> exit ;;
> i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
> @@ -896,7 +900,7 @@ EOF
> exit ;;
> *:GNU/*:*:*)
> # other systems with GNU libc and userland
> - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
> + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
> exit ;;
> i*86:Minix:*:*)
> echo ${UNAME_MACHINE}-pc-minix
> @@ -919,7 +923,7 @@ EOF
> EV68*) UNAME_MACHINE=alphaev68 ;;
> esac
> objdump --private-headers /bin/sh | grep -q ld.so.1
> - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
> + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
> arc:Linux:*:* | arceb:Linux:*:*)
> @@ -965,6 +969,9 @@ EOF
> ia64:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
> + k1om:Linux:*:*)
> + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> + exit ;;
> m32r*:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
> @@ -1120,7 +1127,7 @@ EOF
> # uname -m prints for DJGPP always 'pc', but it prints nothing about
> # the processor, so we play safe by assuming i586.
> # Note: whatever this is, it MUST be the same as what config.sub
> - # prints for the "djgpp" host, or else GDB configury will decide that
> + # prints for the "djgpp" host, or else GDB configure will decide that
> # this is a cross-build.
> echo i586-pc-msdosdjgpp
> exit ;;
> @@ -1269,6 +1276,9 @@ EOF
> SX-8R:SUPER-UX:*:*)
> echo sx8r-nec-superux${UNAME_RELEASE}
> exit ;;
> + SX-ACE:SUPER-UX:*:*)
> + echo sxace-nec-superux${UNAME_RELEASE}
> + exit ;;
> Power*:Rhapsody:*:*)
> echo powerpc-apple-rhapsody${UNAME_RELEASE}
> exit ;;
> @@ -1282,9 +1292,9 @@ EOF
> UNAME_PROCESSOR=powerpc
> fi
> if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
> - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
> + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
> if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
> - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
> + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
> grep IS_64BIT_ARCH >/dev/null
> then
> case $UNAME_PROCESSOR in
> @@ -1306,7 +1316,7 @@ EOF
> exit ;;
> *:procnto*:*:* | *:QNX:[0123456789]*:*)
> UNAME_PROCESSOR=`uname -p`
> - if test "$UNAME_PROCESSOR" = "x86"; then
> + if test "$UNAME_PROCESSOR" = x86; then
> UNAME_PROCESSOR=i386
> UNAME_MACHINE=pc
> fi
> @@ -1337,7 +1347,7 @@ EOF
> # "uname -m" is not consistent, so use $cputype instead. 386
> # is converted to i386 for consistency with other x86
> # operating systems.
> - if test "$cputype" = "386"; then
> + if test "$cputype" = 386; then
> UNAME_MACHINE=i386
> else
> UNAME_MACHINE="$cputype"
> @@ -1379,7 +1389,7 @@ EOF
> echo i386-pc-xenix
> exit ;;
> i*86:skyos:*:*)
> - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
> exit ;;
> i*86:rdos:*:*)
> echo ${UNAME_MACHINE}-pc-rdos
> @@ -1390,6 +1400,9 @@ EOF
> x86_64:VMkernel:*:*)
> echo ${UNAME_MACHINE}-unknown-esx
> exit ;;
> + amd64:Isilon\ OneFS:*:*)
> + echo x86_64-unknown-onefs
> + exit ;;
> esac
>
> cat >&2 <<EOF
> @@ -1399,9 +1412,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
>
> - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
> and
> - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
>
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
> diff --git a/spl/config/config.sub b/spl/config/config.sub
> index 1acc966..8d39c4b 100755
> --- a/spl/config/config.sub
> +++ b/spl/config/config.sub
> @@ -1,8 +1,8 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> -# Copyright 1992-2015 Free Software Foundation, Inc.
> +# Copyright 1992-2016 Free Software Foundation, Inc.
>
> -timestamp='2015-08-20'
> +timestamp='2016-03-30'
>
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
> @@ -33,7 +33,7 @@ timestamp='2015-08-20'
> # Otherwise, we print the canonical config type on stdout and succeed.
>
> # You can get the latest version of this script from:
> -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
>
> # This file is supposed to be the same for all GNU packages
> # and recognize all the CPU types, system types and aliases
> @@ -53,8 +53,7 @@ timestamp='2015-08-20'
> me=`echo "$0" | sed -e 's,.*/,,'`
>
> usage="\
> -Usage: $0 [OPTION] CPU-MFR-OPSYS
> - $0 [OPTION] ALIAS
> +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
>
> Canonicalize a configuration name.
>
> @@ -68,7 +67,7 @@ Report bugs and patches to <config-patches at gnu.org>."
> version="\
> GNU config.sub ($timestamp)
>
> -Copyright 1992-2015 Free Software Foundation, Inc.
> +Copyright 1992-2016 Free Software Foundation, Inc.
>
> This is free software; see the source for copying conditions. There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
> @@ -521,7 +520,7 @@ case $basic_machine in
> basic_machine=i386-pc
> os=-aros
> ;;
> - asmjs)
> + asmjs)
> basic_machine=asmjs-unknown
> ;;
> aux)
> @@ -1383,7 +1382,7 @@ case $os in
> | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
> | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
> - | -bitrig* | -openbsd* | -solidbsd* \
> + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
> | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> @@ -1399,7 +1398,8 @@ case $os in
> | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
> - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
> + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
> + | -onefs* | -tirtos*)
> # Remember, each alternative MUST END IN *, to match a version number.
> ;;
> -qnx*)
> @@ -1531,6 +1531,8 @@ case $os in
> ;;
> -nacl*)
> ;;
> + -ios)
> + ;;
> -none)
> ;;
> *)
> diff --git a/spl/dkms.conf b/spl/dkms.conf
> index 01842af..6fec30d 100644
> --- a/spl/dkms.conf
> +++ b/spl/dkms.conf
> @@ -20,7 +20,7 @@ PRE_BUILD="configure
> esac)
> --with-linux-obj=${kernel_source_dir}
> "
> -POST_INSTALL="cp
> +POST_BUILD="cp
> ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/spl_config.h
> ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/module/Module.symvers
> ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/${kernelver}/${arch}/
> diff --git a/spl/module/spl/spl-generic.c b/spl/module/spl/spl-generic.c
> index f87b7b9..4d9846c 100644
> --- a/spl/module/spl/spl-generic.c
> +++ b/spl/module/spl/spl-generic.c
> @@ -416,12 +416,8 @@ hostid_read(void)
>
> file = kobj_open_file(spl_hostid_path);
>
> - if (file == (struct _buf *)-1) {
> - printk(KERN_WARNING
> - "SPL: The %s file is not found.\n",
> - spl_hostid_path);
> + if (file == (struct _buf *)-1)
> return -1;
> - }
>
> result = kobj_get_filesize(file, &size);
>
> diff --git a/zfs/META b/zfs/META
> index d4e82c2..3b399cc 100644
> --- a/zfs/META
> +++ b/zfs/META
> @@ -2,7 +2,7 @@ Meta: 1
> Name: zfs
> Branch: 1.0
> Version: 0.6.5.8
> -Release: 0ubuntu1
> +Release: 0ubuntu4
> Release-Tags: relext
> License: CDDL
> Author: OpenZFS on Linux
> diff --git a/zfs/config/config.guess b/zfs/config/config.guess
> index 1659250..0967f2a 100755
> --- a/zfs/config/config.guess
> +++ b/zfs/config/config.guess
> @@ -1,8 +1,8 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> -# Copyright 1992-2015 Free Software Foundation, Inc.
> +# Copyright 1992-2016 Free Software Foundation, Inc.
>
> -timestamp='2015-08-20'
> +timestamp='2016-04-02'
>
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
> @@ -27,7 +27,7 @@ timestamp='2015-08-20'
> # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
> #
> # You can get the latest version of this script from:
> -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
> #
> # Please send patches to <config-patches at gnu.org>.
>
> @@ -50,7 +50,7 @@ version="\
> GNU config.guess ($timestamp)
>
> Originally written by Per Bothner.
> -Copyright 1992-2015 Free Software Foundation, Inc.
> +Copyright 1992-2016 Free Software Foundation, Inc.
>
> This is free software; see the source for copying conditions. There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
> @@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
> echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
> exit ;;
> + *:LibertyBSD:*:*)
> + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
> + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
> + exit ;;
> *:ekkoBSD:*:*)
> echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> exit ;;
> @@ -268,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
> case "$ALPHA_CPU_TYPE" in
> "EV4 (21064)")
> - UNAME_MACHINE="alpha" ;;
> + UNAME_MACHINE=alpha ;;
> "EV4.5 (21064)")
> - UNAME_MACHINE="alpha" ;;
> + UNAME_MACHINE=alpha ;;
> "LCA4 (21066/21068)")
> - UNAME_MACHINE="alpha" ;;
> + UNAME_MACHINE=alpha ;;
> "EV5 (21164)")
> - UNAME_MACHINE="alphaev5" ;;
> + UNAME_MACHINE=alphaev5 ;;
> "EV5.6 (21164A)")
> - UNAME_MACHINE="alphaev56" ;;
> + UNAME_MACHINE=alphaev56 ;;
> "EV5.6 (21164PC)")
> - UNAME_MACHINE="alphapca56" ;;
> + UNAME_MACHINE=alphapca56 ;;
> "EV5.7 (21164PC)")
> - UNAME_MACHINE="alphapca57" ;;
> + UNAME_MACHINE=alphapca57 ;;
> "EV6 (21264)")
> - UNAME_MACHINE="alphaev6" ;;
> + UNAME_MACHINE=alphaev6 ;;
> "EV6.7 (21264A)")
> - UNAME_MACHINE="alphaev67" ;;
> + UNAME_MACHINE=alphaev67 ;;
> "EV6.8CB (21264C)")
> - UNAME_MACHINE="alphaev68" ;;
> + UNAME_MACHINE=alphaev68 ;;
> "EV6.8AL (21264B)")
> - UNAME_MACHINE="alphaev68" ;;
> + UNAME_MACHINE=alphaev68 ;;
> "EV6.8CX (21264D)")
> - UNAME_MACHINE="alphaev68" ;;
> + UNAME_MACHINE=alphaev68 ;;
> "EV6.9A (21264/EV69A)")
> - UNAME_MACHINE="alphaev69" ;;
> + UNAME_MACHINE=alphaev69 ;;
> "EV7 (21364)")
> - UNAME_MACHINE="alphaev7" ;;
> + UNAME_MACHINE=alphaev7 ;;
> "EV7.9 (21364A)")
> - UNAME_MACHINE="alphaev79" ;;
> + UNAME_MACHINE=alphaev79 ;;
> esac
> # A Pn.n version is a patched version.
> # A Vn.n version is a released version.
> # A Tn.n version is a released field test version.
> # A Xn.n version is an unreleased experimental baselevel.
> # 1.2 uses "1.2" for uname -r.
> - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
> # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
> exitcode=$?
> trap '' 0
> @@ -376,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> exit ;;
> i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
> eval $set_cc_for_build
> - SUN_ARCH="i386"
> + SUN_ARCH=i386
> # If there is a compiler, see if it is configured for 64-bit objects.
> # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
> # This test works for both compilers.
> - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
> + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
> if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
> - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
> + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
> grep IS_64BIT_ARCH >/dev/null
> then
> - SUN_ARCH="x86_64"
> + SUN_ARCH=x86_64
> fi
> fi
> echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> @@ -410,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> exit ;;
> sun*:*:4.2BSD:*)
> UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
> - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
> + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
> case "`/bin/arch`" in
> sun3)
> echo m68k-sun-sunos${UNAME_RELEASE}
> @@ -635,13 +639,13 @@ EOF
> sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
> sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
> case "${sc_cpu_version}" in
> - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
> - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
> + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
> + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
> 532) # CPU_PA_RISC2_0
> case "${sc_kernel_bits}" in
> - 32) HP_ARCH="hppa2.0n" ;;
> - 64) HP_ARCH="hppa2.0w" ;;
> - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
> + 32) HP_ARCH=hppa2.0n ;;
> + 64) HP_ARCH=hppa2.0w ;;
> + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
> esac ;;
> esac
> fi
> @@ -680,11 +684,11 @@ EOF
> exit (0);
> }
> EOF
> - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
> + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
> test -z "$HP_ARCH" && HP_ARCH=hppa
> fi ;;
> esac
> - if [ ${HP_ARCH} = "hppa2.0w" ]
> + if [ ${HP_ARCH} = hppa2.0w ]
> then
> eval $set_cc_for_build
>
> @@ -697,12 +701,12 @@ EOF
> # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
> # => hppa64-hp-hpux11.23
>
> - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
> + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
> grep -q __LP64__
> then
> - HP_ARCH="hppa2.0w"
> + HP_ARCH=hppa2.0w
> else
> - HP_ARCH="hppa64"
> + HP_ARCH=hppa64
> fi
> fi
> echo ${HP_ARCH}-hp-hpux${HPUX_REV}
> @@ -807,14 +811,14 @@ EOF
> echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> exit ;;
> F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
> - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
> + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
> + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
> FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
> echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
> exit ;;
> 5000:UNIX_System_V:4.*:*)
> - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
> - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
> + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
> + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
> echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
> exit ;;
> i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
> @@ -896,7 +900,7 @@ EOF
> exit ;;
> *:GNU/*:*:*)
> # other systems with GNU libc and userland
> - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
> + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
> exit ;;
> i*86:Minix:*:*)
> echo ${UNAME_MACHINE}-pc-minix
> @@ -919,7 +923,7 @@ EOF
> EV68*) UNAME_MACHINE=alphaev68 ;;
> esac
> objdump --private-headers /bin/sh | grep -q ld.so.1
> - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
> + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
> arc:Linux:*:* | arceb:Linux:*:*)
> @@ -965,6 +969,9 @@ EOF
> ia64:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
> + k1om:Linux:*:*)
> + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> + exit ;;
> m32r*:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
> @@ -1120,7 +1127,7 @@ EOF
> # uname -m prints for DJGPP always 'pc', but it prints nothing about
> # the processor, so we play safe by assuming i586.
> # Note: whatever this is, it MUST be the same as what config.sub
> - # prints for the "djgpp" host, or else GDB configury will decide that
> + # prints for the "djgpp" host, or else GDB configure will decide that
> # this is a cross-build.
> echo i586-pc-msdosdjgpp
> exit ;;
> @@ -1269,6 +1276,9 @@ EOF
> SX-8R:SUPER-UX:*:*)
> echo sx8r-nec-superux${UNAME_RELEASE}
> exit ;;
> + SX-ACE:SUPER-UX:*:*)
> + echo sxace-nec-superux${UNAME_RELEASE}
> + exit ;;
> Power*:Rhapsody:*:*)
> echo powerpc-apple-rhapsody${UNAME_RELEASE}
> exit ;;
> @@ -1282,9 +1292,9 @@ EOF
> UNAME_PROCESSOR=powerpc
> fi
> if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
> - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
> + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
> if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
> - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
> + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
> grep IS_64BIT_ARCH >/dev/null
> then
> case $UNAME_PROCESSOR in
> @@ -1306,7 +1316,7 @@ EOF
> exit ;;
> *:procnto*:*:* | *:QNX:[0123456789]*:*)
> UNAME_PROCESSOR=`uname -p`
> - if test "$UNAME_PROCESSOR" = "x86"; then
> + if test "$UNAME_PROCESSOR" = x86; then
> UNAME_PROCESSOR=i386
> UNAME_MACHINE=pc
> fi
> @@ -1337,7 +1347,7 @@ EOF
> # "uname -m" is not consistent, so use $cputype instead. 386
> # is converted to i386 for consistency with other x86
> # operating systems.
> - if test "$cputype" = "386"; then
> + if test "$cputype" = 386; then
> UNAME_MACHINE=i386
> else
> UNAME_MACHINE="$cputype"
> @@ -1379,7 +1389,7 @@ EOF
> echo i386-pc-xenix
> exit ;;
> i*86:skyos:*:*)
> - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
> exit ;;
> i*86:rdos:*:*)
> echo ${UNAME_MACHINE}-pc-rdos
> @@ -1390,6 +1400,9 @@ EOF
> x86_64:VMkernel:*:*)
> echo ${UNAME_MACHINE}-unknown-esx
> exit ;;
> + amd64:Isilon\ OneFS:*:*)
> + echo x86_64-unknown-onefs
> + exit ;;
> esac
>
> cat >&2 <<EOF
> @@ -1399,9 +1412,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
>
> - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
> and
> - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
>
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
> diff --git a/zfs/config/config.sub b/zfs/config/config.sub
> index 1acc966..8d39c4b 100755
> --- a/zfs/config/config.sub
> +++ b/zfs/config/config.sub
> @@ -1,8 +1,8 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> -# Copyright 1992-2015 Free Software Foundation, Inc.
> +# Copyright 1992-2016 Free Software Foundation, Inc.
>
> -timestamp='2015-08-20'
> +timestamp='2016-03-30'
>
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
> @@ -33,7 +33,7 @@ timestamp='2015-08-20'
> # Otherwise, we print the canonical config type on stdout and succeed.
>
> # You can get the latest version of this script from:
> -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
>
> # This file is supposed to be the same for all GNU packages
> # and recognize all the CPU types, system types and aliases
> @@ -53,8 +53,7 @@ timestamp='2015-08-20'
> me=`echo "$0" | sed -e 's,.*/,,'`
>
> usage="\
> -Usage: $0 [OPTION] CPU-MFR-OPSYS
> - $0 [OPTION] ALIAS
> +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
>
> Canonicalize a configuration name.
>
> @@ -68,7 +67,7 @@ Report bugs and patches to <config-patches at gnu.org>."
> version="\
> GNU config.sub ($timestamp)
>
> -Copyright 1992-2015 Free Software Foundation, Inc.
> +Copyright 1992-2016 Free Software Foundation, Inc.
>
> This is free software; see the source for copying conditions. There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
> @@ -521,7 +520,7 @@ case $basic_machine in
> basic_machine=i386-pc
> os=-aros
> ;;
> - asmjs)
> + asmjs)
> basic_machine=asmjs-unknown
> ;;
> aux)
> @@ -1383,7 +1382,7 @@ case $os in
> | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
> | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
> - | -bitrig* | -openbsd* | -solidbsd* \
> + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
> | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> @@ -1399,7 +1398,8 @@ case $os in
> | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
> - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
> + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
> + | -onefs* | -tirtos*)
> # Remember, each alternative MUST END IN *, to match a version number.
> ;;
> -qnx*)
> @@ -1531,6 +1531,8 @@ case $os in
> ;;
> -nacl*)
> ;;
> + -ios)
> + ;;
> -none)
> ;;
> *)
> diff --git a/zfs/contrib/initramfs/scripts/zfs b/zfs/contrib/initramfs/scripts/zfs
> index 6a78a46..250dc57 100644
> --- a/zfs/contrib/initramfs/scripts/zfs
> +++ b/zfs/contrib/initramfs/scripts/zfs
> @@ -288,9 +288,8 @@ load_module_initrd()
> wait_for_dev
> fi
>
> - # zpool import refuse to import without a valid mtab
> - [ ! -f /proc/mounts ] && mount proc /proc
> - [ ! -f /etc/mtab ] && cat /proc/mounts > /etc/mtab
> + # zpool import refuse to import without a valid /proc/self/mounts
> + [ ! -f /proc/self/mounts ] && mount proc /proc
>
> # Load the module
> load_module "zfs" || return 1
> @@ -919,7 +918,7 @@ mountroot()
> #
> # but the MOUNTPOINT prefix is preserved on descendent filesystem
> # after the pivot into the regular root, which later breaks things
> - # like `zfs mount -a` and the /etc/mtab refresh.
> + # like `zfs mount -a` and the /proc/self/mounts refresh.
> #
> # * Mount additional filesystems required
> # Such as /usr, /var, /usr/local etc.
>
More information about the kernel-team
mailing list