Commit d4448069 authored by Konstantin Baev's avatar Konstantin Baev

Some comments removed (because we use git...)

parent 4088cecb
...@@ -84,7 +84,6 @@ rm -f $BUILDDIR/$MODULEFILENAME ...@@ -84,7 +84,6 @@ rm -f $BUILDDIR/$MODULEFILENAME
make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR clean make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR clean
make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR modules $MAKESMP make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR modules $MAKESMP
#[ "$KERVER" = "2.4" ] && MODULENAME=$MODULENAME.o || MODULENAME=$MODULENAME.ko
test -r "$BUILDDIR/$MODULEFILENAME" || { echo "can't locate built module $MODULEFILENAME, continue" ; exit 1 ; } test -r "$BUILDDIR/$MODULEFILENAME" || { echo "can't locate built module $MODULEFILENAME, continue" ; exit 1 ; }
strip --strip-debug --discard-all $BUILDDIR/$MODULEFILENAME strip --strip-debug --discard-all $BUILDDIR/$MODULEFILENAME
...@@ -92,6 +91,5 @@ echo "Copying built module to $INSTALL_MOD_PATH" ...@@ -92,6 +91,5 @@ echo "Copying built module to $INSTALL_MOD_PATH"
mkdir -p $INSTALL_MOD_PATH mkdir -p $INSTALL_MOD_PATH
install -m 644 -o root -g root $BUILDDIR/$MODULEFILENAME $INSTALL_MOD_PATH/ || exit 1 install -m 644 -o root -g root $BUILDDIR/$MODULEFILENAME $INSTALL_MOD_PATH/ || exit 1
depmod -ae || exit 1 depmod -ae || exit 1
#echo "$MODULENAME build correctly"
exit 0 exit 0
...@@ -19,9 +19,6 @@ INSMOD=/sbin/insmod ...@@ -19,9 +19,6 @@ INSMOD=/sbin/insmod
ORIGMODULENAME=cifs ORIGMODULENAME=cifs
MODULENAME=etercifs MODULENAME=etercifs
# current module or manually built
#MODULEPATH=`echo /lib/modules/$(uname -r)/kernel/fs/cifs/$MODULENAME.*`
OUTFORMAT=/etc/init.d/outformat OUTFORMAT=/etc/init.d/outformat
[ -x $OUTFORMAT ] || OUTFORMAT=/etc/init.d/etercifs.outformat [ -x $OUTFORMAT ] || OUTFORMAT=/etc/init.d/etercifs.outformat
...@@ -116,22 +113,13 @@ load_module() ...@@ -116,22 +113,13 @@ load_module()
{ {
local i local i
if is_origmoduled ; then if is_origmoduled ; then
#test -r /proc/fs/cifs/Etersoft && { passed ; return ; }
umount_cifs umount_cifs
echo -n "Removing CIFS kernel module... " echo -n "Removing CIFS kernel module... "
$RMMOD $ORIGMODULENAME || { failure ; return ; } $RMMOD $ORIGMODULENAME || { failure ; return ; }
fi fi
# Preload module dependencies
#$MODPROBE nls_base 2>/dev/null
# kernel depends
# || { echo -n "nls_base is not loaded" ; failure ; }
echo -n "Loading CIFS kernel module... " echo -n "Loading CIFS kernel module... "
$MODPROBE $MODULENAME && { success ; return ; } $MODPROBE $MODULENAME && { success ; return ; }
#if [ -r "$MODULEPATH" ] ; then
# $INSMOD $MODULEPATH && { echo ; echo -n " insmod $MODULEPATH" ; success ; return ; }
# echo -n "Incorrect module. Your system: " ; uname -a ; dmesg | tail -n2
#fi
echo -n "$MODULENAME from Etersoft is not found, " echo -n "$MODULENAME from Etersoft is not found, "
echo -n "you can try compile it with 'service etercifs build' command." echo -n "you can try compile it with 'service etercifs build' command."
failure failure
...@@ -141,11 +129,6 @@ start() ...@@ -141,11 +129,6 @@ start()
{ {
load_module load_module
if is_moduled ; then if is_moduled ; then
# test -r /proc/fs/cifs/Etersoft 2>/dev/null || { echo -n "Check CIFS for Etersoft extensions... " ; failure ; return ; }
# echo -n "Enable Etersoft extensions for CIFS..."
# echo 1 > /proc/fs/cifs/Etersoft && success || failure
# echo -n "Disable Linux extensions for CIFS..."
# echo 0 > /proc/fs/cifs/LinuxExtensionsEnabled && success || failure
test -n "$WASCIFS" && mount_cifs || : test -n "$WASCIFS" && mount_cifs || :
else else
failure failure
...@@ -159,30 +142,17 @@ stop() ...@@ -159,30 +142,17 @@ stop()
is_moduled || { passed ; return ; } is_moduled || { passed ; return ; }
$RMMOD $MODULENAME || { failure ; echo "You have to umount all CIFS resources."; return ; } $RMMOD $MODULENAME || { failure ; echo "You have to umount all CIFS resources."; return ; }
success success
} }
status() status()
{ {
local PRECOMP local PRECOMP
echo "CIFS module status:" echo "CIFS module status:"
# FIXME
#if [ "$DEFMODULEPATH" = "$MANMODULEPATH" ] ; then
#PRECOMP="manually built"
#else
#PRECOMP="precompiled"
#fi
if is_origmoduled ; then if is_origmoduled ; then
echo " origin kernel module $ORIGMODULENAME loaded, Etersoft extensions missed" echo " origin kernel module $ORIGMODULENAME loaded"
fi fi
if is_moduled ; then if is_moduled ; then
#echo " kernel module $MODULENAME is loaded ($PRECOMP)"
# test -d /proc/fs/cifs/ 2>/dev/null || { echo -n "Can't locale /proc/fs/cifs... " ; failure ; }
echo " kernel module $MODULENAME is loaded" echo " kernel module $MODULENAME is loaded"
# echo -n "Etersoft extensions for CIFS enabled..."
# test "`cat /proc/fs/cifs/Etersoft 2>/dev/null`" = "1" && success || failure
# echo -n "Unix extensions for CIFS disabled..."
# test "`cat /proc/fs/cifs/LinuxExtensionsEnabled 2>/dev/null`" = "1" && failure || success
else else
echo " kernel module $MODULENAME is not loaded" echo " kernel module $MODULENAME is not loaded"
fi fi
...@@ -219,9 +189,6 @@ case "$1" in ...@@ -219,9 +189,6 @@ case "$1" in
status status
;; ;;
condrestart) condrestart)
# remove manual built module
# rm -f $MANMODULEPATH
# if [ "`cat /proc/fs/cifs/Etersoft 2>/dev/null`" = "1" ] ; then
if is_moduled ; then if is_moduled ; then
stop stop
start start
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment