diff options
author | Riku Voipio <riku.voipio@linaro.org> | 2014-09-01 11:06:49 +0300 |
---|---|---|
committer | Riku Voipio <riku.voipio@linaro.org> | 2014-09-01 14:00:40 +0300 |
commit | 368b31e6e6115e4ce47cd390fce2e8416cbe5eab (patch) | |
tree | 93c923377ff6a343e5fd2c26353539231936dd50 /meta-linaro-integration/recipes-overlayed/udev/udev-extraconf | |
parent | e848457751c0990f0ca6c4fbf205d5dc8f74ee35 (diff) |
Revert "udev: overlay for postgres fix"
Udev fix is now in oe-core
This reverts commit ca4bc75d5fd9f7b82e507a50cebf08628cf897bc.
Change-Id: Ic5132a437817cfc42b91e1fd856fdd7781d1cc02
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'meta-linaro-integration/recipes-overlayed/udev/udev-extraconf')
6 files changed, 0 insertions, 210 deletions
diff --git a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/automount.rules b/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/automount.rules deleted file mode 100644 index 62578ea6..00000000 --- a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/automount.rules +++ /dev/null @@ -1,19 +0,0 @@ -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %e the smallest number for that name which does not matches an existing node -# %k the kernel name for the device -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute -# %% the '%' char itself -# - -# Media automounting -SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" -SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" -SUBSYSTEM=="block", ACTION=="change", ENV{DISK_MEDIA_CHANGE}=="1" RUN+="/etc/udev/scripts/mount.sh" diff --git a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/autonet.rules b/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/autonet.rules deleted file mode 100644 index 19676aa1..00000000 --- a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/autonet.rules +++ /dev/null @@ -1,19 +0,0 @@ -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %e the smallest number for that name which does not matches an existing node -# %k the kernel name for the device -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute -# %% the '%' char itself -# - -# Handle network interface setup -SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" -SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" - diff --git a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/localextra.rules b/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/localextra.rules deleted file mode 100644 index 3d51d3e3..00000000 --- a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/localextra.rules +++ /dev/null @@ -1,23 +0,0 @@ -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %e the smallest number for that name which does not matches an existing node -# %k the kernel name for the device -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute -# %% the '%' char itself -# - -# The first rtc device is symlinked to /dev/rtc -KERNEL=="rtc0", SYMLINK+="rtc" - -#The first framebuffer is symlinked to /dev/fb -KERNEL=="fb0", SYMLINK+="fb" - -# Make all input devices read-write to the input group -SUBSYSTEM=="input", GROUP="input", MODE="660" diff --git a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/mount.blacklist b/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/mount.blacklist deleted file mode 100644 index e4934942..00000000 --- a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/mount.blacklist +++ /dev/null @@ -1,5 +0,0 @@ -/dev/loop -/dev/ram -/dev/mtdblock -/dev/md -/dev/dm-* diff --git a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/mount.sh b/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/mount.sh deleted file mode 100644 index 3eea9108..00000000 --- a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/mount.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# Called from udev -# -# Attempt to mount any added block devices and umount any removed devices - - -MOUNT="/bin/mount" -PMOUNT="/usr/bin/pmount" -UMOUNT="/bin/umount" -for line in `grep -v ^# /etc/udev/mount.blacklist` -do - if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ]; - then - logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" - exit 0 - fi -done - -automount() { - name="`basename "$DEVNAME"`" - - ! test -d "/run/media/$name" && mkdir -p "/run/media/$name" - # Silent util-linux's version of mounting auto - if [ "x`readlink $MOUNT`" = "x/bin/mount.util-linux" ] ; - then - MOUNT="$MOUNT -o silent" - fi - - # If filesystem type is vfat, change the ownership group to 'disk', and - # grant it with w/r/x permissions. - case $ID_FS_TYPE in - vfat|fat) - MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`" - ;; - # TODO - *) - ;; - esac - - if ! $MOUNT -t auto $DEVNAME "/run/media/$name" - then - #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/run/media/$name\" failed!" - rm_dir "/run/media/$name" - else - logger "mount.sh/automount" "Auto-mount of [/run/media/$name] successful" - touch "/tmp/.automount-$name" - fi -} - -rm_dir() { - # We do not want to rm -r populated directories - if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1" - then - ! test -z "$1" && rm -r "$1" - else - logger "mount.sh/automount" "Not removing non-empty directory [$1]" - fi -} - -# No ID_FS_TYPE for cdrom device, yet it should be mounted -name="`basename "$DEVNAME"`" -[ -e /sys/block/$name/device/media ] && media_type=`cat /sys/block/$name/device/media` - -if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" -o "$media_type" = "cdrom" ]; then - if [ -x "$PMOUNT" ]; then - $PMOUNT $DEVNAME 2> /dev/null - elif [ -x $MOUNT ]; then - $MOUNT $DEVNAME 2> /dev/null - fi - - # If the device isn't mounted at this point, it isn't - # configured in fstab (note the root filesystem can show up as - # /dev/root in /proc/mounts, so check the device number too) - if expr $MAJOR "*" 256 + $MINOR != `stat -c %d /`; then - grep -q "^$DEVNAME " /proc/mounts || automount - fi -fi - - -if [ "$ACTION" = "remove" ] || [ "$ACTION" = "change" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then - for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " ` - do - $UMOUNT $mnt - done - - # Remove empty directories from auto-mounter - name="`basename "$DEVNAME"`" - test -e "/tmp/.automount-$name" && rm_dir "/run/media/$name" -fi diff --git a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/network.sh b/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/network.sh deleted file mode 100644 index 3ee92714..00000000 --- a/meta-linaro-integration/recipes-overlayed/udev/udev-extraconf/network.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -# We get two "add" events for hostap cards due to wifi0 -echo "$INTERFACE" | grep -q wifi && exit 0 - -# udevd does clearenv(). Export shell PATH to children. -export PATH - -# Check if /etc/init.d/network has been run yet to see if we are -# called by starting /etc/rcS.d/S03udev and not by hotplugging a device -# -# At this stage, network interfaces should not be brought up -# automatically because: -# a) /etc/init.d/network has not been run yet (security issue) -# b) /var has not been populated yet so /etc/resolv,conf points to -# oblivion, making the network unusable -# - -spoofp="`grep ^spoofprotect /etc/network/options`" -if test -z "$spoofp" -then - # This is the default from /etc/init.d/network - spoofp_val=yes -else - spoofp_val=${spoofp#spoofprotect=} -fi - -test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0 - -# I think it is safe to assume that "lo" will always be there ;) -if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val" -then - echo "$INTERFACE" >> /dev/udev_network_queue - exit 0 -fi - -# -# Code taken from pcmcia-cs:/etc/pcmcia/network -# - -# if this interface has an entry in /etc/network/interfaces, let ifupdown -# handle it -if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then - case $ACTION in - add) - ifconfig | grep -q "^$INTERFACE" || ifup $INTERFACE - ;; - remove) - ifdown $INTERFACE - ;; - esac - - exit 0 -fi |