From f26d82170aa7aaa0ea704d214e4793cb0d20862a Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Mon, 21 Mar 2005 08:55:11 +0000 Subject: [PATCH] r9: --- README.CARNet | 2 +- debian/control | 2 +- functions.sh | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.CARNet b/README.CARNet index 6c82673..21b9dbc 100644 --- a/README.CARNet +++ b/README.CARNet @@ -22,7 +22,7 @@ cp_get_ifmask Funkcija vraca IP netmask mreznog sucelja. U slucaju da nije naveden kao argument, vraca IP netmask od loopback sucelja (lo). -cp_get_cidr +cp_get_netaddr Funkcija vraca podmrezu mreznog sucelja u CIDR obliku. U slucaju da nije naveden argument, vraca CIDR sucelja preko diff --git a/debian/control b/debian/control index bb95368..585a8ed 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1 Package: carnet-tools-cn Architecture: all -Depends: perl, coreutils, debianutils, gawk, ipcalc, net-tools +Depends: perl, coreutils, debianutils, awk, ipcalc, net-tools Description: CARNet tools for Debian packaging CARNet tools for Debian packaging. Include: - functions.sh diff --git a/functions.sh b/functions.sh index 8c2ec00..45d15e2 100644 --- a/functions.sh +++ b/functions.sh @@ -61,7 +61,7 @@ cp_get_ifdefault() { } # by ico, Tue, 15 Mar 2005 14:04:21 +0100 -cp_get_cidr() { +cp_get_netaddr() { [ "$CP_SCRIPT_DEBUG" ] && set -vx local netmask ipaddress interface cidr echo_return echo_return="$CP_ECHO_RETURN" # since we're making our own calls @@ -77,20 +77,20 @@ cp_get_cidr() { fi if ! ifconfig $interface 2> /dev/null >> /dev/null; then - [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such interface" + [ "$CP_VERBOSE" ] || echo "cp_get_netaddr: $interface: No such interface" goto return1 fi cp_get_ifaddr "$interface" ipaddress="$RET" if [ -z $ipaddress ]; then - [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such ipaddress" + [ "$CP_VERBOSE" ] || echo "cp_get_netaddr: $interface: No such ipaddress" goto return1 fi cp_get_ifmask "$interface" netmask="$RET" if [ -z $netmask ]; then - [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such netmask" + [ "$CP_VERBOSE" ] || echo "cp_get_netaddr: $interface: No such netmask" fi if [ "$netmask" = "255.255.255.255" ]; then @@ -111,7 +111,7 @@ cp_get_cidr() { # by ico, Tue, 15 Mar 2005 14:04:21 +0100 cp_backup_conffile() { - [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx + [ "$CP_SCRIPT_DEBUG" ] && set -vx local file_bak if [ -z $1 ]; then -- 1.7.10.4