summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2021-01-18 03:40:05 -0500
committerChris Severance2021-01-18 03:40:05 -0500
commitbfa0582efd3ef5244c4544670aac0d3a2eaa63c6 (patch)
tree3c1227e6ab71e82b16bf2a79479a5e4c593f067e
parent8a2a8b2c6f623a3e27c9d2796da22578cca9662a (diff)
downloadaur-bfa0582efd3ef5244c4544670aac0d3a2eaa63c6.tar.gz
autu: Update to 2.0.0.rc1.r315.gdc303dcf5b-1
-rw-r--r--.SRCINFO26
-rw-r--r--PKGBUILD8
-rw-r--r--zfs.initcpio.hook2
3 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bc160543b47c..7f135a55f0bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Mon Jun 22 00:59:28 UTC 2020
+# Mon Jan 18 08:40:04 UTC 2021
pkgbase = zfs-linux-git
- pkgver = 0.8.0.r858.g1c08fa8b5
+ pkgver = 2.0.0.rc1.r315.gdc303dcf5b
pkgrel = 1
url = https://zfsonlinux.org/
arch = x86_64
@@ -20,23 +20,23 @@ pkgbase = zfs-linux-git
md5sums = SKIP
md5sums = f66790ba3c14c8ebf276ea06f9376e32
md5sums = eca615c602740315333aedd417d83541
- md5sums = 937d6b89e32f438fa488eee63fa8a966
+ md5sums = fa15be4761c8a56ad0177d1a06a4c7f8
sha256sums = SKIP
sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
sha256sums = da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d
- sha256sums = f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e
+ sha256sums = 9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc
pkgname = zfs-linux-git
pkgdesc = Kernel modules for the Zettabyte File System.
install = zfs.install
depends = kmod
depends = linux
- depends = zfs-utils>=0.8.0
+ depends = zfs-utils>=2.0.0
depends = dkms
- provides = zfs=0.8.0
- provides = zfs-linux=0.8.0
- provides = spl=0.8.0
- provides = zfs-utils=0.8.0
+ provides = zfs=2.0.0
+ provides = zfs-linux=2.0.0
+ provides = spl=2.0.0
+ provides = zfs-utils=2.0.0
conflicts = zfs-dkms
conflicts = zfs-dkms-git
conflicts = zfs-dkms-rc
@@ -52,10 +52,10 @@ pkgname = zfs-linux-git
pkgname = zfs-linux-git-headers
pkgdesc = Kernel headers for the Zettabyte File System.
- depends = zfs-utils=0.8.0
- provides = zfs-headers=0.8.0
- provides = zfs-linux-headers=0.8.0
- provides = spl-headers=0.8.0
+ depends = zfs-utils=2.0.0
+ provides = zfs-headers=2.0.0
+ provides = zfs-linux-headers=2.0.0
+ provides = spl-headers=2.0.0
conflicts = zfs-headers
conflicts = zfs-dkms
conflicts = zfs-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index f6c4ed451f47..019a0880fb47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ fi
if [ "${_opt_UTIL}" -eq 1 ]; then
pkgname+=("zfs-utils${_opt_git}")
fi
-pkgver=0.8.0.r858.g1c08fa8b5
+pkgver=2.0.0.rc1.r315.gdc303dcf5b
pkgrel=1
_pkgver="${pkgver%%.r*}"
#_commit="#branch=zfs-${_pkgver%.*}-release"
@@ -58,15 +58,15 @@ source+=(
md5sums=('SKIP'
'f66790ba3c14c8ebf276ea06f9376e32'
'eca615c602740315333aedd417d83541'
- '937d6b89e32f438fa488eee63fa8a966')
+ 'fa15be4761c8a56ad0177d1a06a4c7f8')
sha256sums=('SKIP'
'780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409'
'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d'
- 'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e')
+ '9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc')
b2sums=('SKIP'
'1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50'
'570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3'
- '491a7f20b0c6b4ce4fcedab617b2d7a4f2a01f1bc8f1ae57efde2fb22c2ab09a1107a8f4877b95c27576fe4216d01f181936787f51ce532bb13c5806badf7519')
+ 'e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0')
_extramodules="$(uname -r)"
diff --git a/zfs.initcpio.hook b/zfs.initcpio.hook
index 7288ab8018b3..e0f4cfb386ca 100644
--- a/zfs.initcpio.hook
+++ b/zfs.initcpio.hook
@@ -39,7 +39,7 @@ zfs_mount_handler () {
local pool="${ZFS_DATASET%%/*}"
local rwopt_exp="${rwopt:-ro}"
- if ! zpool list -H "${pool}" 2>&1 > /dev/null ; then
+ if ! zpool list -H "${pool}" >/dev/null 2>&1; then
if [ ! "${rwopt_exp}" = "rw" ]; then
msg "ZFS: Importing pool ${pool} readonly."
ZPOOL_IMPORT_FLAGS="${ZPOOL_IMPORT_FLAGS} -o readonly=on"