diff --git a/filesystem/udev/udev.conf b/filesystem/udev/udev.conf index b7379cd65..06923abe5 100644 --- a/filesystem/udev/udev.conf +++ b/filesystem/udev/udev.conf @@ -59,33 +59,16 @@ udev_devices() { udev_rules() { local rulesd=$root$sysconfdir/udev/rules.d - echo "Installing .rules files..." + echo "Installing our .rules files..." - # check for possible conflicts - for x in etc/udev/rules.d/*.rules; do - [ ! -e "$confdir/rules/${x##*/}" ] || echo_warning "${x##*/}: ours will overwrite theirs." - done - - mkdir -p "$rulesd" - for x in $( ls -1 etc/udev/rules.d/*.rules $confdir/rules/*.rules 2> /dev/null ); do + for x in $confdir/rules/*.rules; do + [ ! -e "etc/udev/rules.d/${x##*/}" ] || echo_warning "${x##*/}: conflict detected." install -v -m 644 $x $rulesd/ done } -udev_helpers() { - local udevlib="$root/lib/udev" - - echo "Installing helpers ..." - mkdir -p "$udevlib" - - for x in $( ls -1 $confdir/scripts/* extra/*.sh 2> /dev/null ); do - install -v -m 755 "$x" $udevlib/ - done -} - hook_add postmake 5 'udev_devices' hook_add postmake 6 'udev_rules' -hook_add postmake 7 'udev_helpers' var_append makeopt ' ' "LD=$CC"