From cf36155b4453a450ac95f96914c46f0bb4194e05 Mon Sep 17 00:00:00 2001 From: Iacopo Isimbaldi Date: Wed, 8 Jul 2015 19:22:42 +0200 Subject: AUR4 Initial Commit --- .SRCINFO | 32 ++++ PKGBUILD | 83 +++++++++ zfs-utils.bash-completion-r1 | 391 +++++++++++++++++++++++++++++++++++++++++++ zfs-utils.initcpio.hook | 100 +++++++++++ zfs-utils.initcpio.install | 104 ++++++++++++ zfs.install | 17 ++ 6 files changed, 727 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD create mode 100644 zfs-utils.bash-completion-r1 create mode 100644 zfs-utils.initcpio.hook create mode 100644 zfs-utils.initcpio.install create mode 100644 zfs.install diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..82d9efb --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,32 @@ +pkgbase = zfs-dkms-git + pkgver = 0.6.4.2 + pkgrel = 1 + url = http://zfsonlinux.org/ + arch = i686 + arch = x86_64 + license = CDDL + makedepends = git + source = git+https://github.com/zfsonlinux/zfs.git + source = zfs-utils.bash-completion-r1 + source = zfs-utils.initcpio.install + source = zfs-utils.initcpio.hook + md5sums = SKIP + md5sums = 9ddb0c8a94861f929d0fa741fdc49950 + md5sums = 9ef4841abb85dee611828cc7e6f5c6fe + md5sums = 62ba32c6853c315ff231c396cf8bfdbb + +pkgname = zfs-dkms-git + pkgdesc = Kernel modules for the Zettabyte File System. + install = zfs.install + depends = spl-dkms-git=0.6.4.2-1 + depends = zfs-utils-dkms-git=0.6.4.2-1 + depends = dkms + provides = zfs-git + conflicts = zfs-lts + +pkgname = zfs-utils-dkms-git + pkgdesc = Kernel module support files for the Zettabyte File System. + depends = spl-dkms-git=0.6.4.2-1 + provides = zfs-utils-git + conflicts = zfs-utils-lts + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..479d70e --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,83 @@ +# +# Maintainer: isiachi +# + +pkgbase="zfs-dkms-git" +pkgname=("zfs-dkms-git" "zfs-utils-dkms-git") +pkgver=0.6.4.2 +pkgrel=1 +license=('CDDL') +makedepends=("git") +arch=("i686" "x86_64") +url="http://zfsonlinux.org/" +source=("git+https://github.com/zfsonlinux/zfs.git" + "zfs-utils.bash-completion-r1" + "zfs-utils.initcpio.install" + "zfs-utils.initcpio.hook") +md5sums=('SKIP' + '9ddb0c8a94861f929d0fa741fdc49950' + '9ef4841abb85dee611828cc7e6f5c6fe' + '62ba32c6853c315ff231c396cf8bfdbb') +#install=zfs.install + +_dirver="${pkgver}" +_gittag="zfs-${pkgver}" + +prepare() { + cd "${srcdir}/zfs" + + git checkout ${_gittag} +} + +build() { + cd "${srcdir}/zfs" + ./autogen.sh + scripts/dkms.mkconf -v ${_dirver} -f dkms.conf -n zfs + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libdir=/usr/lib \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --with-udevdir=/lib/udev \ + --libexecdir=/usr/lib/zfs \ + --with-config=user + make +} + +package_zfs-dkms-git() { + pkgdesc="Kernel modules for the Zettabyte File System." + depends=("spl-dkms-git=${pkgver}-${pkgrel}" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms") + provides=("zfs-git") + conflicts=("zfs-lts") + install=zfs.install + + install -d ${pkgdir}/usr/src + cp -a ${srcdir}/zfs ${pkgdir}/usr/src/zfs-${_dirver} + rm -rf ${pkgdir}/usr/src/zfs-${_dirver}/.git + rm -f ${pkgdir}/usr/src/zfs-${_dirver}/.gitignore +} + +package_zfs-utils-dkms-git() { + pkgdesc="Kernel module support files for the Zettabyte File System." + depends=("spl-dkms-git=${pkgver}-${pkgrel}") + provides=("zfs-utils-git") + conflicts=("zfs-utils-lts") + + cd "${srcdir}/zfs" + make DESTDIR="${pkgdir}" install + + # Remove uneeded files + rm -r "${pkgdir}"/etc/init.d + rm -r "${pkgdir}"/usr/lib/dracut + + # move module tree /lib -> /usr/lib + cp -r "${pkgdir}"/{lib,usr} + rm -r "${pkgdir}"/lib + # rm -r "${pkgdir}"/sbin + + install -D -m644 "${srcdir}"/zfs-utils.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs + install -D -m644 "${srcdir}"/zfs-utils.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs + install -D -m644 "${srcdir}"/zfs-utils.bash-completion-r1 "${pkgdir}"/usr/share/bash-completion/completions/zfs +} diff --git a/zfs-utils.bash-completion-r1 b/zfs-utils.bash-completion-r1 new file mode 100644 index 0000000..b1aded3 --- /dev/null +++ b/zfs-utils.bash-completion-r1 @@ -0,0 +1,391 @@ +# Copyright (c) 2013, Aneurin Price + +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, +# copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following +# conditions: + +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +#if [[ -w /dev/zfs ]]; then + __ZFS_CMD="zfs" + __ZPOOL_CMD="zpool" +#else +# __ZFS_CMD="sudo zfs" +# __ZPOOL_CMD="sudo zpool" +#fi + +__zfs_get_commands() +{ + $__ZFS_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | cut -f1 -d '|' | uniq +} + +__zfs_get_properties() +{ + $__ZFS_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all name space +} + +__zfs_get_editable_properties() +{ + $__ZFS_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}' +} + +__zfs_get_inheritable_properties() +{ + $__ZFS_CMD get 2>&1 | awk '$3 == "YES" {print $1}' +} + +__zfs_list_datasets() +{ + $__ZFS_CMD list -H -o name -t filesystem,volume +} + +__zfs_list_filesystems() +{ + $__ZFS_CMD list -H -o name -t filesystem +} + +__zfs_match_snapshot() +{ + local base_dataset=${cur%@*} + if [[ $base_dataset != $cur ]] + then + $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset + else + $__ZFS_CMD list -H -o name -t filesystem,volume | awk '{print $1"@"}' + fi +} + +__zfs_match_explicit_snapshot() +{ + local base_dataset=${cur%@*} + if [[ $base_dataset != $cur ]] + then + $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset + fi +} + +__zfs_match_multiple_snapshots() +{ + local existing_opts=$(expr "$cur" : '\(.*\)[%,]') + if [[ $existing_opts ]] + then + local base_dataset=${cur%@*} + if [[ $base_dataset != $cur ]] + then + local cur=${cur##*,} + if [[ $cur =~ ^%|%.*% ]] + then + # correct range syntax is start%end + return 1 + fi + local range_start=$(expr "$cur" : '\(.*%\)') + $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset | sed 's$.*@$'$range_start'$g' + fi + else + __zfs_match_explicit_snapshot; __zfs_list_datasets + fi +} + +__zfs_list_volumes() +{ + $__ZFS_CMD list -H -o name -t volume +} + +__zfs_argument_chosen() +{ + local word property + for word in $(seq $((COMP_CWORD-1)) -1 2) + do + local prev="${COMP_WORDS[$word]}" + if [[ ${COMP_WORDS[$word-1]} != -[tos] ]] + then + if [[ "$prev" == [^,]*,* ]] || [[ "$prev" == *[@:]* ]] + then + return 0 + fi + for property in $@ + do + if [[ $prev == "$property" ]] + then + return 0 + fi + done + fi + done + return 1 +} + +__zfs_complete_ordered_arguments() +{ + local list1=$1 + local list2=$2 + local cur=$3 + local extra=$4 + if __zfs_argument_chosen $list1 + then + COMPREPLY=($(compgen -W "$list2 $extra" -- "$cur")) + else + COMPREPLY=($(compgen -W "$list1 $extra" -- "$cur")) + fi +} + +__zfs_complete_multiple_options() +{ + local options=$1 + local cur=$2 + + COMPREPLY=($(compgen -W "$options" -- "${cur##*,}")) + local existing_opts=$(expr "$cur" : '\(.*,\)') + if [[ $existing_opts ]] + then + COMPREPLY=( "${COMPREPLY[@]/#/${existing_opts}}" ) + fi +} + +__zfs_complete_switch() +{ + local options=$1 + if [[ ${cur:0:1} == - ]] + then + COMPREPLY=($(compgen -W "-{$options}" -- "$cur")) + return 0 + else + return 1 + fi +} + +__zfs_complete() +{ + local cur prev cmd cmds + COMPREPLY=() + # Don't split on colon + _get_comp_words_by_ref -n : -c cur -p prev -w COMP_WORDS -i COMP_CWORD + cmd="${COMP_WORDS[1]}" + + if [[ ${prev##*/} == zfs ]] + then + cmds=$(__zfs_get_commands) + COMPREPLY=($(compgen -W "$cmds -?" -- "$cur")) + return 0 + fi + + case "${cmd}" in + clone) + case "${prev}" in + -o) + COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "o,p" + then + if __zfs_argument_chosen + then + COMPREPLY=($(compgen -W "$(__zfs_list_datasets)" -- "$cur")) + else + COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur")) + fi + fi + ;; + esac + ;; + get) + case "${prev}" in + -d) + COMPREPLY=($(compgen -W "" -- "$cur")) + ;; + -t) + __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur" + ;; + -s) + __zfs_complete_multiple_options "local default inherited temporary none" "$cur" + ;; + -o) + __zfs_complete_multiple_options "name property value source received all" "$cur" + ;; + *) + if ! __zfs_complete_switch "H,r,p,d,o,t,s" + then + if __zfs_argument_chosen $(__zfs_get_properties) + then + COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur")) + else + __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur" + fi + fi + ;; + esac + ;; + inherit) + if ! __zfs_complete_switch "r" + then + __zfs_complete_ordered_arguments "$(__zfs_get_inheritable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur + fi + ;; + list) + case "${prev}" in + -d) + COMPREPLY=($(compgen -W "" -- "$cur")) + ;; + -t) + __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur" + ;; + -o) + __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur" + ;; + -s|-S) + COMPREPLY=($(compgen -W "$(__zfs_get_properties)" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "H,r,d,o,t,s,S" + then + COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur")) + fi + ;; + esac + ;; + promote) + COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur")) + ;; + rollback) + if ! __zfs_complete_switch "r,R,f" + then + COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur")) + fi + ;; + send) + if ! __zfs_complete_switch "d,n,P,p,R,v,i,I" + then + COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur")) + fi + ;; + snapshot) + case "${prev}" in + -o) + COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "o,r" + then + COMPREPLY=($(compgen -W "$(__zfs_list_datasets | awk '{print $1"@"}')" -- "$cur")) + fi + ;; + esac + ;; + set) + __zfs_complete_ordered_arguments "$(__zfs_get_editable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur + ;; + upgrade) + case "${prev}" in + -a|-V|-v) + COMPREPLY=($(compgen -W "" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "a,V,v,r" + then + COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur")) + fi + ;; + esac + ;; + destroy) + if ! __zfs_complete_switch "d,f,n,p,R,r,v" + then + __zfs_complete_multiple_options "$(__zfs_match_multiple_snapshots)" $cur + fi + ;; + *) + COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur")) + ;; + esac + __ltrim_colon_completions "$cur" + return 0 +} + +__zpool_get_commands() +{ + $__ZPOOL_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq +} + +__zpool_get_properties() +{ + $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all +} + +__zpool_get_editable_properties() +{ + $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}' +} + +__zpool_list_pools() +{ + $__ZPOOL_CMD list -H -o name +} + +__zpool_complete() +{ + local cur prev cmd cmds + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + cmd="${COMP_WORDS[1]}" + + if [[ ${prev##*/} == zpool ]] + then + cmds=$(__zpool_get_commands) + COMPREPLY=($(compgen -W "$cmds" -- "$cur")) + return 0 + fi + + case "${cmd}" in + get) + __zfs_complete_ordered_arguments "$(__zpool_get_properties)" "$(__zpool_list_pools)" $cur + return 0 + ;; + import) + if [[ $prev == -d ]] + then + _filedir -d + else + COMPREPLY=($(compgen -W "$(__zpool_list_pools) -d" -- "$cur")) + fi + return 0 + ;; + set) + __zfs_complete_ordered_arguments "$(__zpool_get_editable_properties)" "$(__zpool_list_pools)" $cur + return 0 + ;; + add|attach|clear|create|detach|offline|online|remove|replace) + local pools="$(__zpool_list_pools)" + if __zfs_argument_chosen $pools + then + _filedir + else + COMPREPLY=($(compgen -W "$pools" -- "$cur")) + fi + return 0 + ;; + *) + COMPREPLY=($(compgen -W "$(__zpool_list_pools)" -- "$cur")) + return 0 + ;; + esac + +} + +complete -F __zfs_complete zfs +complete -F __zpool_complete zpool diff --git a/zfs-utils.initcpio.hook b/zfs-utils.initcpio.hook new file mode 100644 index 0000000..3a92894 --- /dev/null +++ b/zfs-utils.initcpio.hook @@ -0,0 +1,100 @@ +ZPOOL_FORCE="" +ZPOOL_IMPORT_FLAGS="" + +zfs_get_bootfs () { + for zfs_dataset in $(/usr/bin/zpool list -H -o bootfs); do + case ${zfs_dataset} in + "" | "-") + # skip this line/dataset + ;; + "no pools available") + return 1 + ;; + *) + ZFS_DATASET=${zfs_dataset} + return 0 + ;; + esac + done + return 1 +} + +zfs_mount_handler () { + local node=$1 + if [ "$ZFS_DATASET" = "bootfs" ] ; then + if ! zfs_get_bootfs ; then + # Lets import everything and try again + /usr/bin/zpool import $ZPOOL_IMPORT_FLAGS -N -a $ZPOOL_FORCE + if ! zfs_get_bootfs ; then + echo "ZFS: Cannot find bootfs." + return 1 + fi + fi + fi + + local pool="${ZFS_DATASET%%/*}" + local rwopt_exp=${rwopt:-ro} + + if ! "/usr/bin/zpool" list -H $pool 2>&1 > /dev/null ; then + if [ "$rwopt_exp" != "rw" ]; then + msg "ZFS: Importing pool $pool readonly." + ZPOOL_IMPORT_FLAGS="$ZPOOL_IMPORT_FLAGS -o readonly=on" + else + msg "ZFS: Importing pool $pool." + fi + + if ! "/usr/bin/zpool" import $ZPOOL_IMPORT_FLAGS -N $pool $ZPOOL_FORCE ; then + echo "ZFS: Unable to import pool $pool." + return 1 + fi + fi + + local mountpoint=$("/usr/bin/zfs" get -H -o value mountpoint $ZFS_DATASET) + if [ "$mountpoint" = "legacy" ] ; then + mount -t zfs -o ${rwopt_exp} "$ZFS_DATASET" "$node" + else + mount -o zfsutil,${rwopt_exp} -t zfs "$ZFS_DATASET" "$node" + fi +} + +run_hook() { + # Force import the pools, useful if the pool has not properly been exported + # using 'zpool export ' + [[ $zfs_force == 1 ]] && ZPOOL_FORCE='-f' + [[ "$zfs_import_dir" != "" ]] && ZPOOL_IMPORT_FLAGS="$ZPOOL_IMPORT_FLAGS -d $zfs_import_dir" + + if [ "$root" = 'zfs' ]; then + mount_handler='zfs_mount_handler' + fi + + case $zfs in + "") + # skip this line/dataset + ;; + auto|bootfs) + ZFS_DATASET='bootfs' + mount_handler="zfs_mount_handler" + ;; + *) + ZFS_DATASET=$zfs + mount_handler="zfs_mount_handler" + ;; + esac + + if [ ! -f "/etc/hostid" ] ; then + echo "ZFS: No hostid found on kernel command line or /etc/hostid. ZFS pools may not import correctly." + fi + + # Allow up to 10 seconds for zfs device to show up + for i in 1 2 3 4 5 6 7 8 9 10; do + [ -c "/dev/zfs" ] && break + sleep 1 + done +} + + +run_latehook () { + /usr/bin/zpool import -N -a $ZPOOL_FORCE +} + +# vim:set ts=4 sw=4 ft=sh et: diff --git a/zfs-utils.initcpio.install b/zfs-utils.initcpio.install new file mode 100644 index 0000000..c128d10 --- /dev/null +++ b/zfs-utils.initcpio.install @@ -0,0 +1,104 @@ +#!/bin/bash + +build() { + map add_module \ + zavl \ + znvpair \ + zunicode \ + zcommon \ + zfs \ + zpios \ + spl \ + splat \ + zlib_deflate + + map add_binary \ + arcstat.py \ + dbufstat.py \ + fsck.zfs \ + mount.zfs \ + zdb \ + zed \ + zfs \ + zhack \ + zinject \ + zpios \ + zpool \ + zstreamdump \ + ztest \ + splat \ + hostid \ + /lib/udev/vdev_id \ + /lib/udev/zvol_id + + map add_file \ + /lib/udev/rules.d/60-zvol.rules \ + /lib/udev/rules.d/69-vdev.rules \ + /lib/udev/rules.d/90-zfs.rules + + map add_dir \ + /etc/zfs/zed.d + + add_runscript + + # allow mount(8) to "autodetect" ZFS + echo 'zfs' >>"$BUILDROOT/etc/filesystems" + + [[ -f /etc/zfs/zpool.cache ]] && add_file "/etc/zfs/zpool.cache" + [[ -f /etc/modprobe.d/zfs.conf ]] && add_file "/etc/modprobe.d/zfs.conf" + [[ -f /etc/hostid ]] && add_file "/etc/hostid" +} + +help() { + cat< + + To force importing of a ZFS pool: + + zfs_force=1 + + If set to 1, this will use "zpool import -f" when attempting to import + pools. + + To search for devices in a directory other than "/dev": + + zfs_import_dir=/dev/disk/by-uuid + or + zfs_import_dir=/dev/disk/by-partuuid + or + zfs_import_dir=/dev/disk/by-path + etc. + + Following initcpio convention, the 'rw' option must be specified to load the + pool as read/write. Pools are loaded as read only by default. + +Examples: + + To use bootfs on your pool, use + + zfs=bootfs rw + + This will setup your root using tank/root zfs pool. + + zfs=tank/root rw + +If you want to set properties for zfs-on-linux module, you should add them to +/etc/modprobe.d/zfs.conf and then rebuild initcpio. + +HELPEOF +} + +# vim: set ts=4 sw=4 ft=sh et: diff --git a/zfs.install b/zfs.install new file mode 100644 index 0000000..37c0f53 --- /dev/null +++ b/zfs.install @@ -0,0 +1,17 @@ +post_install() { + check_initramfs +} + +post_upgrade() { + check_initramfs +} + +check_initramfs() { + echo " >>> To build the module for the current kernel use this command: + # dkms install zfs/0.6.4 -k _KERNEL_VERSION_HERE_ + or just boot to kernel you want to built and do + # dkms install zfs/0.6.4 -k \$(uname -r) + + >>> Always remember to install kernel headers! +" +} -- cgit v1.2.1