Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD

1 files changed, 12 insertions, 14 deletions

diff --git a/abs/core-testing/etcnet/PKGBUILD b/abs/core-testing/etcnet/PKGBUILD
index 4b7e386..5b9ba2f 100755
--- a/abs/core-testing/etcnet/PKGBUILD
+++ b/abs/core-testing/etcnet/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=etcnet
-pkgver=0.9.7
-pkgrel=11
+pkgver=0.9.8
+pkgrel=5
 pkgdesc="/etc/net network configuration subsystem"
 url="http://etcnet.org/"
 depends=('bash' 'grep' 'sed' 'iproute' 'wireless_tools' 'iptables' 'dhcpcd')
@@ -13,20 +13,15 @@ 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
-
+  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
 
-   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
-#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
@@ -35,5 +30,8 @@ build() {
   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
    
 }