SVN: rc-scripts/branches/busybox: configure.ac rc.d/rc.sysinit sysconfig/network-scripts/ifup-br sys...
glen
glen at pld-linux.org
Sun Apr 12 13:21:08 CEST 2009
Author: glen
Date: Sun Apr 12 13:21:08 2009
New Revision: 10327
Modified:
rc-scripts/branches/busybox/configure.ac
rc-scripts/branches/busybox/rc.d/rc.sysinit
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp
rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan
rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup
Log:
- use external modprobe due (-s, and -k args incompatability)
Modified: rc-scripts/branches/busybox/configure.ac
==============================================================================
--- rc-scripts/branches/busybox/configure.ac (original)
+++ rc-scripts/branches/busybox/configure.ac Sun Apr 12 13:21:08 2009
@@ -1,6 +1,6 @@
dnl $Id$
-AC_INIT(["rc-scripts"], [0.4.99.1], [pld-rc-scripts at lists.pld-linux.org], [rc-scripts])
+AC_INIT(["rc-scripts"], [0.4.99.2], [pld-rc-scripts at lists.pld-linux.org], [rc-scripts])
AM_INIT_AUTOMAKE
ALL_LINGUAS="pl de"
Modified: rc-scripts/branches/busybox/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/branches/busybox/rc.d/rc.sysinit (original)
+++ rc-scripts/branches/busybox/rc.d/rc.sysinit Sun Apr 12 13:21:08 2009
@@ -101,7 +101,7 @@
echo '' # make sure there is a LF at the end
) | while read module args; do
[ -z "$module" ] && continue
- modprobe -s $module -- $args
+ /sbin/modprobe -s $module -- $args
done
}
@@ -284,7 +284,7 @@
# XXX might need modules dep
# Device mapper & related initialization
if ! grep -qF device-mapper /proc/devices; then
- modprobe dm-mod
+ /sbin/modprobe dm-mod
fi
# but should do this before swapon?
@@ -321,14 +321,14 @@
if [ "$usb" = "1" ]; then
needusbstorage=$(LC_ALL=C cat /proc/bus/usb/devices 2>/dev/null|grep -e "^I.*Cls=08" 2>/dev/null)
if [ "$(kernelverser)" -lt "002006" ]; then
- LC_ALL=C grep -q 'hid' /proc/bus/usb/drivers 2>/dev/null || run_cmd "Initializing USB HID interface" modprobe hid 2> /dev/null
+ LC_ALL=C grep -q 'hid' /proc/bus/usb/drivers 2>/dev/null || run_cmd "Initializing USB HID interface" /sbin/modprobe hid 2> /dev/null
mouseoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=02" 2>/dev/null)
kbdoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=01" 2>/dev/null)
if [ -n "$kbdoutput" ]; then
- run_cmd "Initializing USB keyboard" modprobe keybdev
+ run_cmd "Initializing USB keyboard" /sbin/modprobe keybdev
fi
if [ -n "$mouseoutput" ]; then
- run_cmd "Initializing USB mouse" modprobe mousedev
+ run_cmd "Initializing USB mouse" /sbin/modprobe mousedev
fi
fi
fi
@@ -555,7 +555,7 @@
# Load usb storage here, to match most other things
if [ -n "$needusbstorage" ]; then
- modprobe -k usb-storage >/dev/null 2>&1
+ /sbin/modprobe -k usb-storage >/dev/null 2>&1
fi
# Load firewire devices
@@ -583,12 +583,12 @@
RETURN=0
alias=$(/sbin/modprobe -c | grep -sE "^alias[[:space:]]+sound[[:space:]]+" 2>/dev/null | awk '{ print $3 }')
if [ -n "$alias" -a "$alias" != "off" ] ; then
- run_cmd "$(nls 'Loading sound module') ($alias)" modprobe -s $alias
+ run_cmd "$(nls 'Loading sound module') ($alias)" /sbin/modprobe -s $alias
RETURN=$?
fi
alias=$(/sbin/modprobe -c | grep -sE "^alias[[:space:]]+sound-slot-0[[:space:]]+" 2>/dev/null | awk '{ print $3 }')
if [ -n "$alias" -a "$alias" != "off" ] ; then
- run_cmd "$(nls 'Loading sound module') ($alias)" modprobe -s $alias
+ run_cmd "$(nls 'Loading sound module') ($alias)" /sbin/modprobe -s $alias
RETURN=$?
fi
fi
@@ -598,9 +598,9 @@
if [ -x /sbin/multipath ]; then
# first make nodes that were discarded due (possible) new /dev mount
- modprobe -s dm-mod
+ /sbin/modprobe -s dm-mod
/sbin/dmsetup mknodes
- modprobe -s dm-multipath
+ /sbin/modprobe -s dm-multipath
run_cmd "Activating dm-multipath" /sbin/multipath -v 0
/sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p p'
fi
@@ -614,19 +614,19 @@
if [ -x /sbin/evms_activate ]; then
if [ "$(kernelverser)" -lt "002006" ]; then
# Linux 2.4 core modules
- modprobe -s -k evms > /dev/null 2>&1
- modprobe -s -k evms_passthru > /dev/null 2>&1
- modprobe -s -k ldev_mgr > /dev/null 2>&1
- modprobe -s -k dos_part > /dev/null 2>&1
+ /sbin/modprobe -s -k evms > /dev/null 2>&1
+ /sbin/modprobe -s -k evms_passthru > /dev/null 2>&1
+ /sbin/modprobe -s -k ldev_mgr > /dev/null 2>&1
+ /sbin/modprobe -s -k dos_part > /dev/null 2>&1
else
# Linux 2.6 core module
- modprobe -s -k evmscore > /dev/null 2>&1
+ /sbin/modprobe -s -k evmscore > /dev/null 2>&1
fi
- is_yes "$EVMS_GUID_PTABLE" && modprobe -s -k gpt_part >/dev/null 2>&1
- is_yes "$EVMS_LVM" && modprobe -s -k lvm_vge >/dev/null 2>&1
- is_yes "$EVMS_AIX" && modprobe -s -k AIXlvm_vge >/dev/null 2>&1
- is_yes "$EVMS_OS2" && modprobe -s -k os2lvm_vge >/dev/null 2>&1
+ is_yes "$EVMS_GUID_PTABLE" && /sbin/modprobe -s -k gpt_part >/dev/null 2>&1
+ is_yes "$EVMS_LVM" && /sbin/modprobe -s -k lvm_vge >/dev/null 2>&1
+ is_yes "$EVMS_AIX" && /sbin/modprobe -s -k AIXlvm_vge >/dev/null 2>&1
+ is_yes "$EVMS_OS2" && /sbin/modprobe -s -k os2lvm_vge >/dev/null 2>&1
run_cmd "Discovering EVMS volumes" /sbin/evms_activate
if is_yes "$EVMS_LVM" && is_yes "$EVMS_LVM_COMPAT_NODES" ; then
# Link nodes for compatibility with LVM
@@ -640,15 +640,15 @@
if is_yes "$EVMS_LVM" || [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
lvmversion=$(LC_ALL=C /sbin/vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
if [ "$lvmversion" = "1" ] ; then
- modprobe -s -k lvm-mod >/dev/null 2>&1
+ /sbin/modprobe -s -k lvm-mod >/dev/null 2>&1
lvmignorelock=""
elif [ "$lvmversion" = "2" ] ; then
- modprobe -s -k dm-mod >/dev/null 2>&1
+ /sbin/modprobe -s -k dm-mod >/dev/null 2>&1
lvmignorelock="--ignorelockingfailure"
else
- modprobe -s -k lvm-mod >/dev/null 2>&1
+ /sbin/modprobe -s -k lvm-mod >/dev/null 2>&1
# device mapper (2.5+ and patched 2.4)
- modprobe -s -k dm-mod >/dev/null 2>&1
+ /sbin/modprobe -s -k dm-mod >/dev/null 2>&1
lvmignorelock=""
fi
@@ -663,7 +663,7 @@
# Add raid devices
if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ] || [ -f /etc/raidtab ]; then
- modprobe -s md >/dev/null 2>&1
+ /sbin/modprobe -s md >/dev/null 2>&1
if [ -f /proc/mdstat ]; then
goraidtab=1
golvm=0
@@ -974,7 +974,7 @@
if grep -qv ' 9 st' /proc/devices 2>/dev/null; then
if [ -n "$USEMODULES" ] ; then
# Try to load the module. If it fails, ignore it...
- insmod -p st >/dev/null 2>&1 && modprobe -s st >/dev/null 2>&1
+ insmod -p st >/dev/null 2>&1 && /sbin/modprobe -s st >/dev/null 2>&1
fi
fi
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br (original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-br Sun Apr 12 13:21:08 2009
@@ -38,7 +38,7 @@
fi
# load bridge module
-is_module "bridge" && modprobe -s -k bridge
+is_module "bridge" && /sbin/modprobe -s -k bridge
# set all major variables
setup_ip_param
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp (original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-ppp Sun Apr 12 13:21:08 2009
@@ -41,7 +41,7 @@
fi
# modprobe ppp modules (udev case)
-[ ! -e /dev/ppp ] && modprobe -s -k char-major-108
+[ ! -e /dev/ppp ] && /sbin/modprobe -s -k char-major-108
opts="lock"
@@ -51,7 +51,7 @@
if [ -n "${PPPOE_DEV}" ]; then
if is_yes "${PPPOE_KERNEL}"; then
- modprobe -s -k pppoe
+ /sbin/modprobe -s -k pppoe
MODEMMODE="plugin rp-pppoe.so"
MODEMPORT="${PPPOE_DEV}"
else
@@ -79,8 +79,8 @@
MODEMPORT="pppoa -I ${PPPOA_IFACE} ${PPPOA_OPT}"
elif is_yes "${PPPOA_SPEEDTOUCH}"; then
if is_yes "${PPPOA_KERNEL}"; then
- modprobe -s -k speedtch
- modprobe -s -k pppoatm
+ /sbin/modprobe -s -k speedtch
+ /sbin/modprobe -s -k pppoatm
if [ -n "${PPPOA_FIRMWARE}" ]; then
modem_run -k -s -f "${PPPOA_FIRMWARE}"
fi
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan (original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/ifup-vlan Sun Apr 12 13:21:08 2009
@@ -51,7 +51,7 @@
exit 1
fi
-modprobe -s -k 8021q
+/sbin/modprobe -s -k 8021q
if [ ! -e /proc/net/vlan/config ]; then
nls "VLAN kernel support is missing. Can't continue."
Modified: rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup
==============================================================================
--- rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup (original)
+++ rc-scripts/branches/busybox/sysconfig/network-scripts/tnlup Sun Apr 12 13:21:08 2009
@@ -57,16 +57,16 @@
sit|four)
is_no "${IPV6_NETWORKING}" && exit 0
is_no "${IPV6_TUNNELCONFIG}" && exit 0
- [ "${MODE}" = "sit" ] && is_module "sit" && modprobe -s -k sit
- [ "${MODE}" = "four" ] && is_module "fourtun" && modprobe -s -k fourtun
+ [ "${MODE}" = "sit" ] && is_module "sit" && /sbin/modprobe -s -k sit
+ [ "${MODE}" = "four" ] && is_module "fourtun" && /sbin/modprobe -s -k fourtun
;;
ipip)
is_no "${IPV4_NETWORKING}" && exit 0
- is_module "ipip" && modprobe -s -k ipip
+ is_module "ipip" && /sbin/modprobe -s -k ipip
;;
gre)
is_no "${IPV4_NETWORKING}" && exit 0
- is_module "ip_gre" && modprobe -s -k ip_gre
+ is_module "ip_gre" && /sbin/modprobe -s -k ip_gre
;;
ipxip|ipipx)
is_no "${IPX}" && exit 0
More information about the pld-cvs-commit
mailing list