diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-19 14:02:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-19 14:02:45 +0000 |
| commit | afb667a34e82faaf580f4451cf06558ff4a940bf (patch) | |
| tree | f043300b5b1b1ef823c4d67847470bf14ba615f8 /main/busybox | |
| parent | 5c2655f779f788dc3f98cb7db99989f05b89de67 (diff) | |
| download | aports-afb667a34e82faaf580f4451cf06558ff4a940bf.tar.bz2 aports-afb667a34e82faaf580f4451cf06558ff4a940bf.tar.xz | |
main/busybox: use -x hostname:NAME with udhcp
should fix warning when booting alpine with dhcp
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch | 38 | ||||
| -rw-r--r-- | main/busybox/APKBUILD | 4 |
2 files changed, 41 insertions, 1 deletions
diff --git a/main/busybox/0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch b/main/busybox/0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch new file mode 100644 index 0000000000..ebae837569 --- /dev/null +++ b/main/busybox/0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch @@ -0,0 +1,38 @@ +From ad69a8dea4fff640a7e1dcfa78d0ea96eb201ec4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 19 Sep 2012 15:53:02 +0200 +Subject: [PATCH] ifupdown: use -x hostname:NAME with udhcpc + +The -H NAME is deprecated in udhcpc. See commit +2017d48c0d70bef8768efb42909e605ea8eb5a21 + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + networking/ifupdown.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/networking/ifupdown.c b/networking/ifupdown.c +index ad0a997..6eb3570 100644 +--- a/networking/ifupdown.c ++++ b/networking/ifupdown.c +@@ -540,7 +540,7 @@ static const struct dhcp_client_t ext_dhcp_clients[] = { + "pump -i %iface% -k", + }, + { "udhcpc", +- "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %client%]]" ++ "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -x hostname:%hostname%]][[ -c %client%]]" + "[[ -s %script%]][[ %udhcpc_opts%]]", + "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", + }, +@@ -580,7 +580,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec) + return 0; + # endif + return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid " +- "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]", ++ "-i %iface%[[ -x hostname:%hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]", + ifd, exec); + } + # else +-- +1.7.12 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index f143d80f76..b9e679fe15 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.20.2 -pkgrel=2 +pkgrel=3 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -23,6 +23,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 loginutils-sha512.patch 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch + 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch busyboxconfig" _sdir="$srcdir"/$pkgname-$pkgver @@ -104,4 +105,5 @@ b0977368029587bab23067f0267ae309 0001-tar-Implement-no-recursion.patch 8bf65d5bc87112946675f540b46d406d 0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch 8c42c9ef0f0419c314c86bcaf7796106 loginutils-sha512.patch 04eeda8c49d4688e6dec02451f8b6aae 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch +e1c183cbe1ca18a0fa0d9597314076c9 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch 8b3bcd5dd5e3245721da3d376172dcac busyboxconfig" |