minor changes found by `diff -ru` on debian/ with the one in debian-upstream
based on https://salsa.debian.org/zfsonlinux-team/zfs/ commits: 3b029ca123417535a53efa23f54975649924c66c 3b029ca123417535a53efa23f54975649924c66c Signed-off-by: Stoiko Ivanov <s.iva...@proxmox.com> --- debian/libzfslinux-dev.install.in | 2 +- .../usr/share/initramfs-tools/hooks/zdev | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/libzfslinux-dev.install.in b/debian/libzfslinux-dev.install.in index c286cc327..9b14b6f27 100644 --- a/debian/libzfslinux-dev.install.in +++ b/debian/libzfslinux-dev.install.in @@ -1,4 +1,4 @@ -usr/lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/@DEB_HOST_MULTIARCH@/*.a usr/include usr/lib/@DEB_HOST_MULTIARCH@/*.so /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev index 0cf21a421..a1aa39ac0 100755 --- a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev +++ b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev @@ -5,7 +5,7 @@ PREREQ="udev" PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules" -COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id" +COPY_EXEC_LIST="/usr/lib/udev/zvol_id /usr/lib/udev/vdev_id" # Generic result code. RC=0 @@ -33,18 +33,18 @@ fi . /usr/share/initramfs-tools/hook-functions -mkdir -p "$DESTDIR/lib/udev/rules.d/" +mkdir -p "$DESTDIR/usr/lib/udev/rules.d/" for ii in $PREREQ_UDEV_RULES do if [ -e "/etc/udev/rules.d/$ii" ] then - cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/" - elif [ -e "/lib/udev/rules.d/$ii" ] + cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/" + elif [ -e "/usr/lib/udev/rules.d/$ii" ] then - cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/" + cp -p "/usr/lib/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/" else echo "Error: Missing udev rule: $ii" - echo " This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory." + echo " This file must be in the /etc/udev/rules.d or /usr/lib/udev/rules.d directory." exit 1 fi done -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
