diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-28 13:27:55 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-28 12:29:00 +0000 |
| commit | b56febe89a80a38ad637af40520f00a177a1f574 (patch) | |
| tree | 441d2775e456132911875219b311b02b83d746b0 /main/busybox | |
| parent | c6dffcbe9c602ad6ca854661e5a2dbfbf72049ed (diff) | |
| download | aports-b56febe89a80a38ad637af40520f00a177a1f574.tar.bz2 aports-b56febe89a80a38ad637af40520f00a177a1f574.tar.xz | |
main/busybox: fix fsck to resolve UUID/LABEL specs in fstab
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/0001-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch | 32 | ||||
| -rw-r--r-- | main/busybox/APKBUILD | 4 |
2 files changed, 35 insertions, 1 deletions
diff --git a/main/busybox/0001-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/main/busybox/0001-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch new file mode 100644 index 0000000000..323e079021 --- /dev/null +++ b/main/busybox/0001-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch @@ -0,0 +1,32 @@ +From 549b5fa1384bb29c3ea92486539dccd9a7d71b83 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 28 Nov 2017 13:23:17 +0100 +Subject: [PATCH] fsck: resolve LABEL=.../UUID=... spec to device + +--- + e2fsprogs/fsck.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c +index eb53002b1..2adf0cf07 100644 +--- a/e2fsprogs/fsck.c ++++ b/e2fsprogs/fsck.c +@@ -60,6 +60,7 @@ + //usage: "\n -t TYPE List of filesystem types to check" + + #include "libbb.h" ++#include "volume_id.h" + #include "common_bufsiz.h" + + /* "progress indicator" code is somewhat buggy and ext[23] specific. +@@ -976,6 +977,7 @@ int fsck_main(int argc UNUSED_PARAM, char **argv) + // "/path", "UUID=xxx" or "LABEL=xxx" into block device name + // ("UUID=xxx"/"LABEL=xxx" can probably shifted to fsck.auto duties) + devices = xrealloc_vector(devices, 2, num_devices); ++ resolve_mount_spec(&arg); + devices[num_devices++] = arg; + continue; + } +-- +2.15.0 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 06765ce4af..bcfc11e15e 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.27.2 -pkgrel=4 +pkgrel=5 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -20,6 +20,7 @@ options="suid !check" triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*" source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0001-ash-add-support-for-command_not_found_handle-hook-fu.patch + 0001-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch 0001-ash-exec-busybox.static.patch 0002-app-location-for-cpio-vi-and-lspci.patch @@ -184,6 +185,7 @@ static() { sha512sums="d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c busybox-1.27.2.tar.bz2 dc08288c8e9e29d36be7174d58f3bee2d0508465977fb40d39807aa0b03149f7814f8cfed113d0a7589ef49890beb1805ef00f0d37b563447fe875e3cff08d1c 0001-ash-add-support-for-command_not_found_handle-hook-fu.patch +26f48549dfd4bb0a948d6bff86f5a68106b1d005fd24de5e0f528925a4da0b9c5ebafc11070cbe456185eb94f9567afe6d6eba791c1d1f3fe5431a2a36a48abf 0001-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch 1930775839354a63c30970f0d52d00cfd3a8f6b9f48d6de45ea7d2478d080bde7193c1c2cce026dc7337d9ecf0b65f5ff1dd4351c1eb195e6f0c0c5126f10511 0001-ash-exec-busybox.static.patch a756aa89c4602cd091df0052e2e3d7b45a359fbfe953b70aa3029e3eeb8e5d1772cbf1525bb62df6ce6547f1e5605617195ddae336e1ffe41f5c58d524af6ba6 0002-app-location-for-cpio-vi-and-lspci.patch fc17ce9b12726e3449518692bf0d4906c36f091534706b5b91c910866bd8cd50d8f7d4b449d54eeed24ee656012a6ef04612bf092874e4b83b0723f852fdce0e 0003-udhcpc-set-default-discover-retries-to-5.patch |