| /scripts/alcasar-conf.sh |
|---|
| 79,11 → 79,11 |
| mkdir $DIR_UPDATE/etc/ |
| cp -rf $DIR_ETC/* $DIR_UPDATE/etc/ |
| # particularité des versions |
| rm -f $DIR_UPDATE/etc/alcasar-macallowed # macallowed is replaced with macauth |
| # si version <= 2.0 |
| if [ $MAJ_RUNNING_VERSION -lt 2 ] || ([ $MAJ_RUNNING_VERSION -eq 2 ] && [ $MIN_RUNNING_VERSION -eq 0 ]) |
| then |
| rm -f $DIR_UPDATE/etc/alcasar-dns-name # changement de format |
| rm -f $DIR_UPDATE/etc/alcasar-macallowed # ajout d'un commentaire par @MAC |
| rm -rf $DIR_UPDATE/etc/digest # hostname=alcasar |
| if [ -e $DIR_UPDATE/etc/alcasar-uamallowed ]; then |
| uamallowed=`cat $DIR_UPDATE/etc/alcasar-uamallowed` |
| /scripts/sbin/alcasar-uninstall.sh |
|---|
| 78,6 → 78,7 |
| sleep 1 |
| #param_chilli |
| [ -e /etc/chilli/alcasar-macallowed ] && rm /etc/chilli/alcasar-macallowed # if 2.7 and later, macallowed is replaced with macauth |
| if [ -e /etc/chilli.conf.default ] # >= V2.0 |
| then |
| echo -en "\n- param_chilli(2) : " |
| 84,13 → 85,12 |
| [ -e /etc/init.d/chilli.default ] && mv /etc/init.d/chilli.default /etc/init.d/chilli && echo -n "1, " |
| [ -e /etc/chilli.conf.default ] && mv /etc/chilli.conf.default /etc/chilli.conf && echo -n "2" |
| else # < V2.0 |
| echo -en "\n- param_chilli(6) : " |
| echo -en "\n- param_chilli(5) : " |
| [ -e /etc/chilli/functions.default ] && mv /etc/chilli/functions.default /etc/chilli/functions && echo -n "1, " |
| [ -e /etc/chilli/config ] && rm /etc/chilli/config && echo -n "2, " |
| [ -e /etc/chilli/alcasar-uamallowed ] && rm /etc/chilli/alcasar-uamallowed && echo -n "3, " |
| [ -e /etc/chilli/alcasar-uamdomain ] && rm /etc/chilli/alcasar-uamdomain && echo -n "4, " |
| [ -e /etc/chilli/alcasar-macallowed ] && rm /etc/chilli/alcasar-macallowed && echo -n "5, " |
| [ -e /etc/init.d/chilli.default ] && mv /etc/init.d/chilli.default /etc/init.d/chilli && echo -n "6" |
| [ -e /etc/init.d/chilli.default ] && mv /etc/init.d/chilli.default /etc/init.d/chilli && echo -n "5" |
| fi |
| sleep 1 |
| /scripts/sbin/alcasar-dhcp.sh |
|---|
| 9,9 → 9,17 |
| # enable or disable the DHCP service on consultation LAN |
| SED="/bin/sed -i" |
| CHILLI_CONF_FILE="/etc/chilli.conf" |
| ALCASAR_CONF_FILE="/usr/local/etc/alcasar.conf" |
| CHILLI_CONF_FILE="/etc/chilli.conf" |
| ETHERS_FILE="/usr/local/etc/alcasar-ethers" |
| PRIVATE_IP_MASK=`grep PRIVATE_IP $ALCASAR_CONF_FILE|cut -d"=" -f2` |
| PRIVATE_IP=`echo $PRIVATE_IP_MASK | cut -d"/" -f1` |
| PRIVATE_NETMASK=`/bin/ipcalc -m $PRIVATE_IP_MASK | cut -d"=" -f2` |
| PRIVATE_PREFIX=`/bin/ipcalc -p $PRIVATE_IP $PRIVATE_NETMASK |cut -d"=" -f2` |
| PRIVATE_NETWORK=`/bin/ipcalc -n $PRIVATE_IP $PRIVATE_NETMASK| cut -d"=" -f2` |
| PRIVATE_NETWORK_MASK=$PRIVATE_NETWORK/$PRIVATE_PREFIX |
| usage="Usage: alcasar-dhcp.sh {--on | -on} | {--off | -off}" |
| nb_args=$# |
| args=$1 |
| 25,17 → 33,20 |
| echo "$usage" |
| exit 0 |
| ;; |
| -on|-on) # enable DHCP service |
| $SED "s?^#statip.*?statip?g" $CHILLI_CONF_FILE |
| $SED "s?^dhcpif.*?#dhcpif\teth1?g" $CHILLI_CONF_FILE |
| $SED "s?^dynip.*?#dynip\t$network?g" $CHILLI_CONF_FILE |
| $SED "s?^DHCP.*?DHCP=on?g" $ALCASAR_CONF_FILE |
| /etc/init.d/chilli restart |
| ;; |
| --off|-off) # disable DHCP service |
| $SED "s?^#statip.*?statip\t\t$PRIVATE_NETWORK_MASK?g" $CHILLI_CONF_FILE |
| $SED "s?^#nodynip.*?nodynip?g" $CHILLI_CONF_FILE |
| $SED "s?^ethers.*?#ethers\t\t$ETHERS_FILE?g" $CHILLI_CONF_FILE |
| $SED "s?^DHCP.*?DHCP=off?g" $ALCASAR_CONF_FILE |
| /etc/init.d/chilli restart |
| ;; |
| --on|-on) # enable DHCP service |
| $SED "s?^statip.*?#statip\t\t$PRIVATE_NETWORK_MASK?g" $CHILLI_CONF_FILE |
| $SED "s?^nodynip.*?#nodynip?g" $CHILLI_CONF_FILE |
| $SED "s?^#ethers.*?ethers\t\t$ETHERS_FILE?g" $CHILLI_CONF_FILE |
| $SED "s?^DHCP.*?DHCP=on?g" $ALCASAR_CONF_FILE |
| /etc/init.d/chilli restart |
| ;; |
| *) |
| echo "Argument inconnu :$1"; |
| echo "$usage" |