diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-21 14:31:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-21 14:44:48 +0000 |
| commit | ff94bda8bd8951ef2085a19f64620c8bc58b6674 (patch) | |
| tree | f338a03d88fba08303910579b19df24867c00056 | |
| parent | 2bc8cf9593f4b5d2f4e0322cc6be3df07c8b2c7a (diff) | |
| download | aports-ff94bda8bd8951ef2085a19f64620c8bc58b6674.tar.bz2 aports-ff94bda8bd8951ef2085a19f64620c8bc58b6674.tar.xz | |
main/alpine-conf: fix error message for setup-interfaces
ref #1404
(cherry picked from commit ed2761657813f46e8975756b317f7b8ffdd850e1)
Conflicts:
main/alpine-conf/APKBUILD
fixes #1404
| -rw-r--r-- | main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch | 28 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
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 eed2ca1acb..e2d42ddf51 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.11.3 -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="09a8315fa1a5746b961f0dd6e65cdd8d alpine-conf-2.11.3.tar.bz2" +md5sums="09a8315fa1a5746b961f0dd6e65cdd8d alpine-conf-2.11.3.tar.bz2 +1f2ee5791a9bb40bd5e9862f60299ce2 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch" |