summaryrefslogtreecommitdiffstats
path: root/abs/core/etcnet
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/etcnet')
-rw-r--r--abs/core/etcnet/10-defaults7
-rwxr-xr-xabs/core/etcnet/PKGBUILD36
-rwxr-xr-xabs/core/etcnet/etcnet.install17
-rw-r--r--abs/core/etcnet/functions.patch9
4 files changed, 41 insertions, 28 deletions
diff --git a/abs/core/etcnet/10-defaults b/abs/core/etcnet/10-defaults
index 42a7879..3aeac58 100644
--- a/abs/core/etcnet/10-defaults
+++ b/abs/core/etcnet/10-defaults
@@ -1,6 +1,11 @@
DHCP_CLIENT=/sbin/dhcpcd
+DHCP_ARGS=-L
IP=/usr/sbin/ip
TC=/usr/sbin/tc
LSMOD=/bin/lsmod
-IFGROUP[1]='eth wlan plip usb dvb bnep tuntap'
+IFGROUP[1]='eth wlan plip usb dvb bnep tuntap ath0'
+IFRENAME=/usr/sbin/ifrename
+IPTABLES=/usr/sbin/iptables
+IP6TABLES=/usr/sbin/ip6tables
+AUTO_BROADCAST=on
diff --git a/abs/core/etcnet/PKGBUILD b/abs/core/etcnet/PKGBUILD
index 798213e..e9ac4f4 100755
--- a/abs/core/etcnet/PKGBUILD
+++ b/abs/core/etcnet/PKGBUILD
@@ -1,39 +1,37 @@
pkgname=etcnet
-pkgver=0.9.7
-pkgrel=2
+pkgver=0.9.8
+pkgrel=13
pkgdesc="/etc/net network configuration subsystem"
url="http://etcnet.org/"
-depends=('bash' 'grep' 'sed' 'iproute' 'wireless_tools' 'iptables' 'dhcpcd')
+depends=('bash' 'grep' 'sed' 'iproute2' 'wireless_tools' 'iptables' 'dhcpcd')
arch=i686
install=etcnet.install
source=(http://etcnet.org/files/$pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address )
+#backup=(etc/net/ifaces/eth0/options etc/net/ifaces/eth0/ipv4route etc/net/ifaces/eth0/ipv4address)
build() {
cd $startdir/src/$pkgname-$pkgver
mkdir -p $startdir/pkg/var/lib/etcnet
mkdir -p $startdir/pkg/etc/sysconfig
-
-
-
-
-
- #cp $startdir/src/functions.patch ./etc/net
cd etc/net
- patch -p0 < $startdir/src/functions.patch
-
-
- install -D -m 644 $startdir/src/10-defaults $startdir/pkg/etc/net/options.d/10-defaults
- install -D -m 644 $startdir/src/network $startdir/pkg/etc/sysconfig/network
-# install -D -m 644 ../options $startdir/pkg/etc/net/ifaces/default/options
+ patch -p0 < $startdir/src/functions.patch || return 1
+
+ install -D -m 644 $startdir/src/10-defaults $startdir/pkg/etc/net/options.d/10-defaults
+ install -D -m 644 $startdir/src/network $startdir/pkg/etc/sysconfig/network
+ cp -rp $startdir/src/$pkgname-$pkgver/docs $startdir/pkg/etc/net
+ cp -rp $startdir/src/$pkgname-$pkgver/examples $startdir/pkg/etc/net
-#setup default for eth0
+ #setup default for eth0
mkdir -p $startdir/pkg/etc/net/ifaces/eth0
- cp $startdir/src/options $startdir/pkg/etc/net/ifaces/eth0/options
- cp $startdir/src/ipv4route $startdir/pkg/etc/net/ifaces/eth0/ipv4route
- cp $startdir/src/ipv4address $startdir/pkg/etc/net/ifaces/eth0/ipv4address
+# cp $startdir/src/options $startdir/pkg/etc/net/ifaces/eth0/options
+# cp $startdir/src/ipv4route $startdir/pkg/etc/net/ifaces/eth0/ipv4route
+# cp $startdir/src/ipv4address $startdir/pkg/etc/net/ifaces/eth0/ipv4address
cd $startdir/src/$pkgname-$pkgver
rm -Rf etc/sysconfig etc/net/{README.ALT,TODO,ChangeLog,ifaces/unknown}
cp -Rf etc $startdir/pkg
+ cd $startdir/pkg/etc/net/scripts
+ ln -s ifup-ifplugd ifup-wireless
+ ln -s ifdown-ifplugd ifdown-wireless
}
diff --git a/abs/core/etcnet/etcnet.install b/abs/core/etcnet/etcnet.install
index 2605e95..f34629f 100755
--- a/abs/core/etcnet/etcnet.install
+++ b/abs/core/etcnet/etcnet.install
@@ -4,7 +4,11 @@
# arg 1: the new package version
pre_install() {
/bin/cp -Rf /etc/net /etc/net.pacsave >/dev/null 2>&1
- /bin/true
+ if [ ! -d /var/lock/subsys ]
+ then
+ mkdir -p /var/lock/subsys
+ fi
+
}
# arg 1: the new package version
@@ -17,13 +21,20 @@ post_install() {
# arg 2: the old package version
pre_upgrade() {
/bin/cp -Rf /etc/net /etc/net.pacsave >/dev/null 2>&1
- /bin/true
+ if [ ! -d /var/lock/subsys ]
+ then
+ mkdir -p /var/lock/subsys
+ fi
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
- /bin/true
+ if [ -f /etc/net/ifaces/eth0/options.pacsave ]
+ then
+ systemconfig.py -m network
+ mv /etc/net/ifaces/eth0/options.pacsave /etc/net/ifaces/eth0/options.pacsave.orig
+ fi
}
# arg 1: the old package version
diff --git a/abs/core/etcnet/functions.patch b/abs/core/etcnet/functions.patch
index c2321b6..855ef90 100644
--- a/abs/core/etcnet/functions.patch
+++ b/abs/core/etcnet/functions.patch
@@ -1,12 +1,11 @@
---- scripts/functions.orig 2008-09-02 03:10:21.000000000 +0000
-+++ scripts/functions 2008-09-02 03:10:49.000000000 +0000
-@@ -16,7 +16,8 @@
+--- scripts/functions.orig 2009-06-14 17:24:46.000000000 +0000
++++ scripts/functions 2009-06-14 17:25:24.000000000 +0000
+@@ -16,7 +16,7 @@
DEFAULT_IFPLUGSTATUS=/usr/sbin/ifplugstatus
DEFAULT_IFPLUGD=/usr/sbin/ifplugd
DEFAULT_IWPRIV=/sbin/iwpriv
-DEFAULT_IWCONFIG=/sbin/iwconfig
-+#DEFAULT_IWCONFIG=/sbin/iwconfig
+DEFAULT_IWCONFIG=/usr/sbin/iwconfig
+ DEFAULT_WLANCONFIG=/usr/sbin/wlanconfig
DEFAULT_WPA_SUPPLICANT=/usr/sbin/wpa_supplicant
DEFAULT_WPA_CLI=/usr/sbin/wpa_cli
- DEFAULT_PLIPCONFIG=/sbin/plipconfig