Stephen Gildea:
> > I think it should report if it fails to unload a module which is
> > loaded, ...
>
> Then how about this patch instead. It outputs error messages if
> modules fail to unload.
Looks good.
> --- pcmcia-cs-3.2.5/etc/rc.pcmcia 2005-07-21 12:01:28.000000000 -0700
> +++ etc/rc.pcmcia 2005-07-22 23:52:53.000000000 -0700
> @@ -96,6 +96,12 @@ load_module()
> module_is_loaded $1 || modprobe $@
> }
>
> +# returns 0 iff module was loaded and is now removed
> +remove_module()
> +{
> + module_is_loaded "$1" && /sbin/rmmod "$1"
> +}
> +
>
> EXITCODE=1
> for x in "1" ; do
> @@ -178,12 +184,11 @@ stop)
> done
> fi
> killall -q "CardBus Watcher"
> - if module_is_loaded ds ; then
> - /sbin/rmmod ds
> - /sbin/rmmod $PCIC 2>/dev/null || \
> - /sbin/rmmod yenta_socket 2>/dev/null
> - /sbin/rmmod pcmcia_core 2>/dev/null
> - fi
> + remove_module ds
> + remove_module pcmcia
> + remove_module "$PCIC" || remove_module yenta_socket
> + remove_module rsrc_nonstatic
> + remove_module pcmcia_core
> echo "done."
> rm -f /var/lock/subsys/pcmcia
> EXITCODE=0
>
--
Pelle
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
