From 1dd3704c5ffea926f61a96bb7de7d9dbee52fa44 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 4 Apr 2015 11:58:06 -0500 Subject: 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. --- toys/posix/cut.c | 2 +- toys/posix/df.c | 2 +- toys/posix/head.c | 2 +- toys/posix/id.c | 6 +++--- toys/posix/mkfifo.c | 2 +- toys/posix/renice.c | 2 +- toys/posix/tail.c | 2 +- toys/posix/tee.c | 2 +- toys/posix/uniq.c | 2 +- toys/posix/who.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) (limited to 'toys/posix') diff --git a/toys/posix/cut.c b/toys/posix/cut.c index 25f25a8d..ca014aea 100644 --- a/toys/posix/cut.c +++ b/toys/posix/cut.c @@ -5,7 +5,7 @@ * * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/cut.html -USE_CUT(NEWTOY(cut, "b:|c:|f:|d:sn[!cbf]", TOYFLAG_BIN)) +USE_CUT(NEWTOY(cut, "b:|c:|f:|d:sn[!cbf]", TOYFLAG_USR|TOYFLAG_BIN)) config CUT bool "cut" diff --git a/toys/posix/df.c b/toys/posix/df.c index dfc0f25f..0bec17fb 100644 --- a/toys/posix/df.c +++ b/toys/posix/df.c @@ -4,7 +4,7 @@ * * See http://opengroup.org/onlinepubs/9699919799/utilities/df.html -USE_DF(NEWTOY(df, "Pkt*a[-Pk]", TOYFLAG_USR|TOYFLAG_SBIN)) +USE_DF(NEWTOY(df, "Pkt*a[-Pk]", TOYFLAG_SBIN)) config DF bool "df" diff --git a/toys/posix/head.c b/toys/posix/head.c index 9312528a..5867dfb5 100644 --- a/toys/posix/head.c +++ b/toys/posix/head.c @@ -4,7 +4,7 @@ * * See http://opengroup.org/onlinepubs/9699919799/utilities/head.html -USE_HEAD(NEWTOY(head, "?n#<0=10", TOYFLAG_BIN)) +USE_HEAD(NEWTOY(head, "?n#<0=10", TOYFLAG_USR|TOYFLAG_BIN)) config HEAD bool "head" diff --git a/toys/posix/id.c b/toys/posix/id.c index 353aa041..7ab489ef 100644 --- a/toys/posix/id.c +++ b/toys/posix/id.c @@ -6,10 +6,10 @@ * * See http://opengroup.org/onlinepubs/9699919799/utilities/id.html -USE_ID(NEWTOY(id, ">1"USE_ID_SELINUX("Z")"nGgru[!"USE_ID_SELINUX("Z")"Ggu]", TOYFLAG_BIN)) +USE_ID(NEWTOY(id, ">1"USE_ID_SELINUX("Z")"nGgru[!"USE_ID_SELINUX("Z")"Ggu]", TOYFLAG_USR|TOYFLAG_BIN)) USE_GROUPS(NEWTOY(groups, NULL, TOYFLAG_USR|TOYFLAG_BIN)) -USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_BIN)) -USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_BIN)) +USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN)) +USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_USR|TOYFLAG_BIN)) config ID bool "id" diff --git a/toys/posix/mkfifo.c b/toys/posix/mkfifo.c index 15fab70a..4e0fca3f 100644 --- a/toys/posix/mkfifo.c +++ b/toys/posix/mkfifo.c @@ -4,7 +4,7 @@ * * See http://opengroup.org/onlinepubs/9699919799/utilities/mkfifo.html -USE_MKFIFO(NEWTOY(mkfifo, "<1m:", TOYFLAG_BIN)) +USE_MKFIFO(NEWTOY(mkfifo, "<1m:", TOYFLAG_USR|TOYFLAG_BIN)) config MKFIFO bool "mkfifo" diff --git a/toys/posix/renice.c b/toys/posix/renice.c index 8c206447..489eb138 100644 --- a/toys/posix/renice.c +++ b/toys/posix/renice.c @@ -4,7 +4,7 @@ * * See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/renice.html -USE_RENICE(NEWTOY(renice, "<1gpun#|", TOYFLAG_BIN)) +USE_RENICE(NEWTOY(renice, "<1gpun#|", TOYFLAG_USR|TOYFLAG_BIN)) config RENICE bool "renice" diff --git a/toys/posix/tail.c b/toys/posix/tail.c index 41d46338..80556e2b 100644 --- a/toys/posix/tail.c +++ b/toys/posix/tail.c @@ -4,7 +4,7 @@ * * See http://opengroup.org/onlinepubs/9699919799/utilities/tail.html -USE_TAIL(NEWTOY(tail, "?fc-n-[-cn]", TOYFLAG_BIN)) +USE_TAIL(NEWTOY(tail, "?fc-n-[-cn]", TOYFLAG_USR|TOYFLAG_BIN)) config TAIL bool "tail" diff --git a/toys/posix/tee.c b/toys/posix/tee.c index 909ea58d..d5591b67 100644 --- a/toys/posix/tee.c +++ b/toys/posix/tee.c @@ -4,7 +4,7 @@ * * See http://opengroup.org/onlinepubs/9699919799/utilities/tee.html -USE_TEE(NEWTOY(tee, "ia", TOYFLAG_BIN)) +USE_TEE(NEWTOY(tee, "ia", TOYFLAG_USR|TOYFLAG_BIN)) config TEE bool "tee" diff --git a/toys/posix/uniq.c b/toys/posix/uniq.c index 3cfdb947..c127cfe9 100644 --- a/toys/posix/uniq.c +++ b/toys/posix/uniq.c @@ -4,7 +4,7 @@ * * See http://opengroup.org/onlinepubs/9699919799/utilities/uniq.html -USE_UNIQ(NEWTOY(uniq, "f#s#w#zicdu", TOYFLAG_BIN)) +USE_UNIQ(NEWTOY(uniq, "f#s#w#zicdu", TOYFLAG_USR|TOYFLAG_BIN)) config UNIQ bool "uniq" diff --git a/toys/posix/who.c b/toys/posix/who.c index 876a562a..414cdfc0 100644 --- a/toys/posix/who.c +++ b/toys/posix/who.c @@ -9,7 +9,7 @@ * Posix says to support many options (-abdHlmpqrstTu) but this * isn't aimed at minicomputers with modem pools. -USE_WHO(NEWTOY(who, "a", TOYFLAG_BIN)) +USE_WHO(NEWTOY(who, "a", TOYFLAG_USR|TOYFLAG_BIN)) config WHO bool "who" -- cgit v1.2.3