Author: hawk
Date: Fri Aug 7 19:42:23 2009
New Revision: 10460
Modified:
rc-scripts/trunk/rc.d/rc.sysinit
rc-scripts/trunk/sysconfig/network-scripts/functions.network
rc-scripts/trunk/sysconfig/network-scripts/ifup-br
rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
rc-scripts/trunk/sysconfig/network-scripts/ifup-sl
rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan
rc-scripts/trunk/sysconfig/network-scripts/tnlup
Log:
- '-k' is no longer valid modprobe switch
Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit (original)
+++ rc-scripts/trunk/rc.d/rc.sysinit Fri Aug 7 19:42:23 2009
@@ -305,7 +305,7 @@
if ! strstr "$cmdline" "nousb" && ! is_fsmounted usbfs /proc/bus/usb ;
then
aliases=$(/sbin/modprobe -c | awk '/^alias[\t ]+usb-controller/
{ print $3 }')
if [ -n "$aliases" -a "$aliases" != "off" ] ; then
- /sbin/modprobe -s -k usbcore
+ /sbin/modprobe -s usbcore
for alias in $aliases ; do
[ "$alias" = "off" ] && continue
run_cmd "$(nls 'Initializing USB controller')
($alias)" /sbin/modprobe -s $alias
@@ -426,7 +426,7 @@
run_cmd "Setting up ISA PNP devices (userspace pnp)"
/sbin/isapnp /etc/isapnp/isapnp.conf
fi
if ! is_no "$RUN_KERNELPNP"; then
- /sbin/modprobe -k isa-pnp 2> /dev/null
+ /sbin/modprobe isa-pnp 2> /dev/null
if [ -e /proc/isapnp -a -f
/etc/isapnp/isapnp-kernel.conf ]; then
show "Setting up ISA PNP devices (kernelspace
pnp)"; busy
grep -v "^#" /etc/isapnp/isapnp-kernel.conf
2>/dev/null >/proc/isapnp && (deltext; ok) || (deltext; fail)
@@ -559,7 +559,7 @@
# Load usb storage here, to match most other things
if [ -n "$needusbstorage" ]; then
- modprobe -k usb-storage >/dev/null 2>&1
+ modprobe usb-storage >/dev/null 2>&1
fi
# Load firewire devices
@@ -618,19 +618,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
+ modprobe -s evms > /dev/null 2>&1
+ modprobe -s evms_passthru > /dev/null 2>&1
+ modprobe -s ldev_mgr > /dev/null 2>&1
+ modprobe -s dos_part > /dev/null 2>&1
else
# Linux 2.6 core module
- modprobe -s -k evmscore > /dev/null 2>&1
+ modprobe -s 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" && modprobe -s gpt_part >/dev/null
2>&1
+ is_yes "$EVMS_LVM" && modprobe -s lvm_vge >/dev/null 2>&1
+ is_yes "$EVMS_AIX" && modprobe -s AIXlvm_vge >/dev/null 2>&1
+ is_yes "$EVMS_OS2" && modprobe -s 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
@@ -644,15 +644,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
+ modprobe -s lvm-mod >/dev/null 2>&1
lvmignorelock=""
elif [ "$lvmversion" = "2" ] ; then
- modprobe -s -k dm-mod >/dev/null 2>&1
+ modprobe -s dm-mod >/dev/null 2>&1
lvmignorelock="--ignorelockingfailure"
else
- modprobe -s -k lvm-mod >/dev/null 2>&1
+ modprobe -s lvm-mod >/dev/null 2>&1
# device mapper (2.5+ and patched 2.4)
- modprobe -s -k dm-mod >/dev/null 2>&1
+ modprobe -s dm-mod >/dev/null 2>&1
lvmignorelock=""
fi
Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network
(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network Fri Aug
7 19:42:23 2009
@@ -166,7 +166,7 @@
{
if is_yes "$STATIC_RARP"; then
if [ ! -e /proc/net/rarp ]; then
- _modprobe single -k rarp
+ _modprobe single rarp
fi
if [ -r /etc/ethers -a -x /sbin/rarp ]; then
run_cmd "Setting static RARP entries" /sbin/rarp -f
/etc/ethers
@@ -343,11 +343,11 @@
modprobe_net()
{
if is_yes "$IPV6_NETWORKING" && is_module "ipv6"; then
- _modprobe single -k ipv6
+ _modprobe single ipv6
fi
if is_yes "$IPX" && is_module "ipx"; then
- _modprobe single -k ipx
+ _modprobe single ipx
fi
}
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-br
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-br (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-br Fri Aug 7 19:42:23 2009
@@ -38,7 +38,7 @@
fi
# load bridge module
-is_module "bridge" && modprobe -s -k bridge
+is_module "bridge" && modprobe -s bridge
# set all major variables
setup_ip_param
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp Fri Aug 7 19:42:23 2009
@@ -41,7 +41,7 @@
fi
# modprobe ppp modules (udev case)
-[ ! -e /dev/ppp ] && modprobe -s -k char-major-108
+[ ! -e /dev/ppp ] && modprobe -s char-major-108
opts="lock"
@@ -51,7 +51,7 @@
if [ -n "${PPPOE_DEV}" ]; then
if is_yes "${PPPOE_KERNEL}"; then
- modprobe -s -k pppoe
+ modprobe -s 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
+ modprobe -s speedtch
+ modprobe -s pppoatm
if [ -n "${PPPOA_FIRMWARE}" ]; then
modem_run -k -s -f "${PPPOA_FIRMWARE}"
fi
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-sl
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-sl (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-sl Fri Aug 7 19:42:23 2009
@@ -35,7 +35,7 @@
# Try to load slip module
if is_module "slip"; then
- /sbin/modprobe -s -k slip
+ /sbin/modprobe -s slip
fi
# we can use dip or direct slip connection via slattach
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan Fri Aug 7
19:42:23 2009
@@ -51,7 +51,7 @@
exit 1
fi
-modprobe -s -k 8021q
+modprobe -s 8021q
if [ ! -e /proc/net/vlan/config ]; then
nls "VLAN kernel support is missing. Can't continue."
Modified: rc-scripts/trunk/sysconfig/network-scripts/tnlup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/tnlup (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/tnlup Fri Aug 7 19:42:23 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" && modprobe -s sit
+ [ "${MODE}" = "four" ] && is_module "fourtun" && modprobe -s fourtun
;;
ipip)
is_no "${IPV4_NETWORKING}" && exit 0
- is_module "ipip" && modprobe -s -k ipip
+ is_module "ipip" && modprobe -s ipip
;;
gre)
is_no "${IPV4_NETWORKING}" && exit 0
- is_module "ip_gre" && modprobe -s -k ip_gre
+ is_module "ip_gre" && modprobe -s ip_gre
;;
ipxip|ipipx)
is_no "${IPX}" && exit 0
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
