diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-01 12:43:30 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-01 12:43:30 -0300 |
| commit | deac4d500c42135f40ea1f9777ed82fced8ccbf8 (patch) | |
| tree | f1dc820279571cd5b6afb46a1a3d09956cf37dc0 /PKGBUILD | |
| parent | 84a17ca62a9bcfcfaef320c38bb45add1f673afd (diff) | |
| parent | a41c290180a5f7d0c7aa9eef2210956dd0a8bc63 (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/initscripts2011.06.1
Conflicts:
functions
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -9,9 +9,10 @@ groups=('base') conflicts=('initscripts') provides=('initscripts=9999') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) -depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=139-1' - 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') -optdepends=('bridge-utils: Network bridging support' +depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=139-1' 'iproute2' + 'ncurses' 'kbd' 'findutils' 'sysvinit') +optdepends=('net-tools: legacy networking support' + 'bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'wireless_tools: Wireless networking') source=() |