aboutsummaryrefslogtreecommitdiff
path: root/toys/lsb
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2015-04-04 11:58:06 -0500
committerPaul Barker <paul@paulbarker.me.uk>2015-04-04 11:58:06 -0500
commit1dd3704c5ffea926f61a96bb7de7d9dbee52fa44 (patch)
tree96a1882a18c5a1d3be1b06657697207d44c2622a /toys/lsb
parent08089370c99af7a38d8896c4aa18c6b4bbd5ffc7 (diff)
downloadtoybox-1dd3704c5ffea926f61a96bb7de7d9dbee52fa44.tar.gz
To ensure that toybox can be installed alongside busybox without
confusing update-alternatives, the paths of the links installed by toybox should match those installed by busybox. This is accomplished by changing the flags of a few tools within toybox.
Diffstat (limited to 'toys/lsb')
-rw-r--r--toys/lsb/mount.c2
-rw-r--r--toys/lsb/pidof.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/toys/lsb/mount.c b/toys/lsb/mount.c
index 4d6679d1..ce1f87bb 100644
--- a/toys/lsb/mount.c
+++ b/toys/lsb/mount.c
@@ -6,7 +6,7 @@
* Note: -hV is bad spec, haven't implemented -FsLU yet
* no mtab (/proc/mounts does it) so -n is NOP.
-USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT))
+USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_BIN|TOYFLAG_STAYROOT))
//USE_NFSMOUNT(NEWTOY(nfsmount, "?<2>2", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT))
config MOUNT
diff --git a/toys/lsb/pidof.c b/toys/lsb/pidof.c
index 51b742fd..a8fc8ef9 100644
--- a/toys/lsb/pidof.c
+++ b/toys/lsb/pidof.c
@@ -5,7 +5,7 @@
*
* http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/pidof.html
-USE_PIDOF(NEWTOY(pidof, "<1so:", TOYFLAG_USR|TOYFLAG_BIN))
+USE_PIDOF(NEWTOY(pidof, "<1so:", TOYFLAG_BIN))
config PIDOF
bool "pidof"