summaryrefslogblamecommitdiff
path: root/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
blob: 7f105cb679e03a965abbc2ae6fb9f2f65ecba4d1 (plain) (tree)




















































                                                                                     
From 9bbc93f12f7cff8fb51a0bf89907d9875f5c14e6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Dec 2016 20:46:59 +0100
Subject: [PATCH 04/16] app location for cpio, vi and lspci

Adjust location to where alpine linux installs them
---
 archival/cpio.c    | 2 +-
 editors/vi.c       | 2 +-
 util-linux/lspci.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/archival/cpio.c b/archival/cpio.c
index 1d6cbd1e2..0c14f79e7 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -39,7 +39,7 @@
 //config:	help
 //config:	Passthrough mode. Rarely used.
 
-//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_CPIO) += cpio.o
 
diff --git a/editors/vi.c b/editors/vi.c
index cdfb27cc5..20077727e 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -161,7 +161,7 @@
 //config:	Unless you want more (or less) frequent "undo points" while typing,
 //config:	you should probably leave this unchanged.
 
-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_VI) += vi.o
 
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
index 0000fbfda..34189d2b5 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -16,7 +16,7 @@
 //config:
 //config:	This version uses sysfs (/sys/bus/pci/devices) only.
 
-//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_BIN, BB_SUID_DROP, lspci))
+//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_SBIN, BB_SUID_DROP, lspci))
 
 //kbuild:lib-$(CONFIG_LSPCI) += lspci.o
 
-- 
2.16.2