Warn about zfs-import.target

pull/209/head
Jan Houben 7 years ago
parent 03f8bfce0d
commit 0fdfcd64bb
No known key found for this signature in database
GPG Key ID: B7C6B271DEB42D74
  1. 4
      build.sh
  2. 2
      src/kernels/common.sh
  3. 14
      src/zfs-utils/zfs-utils.install
  4. 23
      src/zfs-utils/zfs-utils.install.sh

@ -148,8 +148,8 @@ generate_package_files() {
msg2 "Creating zfs-utils PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/zfs-utils/PKGBUILD.sh"
msg2 "Copying zfs-utils.install"
run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.install ${zfs_utils_pkgbuild_path}/zfs-utils.install"
msg2 "Creating zfs-utils.install"
run_cmd_no_output "source ${script_dir}/src/zfs-utils/zfs-utils.install.sh"
msg2 "Copying zfs-utils.bash-completion"
run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.bash-completion-r1 ${zfs_utils_pkgbuild_path}/zfs-utils.bash-completion-r1"

@ -3,7 +3,7 @@ mode_name="common"
mode_desc="Select and use the packages that are common between all kernels"
# version
pkgrel="1"
pkgrel="2"
header="\
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>

@ -1,14 +0,0 @@
show_warning() {
echo ">>> WARNING: The systemd unit files for archzfs have changed!"
echo ">>> You may need re-enable the zfs systemd service."
echo ">>> See https://github.com/archzfs/archzfs/issues/72"
}
post_install() {
show_warning
}
post_upgrade() {
show_warning
}

@ -0,0 +1,23 @@
#!/bin/bash
old_version="0.7.4-1"
if [[ ${archzfs_package_group} =~ -git$ ]]; then
old_version="2017.12.08.r3208.4e9b15696-1"
fi
cat << EOF > ${zfs_utils_pkgbuild_path}/zfs-utils.install
show_zfs_import_warning() {
echo ">>> WARNING: A new systemd unit file was added to archzfs!"
echo ">>> You may need enable zfs-import.target"
echo ">>> See https://github.com/archzfs/archzfs/issues/186"
}
post_upgrade() {
# If upgrading from $old_version or older
# display zfs-import warning
if [[ \$(vercmp \$2 $old_version) -le 0 ]]; then
show_zfs_import_warning
fi
}
EOF
Loading…
Cancel
Save