[arch-commits] Commit in ifplugd/repos (28 files)
Dave Reisner
dreisner at archlinux.org
Sat Apr 28 18:49:56 UTC 2012
Date: Saturday, April 28, 2012 @ 14:49:56
Author: dreisner
Revision: 157470
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ifplugd/repos/extra-i686/PKGBUILD
(from rev 157469, ifplugd/trunk/PKGBUILD)
ifplugd/repos/extra-i686/ifdown.01-route.sh
(from rev 157469, ifplugd/trunk/ifdown.01-route.sh)
ifplugd/repos/extra-i686/ifplugd
(from rev 157469, ifplugd/trunk/ifplugd)
ifplugd/repos/extra-i686/ifplugd-0.28-interface.patch
(from rev 157469, ifplugd/trunk/ifplugd-0.28-interface.patch)
ifplugd/repos/extra-i686/ifplugd.action
(from rev 157469, ifplugd/trunk/ifplugd.action)
ifplugd/repos/extra-i686/ifup.01-route.sh
(from rev 157469, ifplugd/trunk/ifup.01-route.sh)
ifplugd/repos/extra-i686/ifup.02-ntpdate.sh
(from rev 157469, ifplugd/trunk/ifup.02-ntpdate.sh)
ifplugd/repos/extra-x86_64/PKGBUILD
(from rev 157469, ifplugd/trunk/PKGBUILD)
ifplugd/repos/extra-x86_64/ifdown.01-route.sh
(from rev 157469, ifplugd/trunk/ifdown.01-route.sh)
ifplugd/repos/extra-x86_64/ifplugd
(from rev 157469, ifplugd/trunk/ifplugd)
ifplugd/repos/extra-x86_64/ifplugd-0.28-interface.patch
(from rev 157469, ifplugd/trunk/ifplugd-0.28-interface.patch)
ifplugd/repos/extra-x86_64/ifplugd.action
(from rev 157469, ifplugd/trunk/ifplugd.action)
ifplugd/repos/extra-x86_64/ifup.01-route.sh
(from rev 157469, ifplugd/trunk/ifup.01-route.sh)
ifplugd/repos/extra-x86_64/ifup.02-ntpdate.sh
(from rev 157469, ifplugd/trunk/ifup.02-ntpdate.sh)
Deleted:
ifplugd/repos/extra-i686/PKGBUILD
ifplugd/repos/extra-i686/ifdown.01-route.sh
ifplugd/repos/extra-i686/ifplugd
ifplugd/repos/extra-i686/ifplugd-0.28-interface.patch
ifplugd/repos/extra-i686/ifplugd.action
ifplugd/repos/extra-i686/ifup.01-route.sh
ifplugd/repos/extra-i686/ifup.02-ntpdate.sh
ifplugd/repos/extra-x86_64/PKGBUILD
ifplugd/repos/extra-x86_64/ifdown.01-route.sh
ifplugd/repos/extra-x86_64/ifplugd
ifplugd/repos/extra-x86_64/ifplugd-0.28-interface.patch
ifplugd/repos/extra-x86_64/ifplugd.action
ifplugd/repos/extra-x86_64/ifup.01-route.sh
ifplugd/repos/extra-x86_64/ifup.02-ntpdate.sh
-------------------------------------------+
extra-i686/PKGBUILD | 103 +++++++-------
extra-i686/ifdown.01-route.sh | 6
extra-i686/ifplugd | 201 +++++++++++++++-------------
extra-i686/ifplugd-0.28-interface.patch | 26 +--
extra-i686/ifplugd.action | 59 ++++----
extra-i686/ifup.01-route.sh | 10 -
extra-i686/ifup.02-ntpdate.sh | 4
extra-x86_64/PKGBUILD | 103 +++++++-------
extra-x86_64/ifdown.01-route.sh | 6
extra-x86_64/ifplugd | 201 +++++++++++++++-------------
extra-x86_64/ifplugd-0.28-interface.patch | 26 +--
extra-x86_64/ifplugd.action | 59 ++++----
extra-x86_64/ifup.01-route.sh | 10 -
extra-x86_64/ifup.02-ntpdate.sh | 4
14 files changed, 436 insertions(+), 382 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-i686/PKGBUILD 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,50 +0,0 @@
-# $Id$
-# Contributor: Manolis Tzanidakis
-# Contributor: kevin <kevin at archlinux.org>
-# Maintainer:
-
-pkgname=ifplugd
-pkgver=0.28
-pkgrel=8
-pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
-arch=('i686' 'x86_64')
-url="http://0pointer.de/lennart/projects/ifplugd"
-license=('GPL2')
-depends=('libdaemon' 'bash')
-backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
-options=('!makeflags')
-source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
-md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '70d66121ae5163348855236951e069a2'\
- 'e91a3d77d707ae79fbc10146848032dc' '54eb22844b5aeed161c0b80aa9008570'\
- 'd6ce6c7bd481a0b3944c944c5b277c0b' 'c35f0a637911b747f8dc3bd3c6156a1b'\
- 'f8690ee18a5ca72555585ee96826c2cf')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
- ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
- --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # replace INTERFACES with NET_IFS since AL already uses it in /etc/rc.conf
- sed -i "s:INTERFACES:NET_IFS:g" \
- ${pkgdir}/etc/ifplugd/ifplugd.conf
-
- # replace the default init script & action files with ours.
- install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
- install -D -m755 ${srcdir}/ifplugd.action \
- ${pkgdir}/etc/ifplugd/ifplugd.action
-
- install -Dm755 ${srcdir}/ifdown.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifdown.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.02-ntpdate.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/02-ntpdate.sh
-}
-
Copied: ifplugd/repos/extra-i686/PKGBUILD (from rev 157469, ifplugd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,53 @@
+# $Id$
+# Contributor: Manolis Tzanidakis
+# Contributor: kevin <kevin at archlinux.org>
+# Maintainer:
+
+pkgname=ifplugd
+pkgver=0.28
+pkgrel=9
+pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
+arch=('i686' 'x86_64')
+url="http://0pointer.de/lennart/projects/ifplugd"
+license=('GPL2')
+depends=('libdaemon' 'bash')
+backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
+options=('!makeflags')
+source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
+md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
+ 'ef27f40434ca85ccaf57a7e388eb001e'
+ '6f98767c4ea2cf0580f73ced81efd21a'
+ '54eb22844b5aeed161c0b80aa9008570'
+ 'd6ce6c7bd481a0b3944c944c5b277c0b'
+ 'c35f0a637911b747f8dc3bd3c6156a1b'
+ 'f8690ee18a5ca72555585ee96826c2cf')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
+ --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # replace INTERFACES with NET_IFS since AL already uses it in /etc/rc.conf
+ sed -i "s:INTERFACES:NET_IFS:g" \
+ ${pkgdir}/etc/ifplugd/ifplugd.conf
+
+ # replace the default init script & action files with ours.
+ install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
+ install -D -m755 ${srcdir}/ifplugd.action \
+ ${pkgdir}/etc/ifplugd/ifplugd.action
+
+ install -Dm755 ${srcdir}/ifdown.01-route.sh \
+ ${pkgdir}/etc/ifplugd/ifdown.d/01-route.sh
+ install -Dm755 ${srcdir}/ifup.01-route.sh \
+ ${pkgdir}/etc/ifplugd/ifup.d/01-route.sh
+ install -Dm755 ${srcdir}/ifup.02-ntpdate.sh \
+ ${pkgdir}/etc/ifplugd/ifup.d/02-ntpdate.sh
+}
+
Deleted: extra-i686/ifdown.01-route.sh
===================================================================
--- extra-i686/ifdown.01-route.sh 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-i686/ifdown.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,3 +0,0 @@
-#!/bin/sh
-# same as up...
-/sbin/route del $1
\ No newline at end of file
Copied: ifplugd/repos/extra-i686/ifdown.01-route.sh (from rev 157469, ifplugd/trunk/ifdown.01-route.sh)
===================================================================
--- extra-i686/ifdown.01-route.sh (rev 0)
+++ extra-i686/ifdown.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# same as up...
+/sbin/route del $1
\ No newline at end of file
Deleted: extra-i686/ifplugd
===================================================================
--- extra-i686/ifplugd 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-i686/ifplugd 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,89 +0,0 @@
-#!/bin/bash
-#
-# ifplugd daemon script for Arch Linux
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# env vars
-NAME=ifplugd
-CFG=/etc/ifplugd/ifplugd.conf
-IFPLUGD=/usr/sbin/ifplugd
-PID=`pidof -o %PPID $IFPLUGD`
-
-# source configuration file
-[ -f $CFG ] && . $CFG
-
-# discover interfaces to monitor
-# (replacing INTERFACES with NET_IFS, since AL
-# already uses it in /etc/rc.conf)
-[ -z "$NET_IFS" ] &&
- NET_IFS=$(sed -ne 's/.*\<\(eth[0-9]*\):.*/\1/p' /proc/net/dev)
-
-case "$1" in
- start)
- stat_busy "Starting $NAME"
- [ -z "$PID" ] && ( for IF in $NET_IFS ; do
- A="`eval echo \$\{ARGS_${IF}\}`"
- [ -z "$A" ] && A="$ARGS"
- $IFPLUGD -i $IF $A
- echo -n " $IF"
- done )
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon $NAME
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping $NAME"
- [ ! -z "$PID" ] && ( for IF in $NET_IFS ; do
- $IFPLUGD -k -i $IF
- echo -n " $IF"
- done )
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon $NAME
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- for IF in $NET_IFS; do
- $IFPLUGD -c -i $IF
- done
- ;;
- suspend)
- stat_busy "Suspending $NAME"
- for IF in $NET_IFS; do
- $IFPLUGD -S -i $IF
- echo -n " $IF"
- done
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- resume)
- stat_busy "Resuming $NAME"
- for IF in $NET_IFS; do
- $IFPLUGD -R -i $IF
- echo -n " $IF"
- done
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status|suspend|resume}"
-esac
-exit 0
Copied: ifplugd/repos/extra-i686/ifplugd (from rev 157469, ifplugd/trunk/ifplugd)
===================================================================
--- extra-i686/ifplugd (rev 0)
+++ extra-i686/ifplugd 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,112 @@
+#!/bin/bash
+#
+# ifplugd daemon script for Arch Linux
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+shopt -s extglob
+
+# env vars
+daemonname=ifplugd
+cfg=/etc/ifplugd/ifplugd.conf
+PID=$(pidof -o %PPID ifplugd)
+
+# source configuration file
+[[ -r $cfg ]] && . "$cfg"
+
+# discover interfaces to monitor
+# (replacing INTERFACES with net_ifs, since AL
+# already uses it in /etc/rc.conf)
+if [[ -z $net_ifs ]]; then
+ net_ifs=(/sys/class/net/!(lo))
+ net_ifs=("${net_ifs[@]##*/}")
+fi
+
+case $1 in
+ start)
+ stat_busy "Starting $daemonname: ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ # only start if a PID doesn't already exist
+ if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
+ args=ARGS_$nic
+ [[ -z ${!args} ]] && args=$ARGS || args=${!args}
+ ifplugd -i "$nic" $args
+
+ # use presence of PID file to check for start success
+ [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
+ fi
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ add_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping $daemonname: ${net_ifs[*]}"
+
+ for nic in /var/run/ifplugd.*.pid; do
+ [[ -f $nic ]] || { (( ++err )); break; }
+ nic=${nic%.pid}
+ nic=${nic##*.}
+ ifplugd -k -i "$nic" || (( ++err ))
+ done
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ rm_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ status)
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -c -i "$nic"
+ done
+ unset nic
+ ;;
+ suspend)
+ stat_busy "Suspending $daemonname: ${net_ifs[*]}"
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -S -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ resume)
+ stat_busy "Resuming $daemonname ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -R -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|status|suspend|resume}"
+esac
+exit 0
Deleted: extra-i686/ifplugd-0.28-interface.patch
===================================================================
--- extra-i686/ifplugd-0.28-interface.patch 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-i686/ifplugd-0.28-interface.patch 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,13 +0,0 @@
---- src/interface.c 2004/12/19 00:08:01 114
-+++ src/interface.c 2006/03/07 13:15:11 133
-@@ -22,9 +22,9 @@
- #include <config.h>
- #endif
-
-+#include <sys/types.h>
- #include <linux/sockios.h>
- #include <linux/if_ether.h>
--#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/if.h>
Copied: ifplugd/repos/extra-i686/ifplugd-0.28-interface.patch (from rev 157469, ifplugd/trunk/ifplugd-0.28-interface.patch)
===================================================================
--- extra-i686/ifplugd-0.28-interface.patch (rev 0)
+++ extra-i686/ifplugd-0.28-interface.patch 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,13 @@
+--- src/interface.c 2004/12/19 00:08:01 114
++++ src/interface.c 2006/03/07 13:15:11 133
+@@ -22,9 +22,9 @@
+ #include <config.h>
+ #endif
+
++#include <sys/types.h>
+ #include <linux/sockios.h>
+ #include <linux/if_ether.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/if.h>
Deleted: extra-i686/ifplugd.action
===================================================================
--- extra-i686/ifplugd.action 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-i686/ifplugd.action 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# ifplugd.action script for Arch Linux
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-plugscript(){ #argumets are ifup|ifdown, interface_name
- for script in /etc/ifplugd/$1.d/*.sh; do
- [ -x $script ] && $script $2
- done
- return 0
-}
-
-case "$2" in
- up)
- /etc/rc.d/network ifup $1
- plugscript ifup $1
- ;;
- down)
- plugscript ifdown $1
- /etc/rc.d/network ifdown $1
- ;;
- *)
- echo "Wrong arguments" > /dev/stderr
- ;;
-esac
-
-exit 1
Copied: ifplugd/repos/extra-i686/ifplugd.action (from rev 157469, ifplugd/trunk/ifplugd.action)
===================================================================
--- extra-i686/ifplugd.action (rev 0)
+++ extra-i686/ifplugd.action 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# ifplugd.action script for Arch Linux
+#
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+plugscript() { # arguments are ifup|ifdown, interface_name
+ for script in /etc/ifplugd/$1.d/*.sh; do
+ [[ -x $script ]] && "$script" $2
+ done
+ return 0
+}
+
+case $2 in
+ up)
+ /etc/rc.d/network ifup "$1"
+ plugscript ifup "$1"
+ ;;
+ down)
+ plugscript ifdown "$1"
+ /etc/rc.d/network ifdown $1
+ ;;
+ *)
+ echo "Wrong arguments" >&2
+ ;;
+esac
+
+exit 1
Deleted: extra-i686/ifup.01-route.sh
===================================================================
--- extra-i686/ifup.01-route.sh 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-i686/ifup.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,5 +0,0 @@
-#!/bin/sh
-# ugly way to load up gateway, since
-# al's net configuration doesn't associate
-# gateways with specific interfaces.
-/sbin/route add $gateway
Copied: ifplugd/repos/extra-i686/ifup.01-route.sh (from rev 157469, ifplugd/trunk/ifup.01-route.sh)
===================================================================
--- extra-i686/ifup.01-route.sh (rev 0)
+++ extra-i686/ifup.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,5 @@
+#!/bin/sh
+# ugly way to load up gateway, since
+# al's net configuration doesn't associate
+# gateways with specific interfaces.
+/sbin/route add $gateway
Deleted: extra-i686/ifup.02-ntpdate.sh
===================================================================
--- extra-i686/ifup.02-ntpdate.sh 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-i686/ifup.02-ntpdate.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,2 +0,0 @@
-#!/bin/sh
-ntpdate ru.pool.ntp.org | logger
Copied: ifplugd/repos/extra-i686/ifup.02-ntpdate.sh (from rev 157469, ifplugd/trunk/ifup.02-ntpdate.sh)
===================================================================
--- extra-i686/ifup.02-ntpdate.sh (rev 0)
+++ extra-i686/ifup.02-ntpdate.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,2 @@
+#!/bin/sh
+ntpdate ru.pool.ntp.org | logger
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-x86_64/PKGBUILD 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,50 +0,0 @@
-# $Id$
-# Contributor: Manolis Tzanidakis
-# Contributor: kevin <kevin at archlinux.org>
-# Maintainer:
-
-pkgname=ifplugd
-pkgver=0.28
-pkgrel=8
-pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
-arch=('i686' 'x86_64')
-url="http://0pointer.de/lennart/projects/ifplugd"
-license=('GPL2')
-depends=('libdaemon' 'bash')
-backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
-options=('!makeflags')
-source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
-md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '70d66121ae5163348855236951e069a2'\
- 'e91a3d77d707ae79fbc10146848032dc' '54eb22844b5aeed161c0b80aa9008570'\
- 'd6ce6c7bd481a0b3944c944c5b277c0b' 'c35f0a637911b747f8dc3bd3c6156a1b'\
- 'f8690ee18a5ca72555585ee96826c2cf')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
- ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
- --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # replace INTERFACES with NET_IFS since AL already uses it in /etc/rc.conf
- sed -i "s:INTERFACES:NET_IFS:g" \
- ${pkgdir}/etc/ifplugd/ifplugd.conf
-
- # replace the default init script & action files with ours.
- install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
- install -D -m755 ${srcdir}/ifplugd.action \
- ${pkgdir}/etc/ifplugd/ifplugd.action
-
- install -Dm755 ${srcdir}/ifdown.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifdown.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.02-ntpdate.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/02-ntpdate.sh
-}
-
Copied: ifplugd/repos/extra-x86_64/PKGBUILD (from rev 157469, ifplugd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,53 @@
+# $Id$
+# Contributor: Manolis Tzanidakis
+# Contributor: kevin <kevin at archlinux.org>
+# Maintainer:
+
+pkgname=ifplugd
+pkgver=0.28
+pkgrel=9
+pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
+arch=('i686' 'x86_64')
+url="http://0pointer.de/lennart/projects/ifplugd"
+license=('GPL2')
+depends=('libdaemon' 'bash')
+backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
+options=('!makeflags')
+source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
+md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
+ 'ef27f40434ca85ccaf57a7e388eb001e'
+ '6f98767c4ea2cf0580f73ced81efd21a'
+ '54eb22844b5aeed161c0b80aa9008570'
+ 'd6ce6c7bd481a0b3944c944c5b277c0b'
+ 'c35f0a637911b747f8dc3bd3c6156a1b'
+ 'f8690ee18a5ca72555585ee96826c2cf')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
+ --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # replace INTERFACES with NET_IFS since AL already uses it in /etc/rc.conf
+ sed -i "s:INTERFACES:NET_IFS:g" \
+ ${pkgdir}/etc/ifplugd/ifplugd.conf
+
+ # replace the default init script & action files with ours.
+ install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
+ install -D -m755 ${srcdir}/ifplugd.action \
+ ${pkgdir}/etc/ifplugd/ifplugd.action
+
+ install -Dm755 ${srcdir}/ifdown.01-route.sh \
+ ${pkgdir}/etc/ifplugd/ifdown.d/01-route.sh
+ install -Dm755 ${srcdir}/ifup.01-route.sh \
+ ${pkgdir}/etc/ifplugd/ifup.d/01-route.sh
+ install -Dm755 ${srcdir}/ifup.02-ntpdate.sh \
+ ${pkgdir}/etc/ifplugd/ifup.d/02-ntpdate.sh
+}
+
Deleted: extra-x86_64/ifdown.01-route.sh
===================================================================
--- extra-x86_64/ifdown.01-route.sh 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-x86_64/ifdown.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,3 +0,0 @@
-#!/bin/sh
-# same as up...
-/sbin/route del $1
\ No newline at end of file
Copied: ifplugd/repos/extra-x86_64/ifdown.01-route.sh (from rev 157469, ifplugd/trunk/ifdown.01-route.sh)
===================================================================
--- extra-x86_64/ifdown.01-route.sh (rev 0)
+++ extra-x86_64/ifdown.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# same as up...
+/sbin/route del $1
\ No newline at end of file
Deleted: extra-x86_64/ifplugd
===================================================================
--- extra-x86_64/ifplugd 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-x86_64/ifplugd 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,89 +0,0 @@
-#!/bin/bash
-#
-# ifplugd daemon script for Arch Linux
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# env vars
-NAME=ifplugd
-CFG=/etc/ifplugd/ifplugd.conf
-IFPLUGD=/usr/sbin/ifplugd
-PID=`pidof -o %PPID $IFPLUGD`
-
-# source configuration file
-[ -f $CFG ] && . $CFG
-
-# discover interfaces to monitor
-# (replacing INTERFACES with NET_IFS, since AL
-# already uses it in /etc/rc.conf)
-[ -z "$NET_IFS" ] &&
- NET_IFS=$(sed -ne 's/.*\<\(eth[0-9]*\):.*/\1/p' /proc/net/dev)
-
-case "$1" in
- start)
- stat_busy "Starting $NAME"
- [ -z "$PID" ] && ( for IF in $NET_IFS ; do
- A="`eval echo \$\{ARGS_${IF}\}`"
- [ -z "$A" ] && A="$ARGS"
- $IFPLUGD -i $IF $A
- echo -n " $IF"
- done )
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon $NAME
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping $NAME"
- [ ! -z "$PID" ] && ( for IF in $NET_IFS ; do
- $IFPLUGD -k -i $IF
- echo -n " $IF"
- done )
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon $NAME
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- for IF in $NET_IFS; do
- $IFPLUGD -c -i $IF
- done
- ;;
- suspend)
- stat_busy "Suspending $NAME"
- for IF in $NET_IFS; do
- $IFPLUGD -S -i $IF
- echo -n " $IF"
- done
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- resume)
- stat_busy "Resuming $NAME"
- for IF in $NET_IFS; do
- $IFPLUGD -R -i $IF
- echo -n " $IF"
- done
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status|suspend|resume}"
-esac
-exit 0
Copied: ifplugd/repos/extra-x86_64/ifplugd (from rev 157469, ifplugd/trunk/ifplugd)
===================================================================
--- extra-x86_64/ifplugd (rev 0)
+++ extra-x86_64/ifplugd 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,112 @@
+#!/bin/bash
+#
+# ifplugd daemon script for Arch Linux
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+shopt -s extglob
+
+# env vars
+daemonname=ifplugd
+cfg=/etc/ifplugd/ifplugd.conf
+PID=$(pidof -o %PPID ifplugd)
+
+# source configuration file
+[[ -r $cfg ]] && . "$cfg"
+
+# discover interfaces to monitor
+# (replacing INTERFACES with net_ifs, since AL
+# already uses it in /etc/rc.conf)
+if [[ -z $net_ifs ]]; then
+ net_ifs=(/sys/class/net/!(lo))
+ net_ifs=("${net_ifs[@]##*/}")
+fi
+
+case $1 in
+ start)
+ stat_busy "Starting $daemonname: ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ # only start if a PID doesn't already exist
+ if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
+ args=ARGS_$nic
+ [[ -z ${!args} ]] && args=$ARGS || args=${!args}
+ ifplugd -i "$nic" $args
+
+ # use presence of PID file to check for start success
+ [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
+ fi
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ add_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping $daemonname: ${net_ifs[*]}"
+
+ for nic in /var/run/ifplugd.*.pid; do
+ [[ -f $nic ]] || { (( ++err )); break; }
+ nic=${nic%.pid}
+ nic=${nic##*.}
+ ifplugd -k -i "$nic" || (( ++err ))
+ done
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ rm_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ status)
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -c -i "$nic"
+ done
+ unset nic
+ ;;
+ suspend)
+ stat_busy "Suspending $daemonname: ${net_ifs[*]}"
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -S -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ resume)
+ stat_busy "Resuming $daemonname ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -R -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|status|suspend|resume}"
+esac
+exit 0
Deleted: extra-x86_64/ifplugd-0.28-interface.patch
===================================================================
--- extra-x86_64/ifplugd-0.28-interface.patch 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-x86_64/ifplugd-0.28-interface.patch 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,13 +0,0 @@
---- src/interface.c 2004/12/19 00:08:01 114
-+++ src/interface.c 2006/03/07 13:15:11 133
-@@ -22,9 +22,9 @@
- #include <config.h>
- #endif
-
-+#include <sys/types.h>
- #include <linux/sockios.h>
- #include <linux/if_ether.h>
--#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/if.h>
Copied: ifplugd/repos/extra-x86_64/ifplugd-0.28-interface.patch (from rev 157469, ifplugd/trunk/ifplugd-0.28-interface.patch)
===================================================================
--- extra-x86_64/ifplugd-0.28-interface.patch (rev 0)
+++ extra-x86_64/ifplugd-0.28-interface.patch 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,13 @@
+--- src/interface.c 2004/12/19 00:08:01 114
++++ src/interface.c 2006/03/07 13:15:11 133
+@@ -22,9 +22,9 @@
+ #include <config.h>
+ #endif
+
++#include <sys/types.h>
+ #include <linux/sockios.h>
+ #include <linux/if_ether.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/if.h>
Deleted: extra-x86_64/ifplugd.action
===================================================================
--- extra-x86_64/ifplugd.action 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-x86_64/ifplugd.action 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# ifplugd.action script for Arch Linux
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-plugscript(){ #argumets are ifup|ifdown, interface_name
- for script in /etc/ifplugd/$1.d/*.sh; do
- [ -x $script ] && $script $2
- done
- return 0
-}
-
-case "$2" in
- up)
- /etc/rc.d/network ifup $1
- plugscript ifup $1
- ;;
- down)
- plugscript ifdown $1
- /etc/rc.d/network ifdown $1
- ;;
- *)
- echo "Wrong arguments" > /dev/stderr
- ;;
-esac
-
-exit 1
Copied: ifplugd/repos/extra-x86_64/ifplugd.action (from rev 157469, ifplugd/trunk/ifplugd.action)
===================================================================
--- extra-x86_64/ifplugd.action (rev 0)
+++ extra-x86_64/ifplugd.action 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# ifplugd.action script for Arch Linux
+#
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+plugscript() { # arguments are ifup|ifdown, interface_name
+ for script in /etc/ifplugd/$1.d/*.sh; do
+ [[ -x $script ]] && "$script" $2
+ done
+ return 0
+}
+
+case $2 in
+ up)
+ /etc/rc.d/network ifup "$1"
+ plugscript ifup "$1"
+ ;;
+ down)
+ plugscript ifdown "$1"
+ /etc/rc.d/network ifdown $1
+ ;;
+ *)
+ echo "Wrong arguments" >&2
+ ;;
+esac
+
+exit 1
Deleted: extra-x86_64/ifup.01-route.sh
===================================================================
--- extra-x86_64/ifup.01-route.sh 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-x86_64/ifup.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,5 +0,0 @@
-#!/bin/sh
-# ugly way to load up gateway, since
-# al's net configuration doesn't associate
-# gateways with specific interfaces.
-/sbin/route add $gateway
Copied: ifplugd/repos/extra-x86_64/ifup.01-route.sh (from rev 157469, ifplugd/trunk/ifup.01-route.sh)
===================================================================
--- extra-x86_64/ifup.01-route.sh (rev 0)
+++ extra-x86_64/ifup.01-route.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,5 @@
+#!/bin/sh
+# ugly way to load up gateway, since
+# al's net configuration doesn't associate
+# gateways with specific interfaces.
+/sbin/route add $gateway
Deleted: extra-x86_64/ifup.02-ntpdate.sh
===================================================================
--- extra-x86_64/ifup.02-ntpdate.sh 2012-04-28 18:49:33 UTC (rev 157469)
+++ extra-x86_64/ifup.02-ntpdate.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -1,2 +0,0 @@
-#!/bin/sh
-ntpdate ru.pool.ntp.org | logger
Copied: ifplugd/repos/extra-x86_64/ifup.02-ntpdate.sh (from rev 157469, ifplugd/trunk/ifup.02-ntpdate.sh)
===================================================================
--- extra-x86_64/ifup.02-ntpdate.sh (rev 0)
+++ extra-x86_64/ifup.02-ntpdate.sh 2012-04-28 18:49:56 UTC (rev 157470)
@@ -0,0 +1,2 @@
+#!/bin/sh
+ntpdate ru.pool.ntp.org | logger
More information about the arch-commits
mailing list