Compare commits
21 Commits
28dd83391b
...
337bdb0b13
| Author | SHA1 | Date | |
|---|---|---|---|
| 337bdb0b13 | |||
| bc8bb69f8c | |||
| e697cc5992 | |||
| 755c71660a | |||
| 4f457a8285 | |||
| 7764433c70 | |||
| be2dd8e629 | |||
| 5881d024a7 | |||
| fb2819a99e | |||
| a06fb96702 | |||
| f17f9da9f3 | |||
| cb19e379cd | |||
| 85fab4fe16 | |||
| 53b89f82e3 | |||
| c12e9c738d | |||
| 8af2630849 | |||
| 1cd71b3b73 | |||
| 33bcc36963 | |||
| d75312dc84 | |||
| 51204ca4f7 | |||
| 4b661efd65 |
@@ -7,17 +7,27 @@ ZFSDIR=zfs-linux_${ZFSVER}
|
||||
ZFSSRC=upstream
|
||||
|
||||
ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
|
||||
ZFS_DEB2= \
|
||||
|
||||
ZFS_DEB_BINARY = \
|
||||
libpam-zfs_${ZFSPKGVER}_amd64.deb \
|
||||
libuutil3linux_${ZFSPKGVER}_amd64.deb \
|
||||
libzfs4linux_${ZFSPKGVER}_amd64.deb \
|
||||
libzfslinux-dev_${ZFSPKGVER}_amd64.deb \
|
||||
libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb \
|
||||
libzpool4linux_${ZFSPKGVER}_amd64.deb \
|
||||
zfs-dbg_${ZFSPKGVER}_amd64.deb \
|
||||
zfs-zed_${ZFSPKGVER}_amd64.deb \
|
||||
zfs-initramfs_${ZFSPKGVER}_all.deb \
|
||||
zfs-test_${ZFSPKGVER}_amd64.deb \
|
||||
zfsutils-linux_${ZFSPKGVER}_amd64.deb
|
||||
ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
|
||||
zfs-test_${ZFSPKGVER}_amd64.deb \
|
||||
zfsutils-linux_${ZFSPKGVER}_amd64.deb \
|
||||
zfs-zed_${ZFSPKGVER}_amd64.deb
|
||||
|
||||
ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
|
||||
|
||||
ZFS_DEB2= ${ZFS_DEB_BINARY} \
|
||||
libzfslinux-dev_${ZFSPKGVER}_amd64.deb \
|
||||
python3-pyzfs_${ZFSPKGVER}_amd64.deb \
|
||||
pyzfs-doc_${ZFSPKGVER}_all.deb \
|
||||
spl_${ZFSPKGVER}_all.deb \
|
||||
zfs-initramfs_${ZFSPKGVER}_all.deb
|
||||
ZFS_DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
|
||||
|
||||
ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
|
||||
|
||||
all: deb
|
||||
@@ -30,7 +40,7 @@ dsc: ${ZFS_DSC}
|
||||
.PHONY: kernel
|
||||
kernel: dsc
|
||||
dpkg-source -x ${ZFS_DSC} ../pkg-zfs
|
||||
$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
|
||||
${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
|
||||
|
||||
.PHONY: dinstall
|
||||
dinstall: ${DEBS}
|
||||
@@ -38,13 +48,13 @@ dinstall: ${DEBS}
|
||||
|
||||
.PHONY: submodule
|
||||
submodule:
|
||||
test -f "$(ZFSSRC)/README.md" || git submodule update --init
|
||||
$(ZFSSRC)/README.md: submodule
|
||||
test -f "${ZFSSRC}/README.md" || git submodule update --init
|
||||
${ZFSSRC}/README.md: submodule
|
||||
|
||||
.PHONY: zfs
|
||||
zfs: $(ZFS_DEBS)
|
||||
$(ZFS_DEB2): $(ZFS_DEB1)
|
||||
$(ZFS_DEB1): ${ZFSDIR}
|
||||
zfs: ${ZFS_DEBS}
|
||||
${ZFS_DEB2}: ${ZFS_DEB1}
|
||||
${ZFS_DEB1}: ${ZFSDIR}
|
||||
cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
|
||||
lintian ${ZFS_DEBS}
|
||||
|
||||
@@ -53,7 +63,7 @@ ${ZFS_DSC}: ${ZFSDIR}
|
||||
cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
|
||||
lintian $@
|
||||
|
||||
${ZFSDIR}: $(ZFSSRC)/README.md $(ZFSSRC) ${ZFSPKG}
|
||||
${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG}
|
||||
rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
|
||||
cp -a ${ZFSSRC} ${ZFSDIR}.tmp
|
||||
cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
|
||||
@@ -69,4 +79,4 @@ distclean: clean
|
||||
|
||||
.PHONY: upload
|
||||
upload: ${DEBS}
|
||||
tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64
|
||||
tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch amd64
|
||||
|
||||
Vendored
+16
@@ -1,3 +1,19 @@
|
||||
zfs-linux (2.0.5-pve1~bpo10+1) buster; urgency=medium
|
||||
|
||||
* Rebuild for buster based releases
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 21 Jul 2021 18:01:07 +0200
|
||||
|
||||
zfs-linux (2.0.5-pve1) bullseye; urgency=medium
|
||||
|
||||
* update ZFS to 2.0.5
|
||||
|
||||
* do not restart most services upon upgrade
|
||||
|
||||
* add a script and cronjob for regular trimming of pools
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 09 Jul 2021 18:23:58 +0200
|
||||
|
||||
zfs-linux (2.0.4-pve1) pve pmg; urgency=medium
|
||||
|
||||
* update ZFS to 2.0.4
|
||||
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
10
|
||||
Vendored
+23
-22
@@ -3,7 +3,7 @@ Section: contrib/kernel
|
||||
Priority: optional
|
||||
Maintainer: Proxmox Support Team <support@proxmox.com>
|
||||
Build-Depends: abigail-tools,
|
||||
debhelper (>= 10~),
|
||||
debhelper-compat (= 12),
|
||||
dh-python,
|
||||
libblkid-dev,
|
||||
libelf-dev,
|
||||
@@ -17,7 +17,7 @@ Build-Depends: abigail-tools,
|
||||
python3-all-dev,
|
||||
uuid-dev,
|
||||
zlib1g-dev
|
||||
Standards-Version: 4.5.0
|
||||
Standards-Version: 4.5.1
|
||||
Homepage: https://www.zfsonlinux.org/
|
||||
Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
|
||||
Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
|
||||
@@ -65,7 +65,8 @@ Description: Solaris userland utility library for Linux
|
||||
Package: libzfslinux-dev
|
||||
Section: contrib/libdevel
|
||||
Architecture: linux-any
|
||||
Depends: libnvpair3linux (= ${binary:Version}),
|
||||
Depends: libssl-dev | libssl1.0-dev,
|
||||
libnvpair3linux (= ${binary:Version}),
|
||||
libuutil3linux (= ${binary:Version}),
|
||||
libzfs4linux (= ${binary:Version}),
|
||||
libzfsbootenv1linux (= ${binary:Version}),
|
||||
@@ -208,6 +209,11 @@ Description: OpenZFS Event Daemon
|
||||
traditional filesystems and volume managers. It supports data checksums,
|
||||
compression, encryption, snapshots, and more.
|
||||
.
|
||||
ZED (ZFS Event Daemon) monitors events generated by the ZFS kernel
|
||||
module. When a zevent (ZFS Event) is posted, ZED will run any ZEDLETs
|
||||
(ZFS Event Daemon Linkage for Executable Tasks) that have been enabled
|
||||
for the corresponding zevent class.
|
||||
.
|
||||
This package provides the OpenZFS Event Daemon (zed).
|
||||
|
||||
Package: zfs-test
|
||||
@@ -241,25 +247,6 @@ Description: OpenZFS test infrastructure and support scripts
|
||||
testing and validating a system using OpenZFS. It is entirely optional
|
||||
and should only be installed and used in test environments.
|
||||
|
||||
Package: zfs-dbg
|
||||
Section: contrib/debug
|
||||
Priority: optional
|
||||
Architecture: linux-any
|
||||
Depends: libnvpair3linux (= ${binary:Version}),
|
||||
libuutil3linux (= ${binary:Version}),
|
||||
libzfs4linux (= ${binary:Version}),
|
||||
libzpool4linux (= ${binary:Version}),
|
||||
zfs-zed (= ${binary:Version}),
|
||||
zfsutils-linux (= ${binary:Version}),
|
||||
${misc:Depends}
|
||||
Description: Debugging symbols for OpenZFS userland libraries and tools
|
||||
OpenZFS is a storage platform that encompasses the functionality of
|
||||
traditional filesystems and volume managers. It supports data checksums,
|
||||
compression, encryption, snapshots, and more.
|
||||
.
|
||||
This package contains the debugging symbols for libzpool4linux, libzfs4linux,
|
||||
libnvpair3linux, libuutil3linux, zfs-zed and zfsutils-linux.
|
||||
|
||||
Package: spl
|
||||
Section: contrib/metapackages
|
||||
Architecture: all
|
||||
@@ -278,3 +265,17 @@ Description: Solaris Porting Layer user-space utilities for Linux (dummy)
|
||||
to Linux primitives.
|
||||
.
|
||||
This is a transitional dummy package. It can safely be removed.
|
||||
|
||||
Package: zfs-dbg
|
||||
Section: contrib/metapackages
|
||||
Architecture: all
|
||||
Suggests: libnvpair3linux-dbgsym,
|
||||
libpam-zfs-dbgsym,
|
||||
libuutil3linux-dbgsym,
|
||||
libzfs4linux-dbgsym,
|
||||
libzfsbootenv1linux-dbgsym,
|
||||
libzpool4linux-dbgsym,
|
||||
zfs-test-dbgsym,
|
||||
zfsutils-linux-dbgsym,
|
||||
zfs-zed-dbgsym,
|
||||
Description: Transitional package. It can be safely removed.
|
||||
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
libzfsbootenv1linux: package-name-doesnt-match-sonames
|
||||
libzfsbootenv1linux: extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz
|
||||
package-name-doesnt-match-sonames
|
||||
extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz
|
||||
|
||||
Vendored
+9
-1
@@ -92,7 +92,7 @@ override_dh_makeshlibs:
|
||||
dh_makeshlibs -a -V
|
||||
|
||||
override_dh_strip:
|
||||
dh_strip --dbg-package=zfs-dbg
|
||||
dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
|
||||
|
||||
override_dh_auto_clean:
|
||||
find . -name .gitignore -delete
|
||||
@@ -107,6 +107,14 @@ override_dh_install:
|
||||
override_dh_missing:
|
||||
dh_missing --fail-missing
|
||||
|
||||
override_dh_installsystemd:
|
||||
# these to lines prevent the restarting of all systemd services, except
|
||||
# zfs-zed - they should not be restarted (importing, mounting, creating
|
||||
# links in /dev, and can cause erros in the log
|
||||
# (upon major.minor change)
|
||||
dh_installsystemd --no-stop-on-upgrade -X zfs-zed.service
|
||||
dh_installsystemd --name zfs-zed
|
||||
|
||||
override_dh_installdocs:
|
||||
dh_installdocs
|
||||
ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
|
||||
|
||||
+38
-5
@@ -1,12 +1,45 @@
|
||||
#!/bin/sh -eu
|
||||
|
||||
# Scrub all healthy pools that are not already scrubbing.
|
||||
# directly exit successfully when zfs module is not loaded
|
||||
if ! [ -d /sys/module/zfs ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# [auto] / enable / disable
|
||||
PROPERTY_NAME="org.debian:periodic-scrub"
|
||||
|
||||
get_property () {
|
||||
# Detect the ${PROPERTY_NAME} property on a given pool.
|
||||
# We are abusing user-defined properties on the root dataset,
|
||||
# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
|
||||
# TODO: use zpool user-defined property when such feature is available.
|
||||
pool="$1"
|
||||
zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
|
||||
}
|
||||
|
||||
scrub_if_not_scrub_in_progress () {
|
||||
pool="$1"
|
||||
if ! zpool status "${pool}" | grep -q "scrub in progress"; then
|
||||
# Ignore errors and continue with scrubbing other pools.
|
||||
zpool scrub "${pool}" || true
|
||||
fi
|
||||
}
|
||||
|
||||
# Scrub all healthy pools that are not already scrubbing as per their configs.
|
||||
zpool list -H -o health,name 2>&1 | \
|
||||
awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
|
||||
awk -F'\t' '$1 == "ONLINE" {print $2}' | \
|
||||
while read pool
|
||||
do
|
||||
if ! zpool status "$pool" | grep -q "scrub in progress"
|
||||
then
|
||||
zpool scrub "$pool"
|
||||
# read user-defined config
|
||||
ret=$(get_property "${pool}")
|
||||
if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
|
||||
:
|
||||
elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ] || [ "enable" = "${ret}" ]; then
|
||||
scrub_if_not_scrub_in_progress "${pool}"
|
||||
else
|
||||
cat > /dev/stderr <<EOF
|
||||
$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
|
||||
$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
|
||||
EOF
|
||||
fi
|
||||
done
|
||||
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
#!/bin/sh -eu
|
||||
|
||||
# directly exit successfully when zfs module is not loaded
|
||||
if ! [ -d /sys/module/zfs ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# [auto] / enable / disable
|
||||
PROPERTY_NAME="org.debian:periodic-trim"
|
||||
|
||||
get_property () {
|
||||
# Detect the ${PROPERTY_NAME} property on a given pool.
|
||||
# We are abusing user-defined properties on the root dataset,
|
||||
# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
|
||||
# TODO: use zpool user-defined property when such feature is available.
|
||||
pool="$1"
|
||||
zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
|
||||
}
|
||||
|
||||
trim_if_not_already_trimming () {
|
||||
pool="$1"
|
||||
if ! zpool status "${pool}" | grep -q "trimming"; then
|
||||
# Ignore errors (i.e. HDD pools),
|
||||
# and continue with trimming other pools.
|
||||
zpool trim "${pool}" || true
|
||||
fi
|
||||
}
|
||||
|
||||
zpool_is_nvme_only () {
|
||||
zpool=$1
|
||||
# get a list of devices attached to the specified zpool
|
||||
zpool list -vHPL "${zpool}" |
|
||||
awk -F'\t' '$2 ~ /^\/dev\// {
|
||||
if($2 !~ /^\/dev\/nvme/)
|
||||
exit 1
|
||||
}'
|
||||
}
|
||||
|
||||
# TRIM all healthy pools that are not already trimming as per their configs.
|
||||
zpool list -H -o health,name 2>&1 | \
|
||||
awk -F'\t' '$1 == "ONLINE" {print $2}' | \
|
||||
while read pool
|
||||
do
|
||||
# read user-defined config
|
||||
ret=$(get_property "${pool}")
|
||||
if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
|
||||
:
|
||||
elif [ "enable" = "${ret}" ]; then
|
||||
trim_if_not_already_trimming "${pool}"
|
||||
elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ]; then
|
||||
if zpool_is_nvme_only "${pool}"; then
|
||||
trim_if_not_already_trimming "${pool}"
|
||||
fi
|
||||
else
|
||||
cat > /dev/stderr <<EOF
|
||||
$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
|
||||
$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
|
||||
EOF
|
||||
fi
|
||||
done
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
activate update-initramfs
|
||||
Vendored
+13
-1
@@ -1 +1,13 @@
|
||||
zfs-test: arch-dependent-file-in-usr-share
|
||||
arch-dependent-file-in-usr-share
|
||||
script-not-executable usr/share/zfs/common.sh
|
||||
command-in-sbin-has-manpage-in-incorrect-section
|
||||
arch-dep-package-has-big-usr-share
|
||||
manpage-without-executable
|
||||
national-encoding usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua
|
||||
executable-not-elf-or-script usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/jail.conf
|
||||
script-not-executable usr/share/zfs/zfs-tests/include/default.cfg
|
||||
script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
|
||||
script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
|
||||
script-not-executable usr/share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc.cfg
|
||||
script-not-executable usr/share/zfs/zfs-tests/tests/functional/redacted_send/redacted.kshlib
|
||||
package-contains-documentation-outside-usr-share-doc usr/share/zfs/zfs-tests/*
|
||||
|
||||
Vendored
+4
@@ -0,0 +1,4 @@
|
||||
|
||||
script-not-executable
|
||||
# https://github.com/zfsonlinux/zfs/issues/8064
|
||||
systemd-service-file-refers-to-unusual-wantedby-target
|
||||
Vendored
+1
-1
@@ -8,7 +8,7 @@ etcd="/etc/zfs/zed.d"
|
||||
while read -r file ; do
|
||||
etcfile="${etcd}/${file}"
|
||||
[ -e "${etcfile}" ] && continue
|
||||
ln -s "${zedd}/${file}" "${etcfile}"
|
||||
ln -sfT "${zedd}/${file}" "${etcfile}"
|
||||
done < "${zedd}/DEFAULT-ENABLED"
|
||||
|
||||
# remove the overrides created in prerm
|
||||
|
||||
Vendored
+17
@@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
zedd="/usr/lib/zfs-linux/zed.d"
|
||||
etcd="/etc/zfs/zed.d"
|
||||
|
||||
if [ "$1" = "purge" ] && [ -d "$etcd" ] ; then
|
||||
# remove the overrides created in prerm
|
||||
find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
|
||||
# remove any dangling symlinks to old zedlets
|
||||
find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l -delete
|
||||
# clean up any empty directories
|
||||
( rmdir "$etcd" && rmdir "/etc/zfs" ) || true
|
||||
fi
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
Vendored
+2
-2
@@ -7,8 +7,8 @@ etcd="/etc/zfs/zed.d"
|
||||
if [ "$1" != "failed-upgrade" ] && [ -d "${etcd}" ] && [ -d "${zedd}" ] ; then
|
||||
while read -r file ; do
|
||||
etcfile="${etcd}/${file}"
|
||||
[ -e "${etcfile}" ] && continue
|
||||
ln -s /dev/null "${etcfile}"
|
||||
( [ -L "${etcfile}" ] || [ -e "${etcfile}" ] ) && continue
|
||||
ln -sT /dev/null "${etcfile}"
|
||||
done < "${zedd}/DEFAULT-ENABLED"
|
||||
fi
|
||||
|
||||
|
||||
Vendored
+4
-1
@@ -1,4 +1,7 @@
|
||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||
|
||||
# TRIM the first Sunday of every month.
|
||||
24 0 1-7 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/trim ]; then /usr/lib/zfs-linux/trim; fi
|
||||
|
||||
# Scrub the second Sunday of every month.
|
||||
24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub
|
||||
24 0 8-14 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi
|
||||
|
||||
+13
@@ -1 +1,14 @@
|
||||
spare-manual-page
|
||||
systemd-service-file-refers-to-unusual-wantedby-target
|
||||
binary-without-manpage usr/sbin/dbufstat
|
||||
binary-without-manpage usr/sbin/arc_summary
|
||||
manpage-has-errors-from-man
|
||||
appstream-metadata-missing-modalias-provide
|
||||
command-in-sbin-has-manpage-in-incorrect-section
|
||||
package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-cache.service
|
||||
package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-scan.service
|
||||
spelling-error-in-manpage
|
||||
package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-volume-wait.service
|
||||
systemd-service-file-missing-documentation-key lib/systemd/system/zfs-volume-wait.service
|
||||
extra-license-file usr/share/doc/zfsutils-linux/LICENSE.gz
|
||||
package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-load-module.service
|
||||
|
||||
+1
-1
Submodule upstream updated: 6150fbe67f...e9353bc2ef
Reference in New Issue
Block a user