From 7f4896803034fb83dc162c07d486ee66bac20f25 Mon Sep 17 00:00:00 2001 From: Iacopo Isimbaldi Date: Sat, 12 Mar 2016 18:31:08 +0100 Subject: Removed "zfs.install" Useless with new version of dkms --- .SRCINFO | 1 - PKGBUILD | 1 - zfs.initcpio.install | 6 ---- zfs.install | 78 ---------------------------------------------------- 4 files changed, 86 deletions(-) delete mode 100644 zfs.install diff --git a/.SRCINFO b/.SRCINFO index 01404d8..4e0699a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -19,7 +19,6 @@ pkgbase = zfs-dkms pkgname = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - install = zfs.install depends = spl-dkms=0.6.5.4 depends = zfs-utils=0.6.5.4-4 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index f0170f1..a7954a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -42,7 +42,6 @@ package_zfs-dkms() { depends=("spl-dkms=${pkgver}" "zfs-utils=${pkgver}-${pkgrel}" "dkms") provides=("zfs") conflicts=("zfs-git" "zfs-lts") - install=zfs.install dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}" install -d "${dkmsdir}" diff --git a/zfs.initcpio.install b/zfs.initcpio.install index e192c3b..c128d10 100644 --- a/zfs.initcpio.install +++ b/zfs.initcpio.install @@ -1,12 +1,6 @@ #!/bin/bash build() { - echo -en "Build spl module for ${KERNELVERSION} kernel... " - $(which dkms) install -m spl -v ##VERMARKER## -k ${KERNELVERSION} -q - echo -en "Done.\nBuild zfs module for ${KERNELVERSION} kernel... " - $(which dkms) install -m zfs -v ##VERMARKER## -k ${KERNELVERSION} -q - echo "Done." - map add_module \ zavl \ znvpair \ diff --git a/zfs.install b/zfs.install deleted file mode 100644 index 6cba9a6..0000000 --- a/zfs.install +++ /dev/null @@ -1,78 +0,0 @@ -post_install() { - dkms add zfs/${1%%[-_]*} - cat << EOF -==> To build and install your modules run: dkms install zfs/${1%%[_-]*} -k [KERNEL] -==> To do this automatically at startup run: systemctl enable dkms.service - -EOF - check_hook -} - -pre_upgrade() { - if [ "${1%%[-_]*}" != "${2%%[-_]*}" ]; then - pre_remove "$2" - fi -} - -post_upgrade() { - if [ "${1%%[-_]*}" != "${2%%[-_]*}" ]; then - post_install "$1" - fi -} - -pre_remove() { - [ -n "${1%%[-_]*}" ] && dkms remove zfs/${1%%[-_]*} --all -q || true -} - -post_remove() { - check_hook remove -} - -check_hook() { - ZFSHOOKFILES=() - - for preset in /etc/mkinitcpio.d/*.preset; do - source $preset - CONF_FILE=() - - if [ -n "${ALL_config}" ]; then - CONF_FILE+=("${ALL_config}") - unset ALL_config - fi - - for prefix in ${PRESETS[@]}; do - varname="${prefix}_config" - if [ -n "$(eval echo \$$varname)" ]; then - eval CONF_FILE+=("$(eval echo \$$varname)") - unset $varname - fi - done - - i=0 - unset ZFSHOOKPRESENCE - while [ $i -lt ${#CONF_FILE[@]} ]; do - if [ -e "${CONF_FILE[$i]}" ] && [ $(grep -q "zfs" ${CONF_FILE[$i]} && echo -n "1") ]; then - ZFSHOOKPRESENCE=1 - if [ "$1" == "remove" ] && [ $(echo -n "${ZFSHOOKFILES[@]}" | grep -q "${CONF_FILE[$i]}" || echo -n "1") ]; then - ZFSHOOKFILES+=("${CONF_FILE[$i]}") - fi - fi - i+=1 - done - - if [ ${ZFSHOOKPRESENCE} ]; then - if [ "$1" != "remove" ]; then - echo "==> Generating initial ramdisk for $(basename "$preset" .preset), using mkinitcpio. Please wait..." - mkinitcpio -p $(basename "$preset" .preset) - fi - fi - done - - if [ "$1" == "remove" ] && [ ${#ZFSHOOKFILES[@]} -gt 0 ]; then - echo "==> zfs-dkms package has been removed but \"zfs\" is still in the hooks list of:" - for file in ${ZFSHOOKFILES[@]}; do - echo " -> ${file}" - done - echo "==> Remove \"zfs\" and generate a new initrd." - fi -} -- cgit v1.2.1