Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=10bd03b14271e2711822738fd460d247a6824006
commit 10bd03b14271e2711822738fd460d247a6824006 Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Aug 24 02:01:48 2011 +0200 udev-173-3-i686 - drop no longer enabled rc.udev diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index b5a147c..d942c67 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,7 +3,7 @@ pkgname=udev pkgver=173 -pkgrel=2 +pkgrel=3 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"; backup=(etc/sysconfig/blacklist) @@ -13,9 +13,9 @@ makedepends=('gperf' 'usbutils' 'pciutils' 'gobject-introspection') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump '$url?C=M;O=D'|grep 'udev-.*tar.bz2 '|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=($url/$pkgname-$pkgver.tar.gz rc.udev blacklist \ +source=($url/$pkgname-$pkgver.tar.gz blacklist \ README.Frugalware 65-permissions.rules) -signatures=("${source[0]}.sign" '' '' '' '') +signatures=("${source[0]}.sign" '' '' '') subpkgs=('libgudev') subdescs=('Libraries for adding libudev support to applications that use glib.') @@ -46,7 +46,6 @@ build() do [ -d $i ] && Ffilerel rules/$i/* /lib/udev/rules.d/ done - Fexe /etc/rc.d/rc.udev Ffile /etc/sysconfig/blacklist Fmkdir /etc/modprobe.d /dev Fln /etc/sysconfig/blacklist /etc/modprobe.d/blacklist.conf diff --git a/source/base/udev/rc.udev b/source/base/udev/rc.udev deleted file mode 100644 index 2ad313e..0000000 --- a/source/base/udev/rc.udev +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# (c) 2004 Vajna Miklos <vmik...@frugalware.org> -# rc.udev for Frugalware -# version 0.9.1 -# distributed under GPL license -# -# Copyright (C) 2004 Greg Kroah-Hartman <g...@kroah.com> -# Released under the GPL v2 only. -# -# Thanks go out to the Gentoo developers for proving -# that this is possible to do. - -mount none -t sysfs /sys - -export MODPROBE_OPTIONS="--use-blacklist" - -. /etc/udev/udev.conf - -prog=udev -sysfs_dir=/sys -bin=/sbin/udev -udevd=/sbin/udevd -udev_root="/dev" - -make_extra_nodes () { - # there are a few things that sysfs does not export for us. - # these things go here - # - # Thanks to Gentoo for the initial list of these. - - mkdir $udev_root/pts - mkdir $udev_root/shm -} - -start() -{ - /sbin/udevadm trigger - # Wait for udev events - /sbin/udevadm settle --timeout=90 -} - -# don't use udev if sysfs is not mounted. -if [ ! -d $sysfs_dir/block ]; then - exit 1 -fi - -# propogate /udev from /sys -export ACTION=add -export UDEV_NO_SLEEP=1 -#echo "Creating initial udev device nodes:" - - -#echo "making extra nodes" -make_extra_nodes - -#echo "udev startup is finished!" - -# actually we need that here -if [ -e /proc/cmdline ]; then - if grep -q quiet /proc/cmdline; then - echo "0" > /proc/sys/kernel/printk - else - echo "6" > /proc/sys/kernel/printk - fi -else # ohh well then mute anyway - echo "0" > /proc/sys/kernel/printk -fi - -# be sure we use /sbin/modprobe -echo "/sbin/modprobe" > /proc/sys/kernel/modprobe -echo > /proc/sys/kernel/hotplug - -# check if udevd is already running -if ! [ `pidof /sbin/udevd` ]; then - /sbin/udevd --daemon -fi - -mkdir -p /dev/.udev/queue -start - -if [ -f "/sys/class/tty/console/uevent" ]; then - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug -fi - -## just in case we have a box with a lot USB or external HW try detecting again -start - -# end of rc.udev diff --git a/source/base/udev/udev.install b/source/base/udev/udev.install index 4869815..3a549e2 100644 --- a/source/base/udev/udev.install +++ b/source/base/udev/udev.install @@ -30,9 +30,6 @@ post_upgrade() # /lib/udev/rules.d/50-udev-default.rules [ -e /etc/udev/rules.d/50-udev-default.rules ] && mv /etc/udev/rules.d/50-udev-default.rules{,.pacsave} - # remove after Frugalware-1.5 - rm -f /etc/rc.d/rcS.d/S00rc.udev - /bin/systemctl daemon-reload >/dev/null 2>&1 || : # start daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
