main/alpine-conf: fix error message for setup-interfaces

ref #1404
(cherry picked from commit ed2761657813f46e8975756b317f7b8ffdd850e1)

2 files changed, 32 insertions, 2 deletions

diff --git a/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch b/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
new file mode 100644
index 0000000000..976f64bb17
--- /dev/null
+++ b/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
@@ -0,0 +1,28 @@
+From ab68d58344a5e5421a52dccace155b5a42be4f14 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 21 Dec 2012 15:29:06 +0100
+Subject: [PATCH] setup-interfaces: fix ip: can't find device 'eth1.3' message
+
+ref #1404
+---
+ setup-interfaces.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/setup-interfaces.in b/setup-interfaces.in
+index c4ffa47..263beec 100755
+--- a/setup-interfaces.in
++++ b/setup-interfaces.in
+@@ -73,7 +73,9 @@ get_default_mask() {
+ }
+ 
+ get_default_gateway() {
+-       ip route show dev $1 | awk '/^default/ {print $3}'
++       if iface_exists $1; then
++               ip route show dev $1 | awk '/^default/ {print $3}'
++       fi
+ }
+ 
+ ipaddr_help() {
+-- 
+1.8.0.2
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index f0a4df7ca5..2687142022 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=2.12.0
-pkgrel=0
+pkgrel=1
 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
         "
 
 arch="all"
@@ -36,4 +37,5 @@ package() {
                 ln -s lbu "$pkgdir"/sbin/lbu_$i
         done
 }
-md5sums="4038a3be9a785ead649d913e208e2bd8  alpine-conf-2.12.0.tar.bz2"
+md5sums="4038a3be9a785ead649d913e208e2bd8  alpine-conf-2.12.0.tar.bz2
+1f2ee5791a9bb40bd5e9862f60299ce2  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch"