Update of /cvsroot/netadm/gwc/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26831/scripts
Modified Files:
gwc install.sh
Log Message:
MOD:
MOD: install sysktimer in install.sh
MOD: some ugly code of logging in install.sh
MOD: add rm/insmod code for sysktimer
MOD: renaming macro var in sysioctl.h
Index: gwc
===================================================================
RCS file: /cvsroot/netadm/gwc/scripts/gwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gwc 19 Feb 2006 21:59:59 -0000 1.3
--- gwc 28 Feb 2006 00:52:07 -0000 1.4
***************
*** 181,184 ****
--- 181,185 ----
start gwcadmd
start gwcguid
+ insmod ${MODDIR}/sysktimer.ko
insmod ${MODDIR}/pf.ko debug=0
reload ip_tables
***************
*** 200,203 ****
--- 201,205 ----
stop gwcguid
rmmod pf
+ rmmod sysktimer
rmmod ipt_MASQUERADE
rmmod iptable_mangle
Index: install.sh
===================================================================
RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** install.sh 26 Feb 2006 16:43:29 -0000 1.11
--- install.sh 28 Feb 2006 00:52:07 -0000 1.12
***************
*** 131,134 ****
--- 131,135 ----
$DIALOG --msgbox "${ERROR}" 20 75 || acex 0
abort_install
+ log "$ERROR"
exit 1
fi
***************
*** 236,239 ****
--- 237,241 ----
${INST} -m 700 -o root -g root gwcadmd/gwcadmd ${BINDIR}
${INST} -m 644 -o root -g root pf/pf.ko ${MODDIR}
+ ${INST} -m 644 -o root -g root pf/sysktimer.ko ${MODDIR}
${INST} -m 700 -o root -g root scripts/${RUNSHELL} ${BINDIR}
${INST} -m 644 -o root -g root scripts/syslog.conf /etc
***************
*** 255,258 ****
--- 257,261 ----
sleep 2
abort_install
+ log "$ERROR"
exit 1
fi
***************
*** 275,279 ****
sleep 2
abort_install
! log "gwccli binary does not exist , abort ..."
exit 1
fi
--- 278,282 ----
sleep 2
abort_install
! log "$ERROR"
exit 1
fi
***************
*** 284,288 ****
sleep 2
abort_install
! log "gwcguid binary does not exist , abort install ..."
exit 1
fi
--- 287,291 ----
sleep 2
abort_install
! log "$ERROR"
exit 1
fi
***************
*** 293,297 ****
sleep 2
abort_install
! log "gwcadmd binary does not exist , abort ..."
exit 1
fi
--- 296,300 ----
sleep 2
abort_install
! log "$ERROR"
exit 1
fi
***************
*** 303,307 ****
sleep 2
abort_install
! log "pf.ko does not exist , abort ..."
exit 1
fi
--- 306,319 ----
sleep 2
abort_install
! log "$ERROR"
! exit 1
! fi
!
! if [ ! -f pf/sysktimer.ko ]; then
! ERROR="sysktimer module does not exist, compile first! abort install ..."
! $DIALOG --infobox "${ERROR}" 5 75
! sleep 2
! abort_install
! log "$ERROR"
exit 1
fi
***************
*** 313,317 ****
sleep 2
abort_install
! log "gwc binary does not exist , abort ..."
exit 1
fi
--- 325,329 ----
sleep 2
abort_install
! log "$ERROR"
exit 1
fi
***************
*** 322,326 ****
sleep 2
abort_install
! log "iproute tools does not exist , abort ..."
exit 1
fi
--- 334,338 ----
sleep 2
abort_install
! log "$ERROR"
exit 1
fi
***************
*** 331,335 ****
sleep 2
abort_install
! log "iproute tools does not exist , abort ..."
exit 1
fi
--- 343,347 ----
sleep 2
abort_install
! log "$ERROR"
exit 1
fi
***************
*** 343,347 ****
sleep 2
abort_install
! log "config file does not exist , abort install ..."
exit 1
fi
--- 355,359 ----
sleep 2
abort_install
! log "$ERROR"
exit 1
fi
***************
*** 517,521 ****
sleep 2
abort_install
! log "Can't support for OS: ${OS}" >&2
exit 1
fi
--- 529,533 ----
sleep 2
abort_install
! log "$ERROR" >&2
exit 1
fi
***************
*** 525,529 ****
$DIALOG --infobox "${ERROR}" 5 75 || acex 0
sleep 2
! log "Already installed, abort ...">&2
exit 1
fi
--- 537,541 ----
$DIALOG --infobox "${ERROR}" 5 75 || acex 0
sleep 2
! log "$ERROR">&2
exit 1
fi
|
