Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=84e606d48c031559ea93002311b4a19ec00e67ee
commit 84e606d48c031559ea93002311b4a19ec00e67ee Author: Michel Hermier <herm...@frugalware.org> Date: Wed Dec 1 14:01:34 2010 +0100 udev-164-3-i686 * Remove rc.udev. systemd provide support for that. diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index cc0480a..def6e85 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,7 +3,7 @@ pkgname=udev pkgver=164 -pkgrel=2 +pkgrel=3 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"; backup=(etc/sysconfig/blacklist) @@ -15,7 +15,7 @@ archs=('i686' 'x86_64' 'ppc') conflicts=('devfsd' 'pcmcia-cs' 'hotplug') replaces=('hotplug' 'devicekit') 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 udev.install blacklist \ README.Frugalware 65-permissions.rules revert-ide-changes.patch) signatures=("${source[0]}.sign" '' '' '' '' '') @@ -54,7 +54,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 2bab73e..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 -o %PPID /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 e417f0f..360e031 100644 --- a/source/base/udev/udev.install +++ b/source/base/udev/udev.install @@ -1,21 +1,7 @@ -post_install() -{ - cd /etc/rc.d/rcS.d - ln -sf ../rc.udev S00rc.udev -} - -pre_upgrade() -{ - # can be removed after Frugalware-0.7 - # remove obsolete hotplug service - chkconfig --del rc.hotplug &>/dev/null -} post_upgrade() { - # can be removed after Frugalware-0.7 - # force removing hotplug symlinks - rm -f /etc/rc.d/rc?.d/*hotplug + pre_remove # convert the blaclist file to the new format if ! grep -q blacklist /etc/sysconfig/blacklist; then sed -i 's/^\([^#]\)/blacklist \1/' /etc/sysconfig/blacklist @@ -54,7 +40,7 @@ post_upgrade() pre_remove() { - rm /etc/rc.d/rcS.d/S00rc.udev + rm -rf /etc/rc.d/rcS.d/S00rc.udev } op=$1 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
