aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-02-03 17:21:11 +0000
committerRoy Marples <roy@marples.name>2008-02-03 17:21:11 +0000
commit1b2ad9e871a9ef7cd0eaf188033a34b4eceff680 (patch)
tree9c21e297e220465fef2fb06a926310ac37df1054
parent5014968e83adc2449aadda04b8f80a6a6dc78c0b (diff)
Remove the massive udev compat shim as it's now in udev-118-r2
-rwxr-xr-xsh.Linux/init.sh50
1 files changed, 3 insertions, 47 deletions
diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh
index 5b37df8e..54020ad4 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -3,46 +3,10 @@
# Copyright 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
-# udev needs these functions still :/
-try()
-{
- "$@"
-}
-
-_rc_get_kv_cache=
-get_KV()
-{
- [ -z "${_rc_get_kv_cache}" ] \
- && _rc_get_kv_cache="$(uname -r)"
-
- echo "$(KV_to_int "${_rc_get_kv_cache}")"
-
- return $?
-}
-
-KV_to_int()
-{
- [ -z $1 ] && return 1
-
- local x=${1%%-*}
- local KV_MAJOR=${x%%.*}
- x=${x#*.}
- local KV_MINOR=${x%%.*}
- x=${x#*.}
- local KV_MICRO=${x%%.*}
- local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
-
- # We make version 2.2.0 the minimum version we will handle as
- # a sanity check ... if its less, we fail ...
- [ "${KV_int}" -lt 131584 ] && return 1
-
- echo "${KV_int}"
-}
-
-# This basically mounts $svcdir as a ramdisk, but preserving its content
-# which allows us to run depscan.sh
+# This basically mounts $RC_SVCDIR as a ramdisk, but preserving its content
+# which allows us to store service state and generate dependencies if needed.
# The tricky part is finding something our kernel supports
-# tmpfs and ramfs are easy, so force one or the other
+# tmpfs and ramfs are easy, so force one or the other.
mount_svcdir()
{
local fs= fsopts="-o rw,noexec,nodev,nosuid" devdir="none" devtmp="none" x=
@@ -98,14 +62,6 @@ mount_svcdir()
[ -r /etc/conf.d/rc ] && . /etc/conf.d/rc
[ -r /etc/rc.conf ] && . /etc/rc.conf
-# Compat shim for udev
-rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-yes}}
-if yesno "${rc_coldplug}"; then
- RC_COLDPLUG=yes
-else
- RC_COLDPLUG=no
-fi
-
# Set the console loglevel to 1 for a cleaner boot
# the logger should anyhow dump the ring-0 buffer at start to the
# logs, and that with dmesg can be used to check for problems