diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-01 12:43:36 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-03-01 15:09:27 +0000 |
| commit | aa5d8cb22d0fca942f6f0441b13d9d51f395cb0a (patch) | |
| tree | ac52f0253e4cff58866feaa58174514f8e463e1f /main/alpine-conf | |
| parent | 5cbf11b14c6b13e845bcbc98b5bca2ecbf5bcc00 (diff) | |
| download | aports-aa5d8cb22d0fca942f6f0441b13d9d51f395cb0a.tar.bz2 aports-aa5d8cb22d0fca942f6f0441b13d9d51f395cb0a.tar.xz | |
main/alpine-conf: fix setup-interfaces vlan-raw-device
fixes #1624
(cherry picked from commit d6e6ec28795dce2612bc66be94b44daef10758ef)
Conflicts:
main/alpine-conf/APKBUILD
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch | 26 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 30 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch b/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch new file mode 100644 index 000000000..39298c4f5 --- /dev/null +++ b/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch @@ -0,0 +1,26 @@ +From 8201bedeef8250452bdcdf5db0699c12b7ff7066 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 1 Mar 2013 10:54:12 +0000 +Subject: [PATCH] setup-interfaces: fix vlan-raw-device + +ref #1624 +--- + setup-interfaces.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-interfaces.in b/setup-interfaces.in +index 263beec..54d861a 100755 +--- a/setup-interfaces.in ++++ b/setup-interfaces.in +@@ -426,7 +426,7 @@ prompt_for_interfaces() { + echo -e "\tbond-slaves $bond_slaves" >> interfaces + fi + if [ -n "$raw_device" ]; then +- echo -e "\traw-device $raw_device" >> interfaces ++ echo -e "\tvlan-raw-device $raw_device" >> interfaces + fi + case "$iface" in + *.[0-9]*|vlan[0-9]*) PKGS="$PKGS vlan";; +-- +1.8.1.4 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index e2d42ddf5..0d8f2be7a 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.11.3 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch + 0001-setup-interfaces-fix-vlan-raw-device.patch " arch="all" @@ -38,4 +39,5 @@ package() { done } md5sums="09a8315fa1a5746b961f0dd6e65cdd8d alpine-conf-2.11.3.tar.bz2 -1f2ee5791a9bb40bd5e9862f60299ce2 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch" +1f2ee5791a9bb40bd5e9862f60299ce2 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch +8e528859d2ea4d24e2de9436c499a64d 0001-setup-interfaces-fix-vlan-raw-device.patch" |