diff --git a/srcpkgs/xbps-casper/files/hooks/casper b/srcpkgs/xbps-casper/files/hooks/casper index f17e4febec..dcd31979b3 100755 --- a/srcpkgs/xbps-casper/files/hooks/casper +++ b/srcpkgs/xbps-casper/files/hooks/casper @@ -28,7 +28,6 @@ copy_exec ${ROOTDIR}/sbin/losetup /sbin mkdir -p ${DESTDIR}/lib/udev/rules.d cp -p ${ROOTDIR}/lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d/ copy_exec ${ROOTDIR}/lib/udev/cdrom_id /lib/udev -copy_exec ${ROOTDIR}/lib/udev/path_id /lib/udev # cifs boot if [ -x ${ROOTDIR}/sbin/mount.cifs ]; then diff --git a/srcpkgs/xbps-casper/files/scripts/casper b/srcpkgs/xbps-casper/files/scripts/casper index d27a540adb..525798f4f0 100644 --- a/srcpkgs/xbps-casper/files/scripts/casper +++ b/srcpkgs/xbps-casper/files/scripts/casper @@ -112,8 +112,8 @@ is_nice_device() { local sysfs_path="${1#/sys}" - if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb)|platform-orion-ehci|platform- -mmc|platform-mxsdhci)"; then + if /sbin/udevadm test-builtin path_id "${sysfs_path}" | \ + egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb)|platform-orion-ehci|platform-mmc|platform-mxsdhci)"; then return 0 fi if echo ${sysfs_path} | grep -q "^/block/dm-"; then diff --git a/srcpkgs/xbps-casper/template b/srcpkgs/xbps-casper/template index 4a8abd4e66..554b075224 100644 --- a/srcpkgs/xbps-casper/template +++ b/srcpkgs/xbps-casper/template @@ -1,6 +1,6 @@ # Template file for 'xbps-casper' pkgname=xbps-casper -_localver=0.19 # XBPS package version +_localver=0.20 # XBPS package version _distver=1.236 # This should match the upstream (Ubuntu) version version=${_localver}.${_distver} build_style=custom-install @@ -16,6 +16,7 @@ noarch=yes keep_empty_dirs=yes conf_files="/etc/casper.conf" +Add_dependency full udev ">=174" # no path_id anymore Add_dependency full initramfs-tools do_install()