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/other/chvt.c | 2 +- toys/other/ifconfig.c | 2 +- toys/other/insmod.c | 2 +- toys/other/lsmod.c | 2 +- toys/other/netcat.c | 2 +- toys/other/pivot_root.c | 2 +- toys/other/readlink.c | 2 +- toys/other/reboot.c | 6 +++--- toys/other/rfkill.c | 2 +- toys/other/rmmod.c | 2 +- toys/other/swapoff.c | 2 +- toys/other/swapon.c | 2 +- toys/other/sysctl.c | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'toys/other') diff --git a/toys/other/chvt.c b/toys/other/chvt.c index 65442657..a93327fb 100644 --- a/toys/other/chvt.c +++ b/toys/other/chvt.c @@ -2,7 +2,7 @@ * * Copyright (C) 2008 David Anders -USE_CHVT(NEWTOY(chvt, "<1", TOYFLAG_USR|TOYFLAG_SBIN)) +USE_CHVT(NEWTOY(chvt, "<1", TOYFLAG_USR|TOYFLAG_BIN)) config CHVT bool "chvt" diff --git a/toys/other/ifconfig.c b/toys/other/ifconfig.c index 31fc1d3c..6ee01c40 100644 --- a/toys/other/ifconfig.c +++ b/toys/other/ifconfig.c @@ -6,7 +6,7 @@ * * Not in SUSv4. -USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_BIN)) +USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_SBIN)) config IFCONFIG bool "ifconfig" diff --git a/toys/other/insmod.c b/toys/other/insmod.c index 81721a31..cb222a54 100644 --- a/toys/other/insmod.c +++ b/toys/other/insmod.c @@ -2,7 +2,7 @@ * * Copyright 2012 Elie De Brauwer -USE_INSMOD(NEWTOY(insmod, "<1", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) +USE_INSMOD(NEWTOY(insmod, "<1", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) config INSMOD bool "insmod" diff --git a/toys/other/lsmod.c b/toys/other/lsmod.c index b8f5d820..4d160484 100644 --- a/toys/other/lsmod.c +++ b/toys/other/lsmod.c @@ -2,7 +2,7 @@ * * Copyright 2012 Elie De Brauwer -USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_BIN)) +USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN)) config LSMOD bool "lsmod" diff --git a/toys/other/netcat.c b/toys/other/netcat.c index 453a7ca0..9d0c3cf3 100644 --- a/toys/other/netcat.c +++ b/toys/other/netcat.c @@ -4,7 +4,7 @@ * * TODO: udp, ipv6, genericize for telnet/microcom/tail-f -USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_BIN)) +USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_USR|TOYFLAG_BIN)) USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("^tlL")"w#p#s:q#f:", TOYFLAG_BIN)) config NETCAT diff --git a/toys/other/pivot_root.c b/toys/other/pivot_root.c index 9a1f56ca..7748032b 100644 --- a/toys/other/pivot_root.c +++ b/toys/other/pivot_root.c @@ -2,7 +2,7 @@ * * Copyright 2012 Rob Landley -USE_PIVOT_ROOT(NEWTOY(pivot_root, "<2>2", TOYFLAG_USR|TOYFLAG_BIN)) +USE_PIVOT_ROOT(NEWTOY(pivot_root, "<2>2", TOYFLAG_SBIN)) config PIVOT_ROOT bool "pivot_root" diff --git a/toys/other/readlink.c b/toys/other/readlink.c index 1c333625..fecd1ef8 100644 --- a/toys/other/readlink.c +++ b/toys/other/readlink.c @@ -2,7 +2,7 @@ * * Copyright 2007 Rob Landley -USE_READLINK(NEWTOY(readlink, "<1>1fenq[-fe]", TOYFLAG_BIN)) +USE_READLINK(NEWTOY(readlink, "<1>1fenq[-fe]", TOYFLAG_USR|TOYFLAG_BIN)) config READLINK bool "readlink" diff --git a/toys/other/reboot.c b/toys/other/reboot.c index 8baa4d8a..a1358886 100644 --- a/toys/other/reboot.c +++ b/toys/other/reboot.c @@ -2,9 +2,9 @@ * * Copyright 2013 Elie De Brauwer -USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) -USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_BIN|TOYFLAG_NEEDROOT)) -USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_BIN|TOYFLAG_NEEDROOT)) +USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) +USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) +USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) config REBOOT bool "reboot" diff --git a/toys/other/rfkill.c b/toys/other/rfkill.c index 3ba346b1..36fe320d 100644 --- a/toys/other/rfkill.c +++ b/toys/other/rfkill.c @@ -5,7 +5,7 @@ * * No Standard -USE_RFKILL(NEWTOY(rfkill, "<1>2", TOYFLAG_SBIN)) +USE_RFKILL(NEWTOY(rfkill, "<1>2", TOYFLAG_USR|TOYFLAG_SBIN)) config RFKILL bool "rfkill" diff --git a/toys/other/rmmod.c b/toys/other/rmmod.c index b789acc6..10c134c2 100644 --- a/toys/other/rmmod.c +++ b/toys/other/rmmod.c @@ -2,7 +2,7 @@ * * Copyright 2012 Elie De Brauwer -USE_RMMOD(NEWTOY(rmmod, "<1wf", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) +USE_RMMOD(NEWTOY(rmmod, "<1wf", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) config RMMOD bool "rmmod" diff --git a/toys/other/swapoff.c b/toys/other/swapoff.c index b89e915c..fb171300 100644 --- a/toys/other/swapoff.c +++ b/toys/other/swapoff.c @@ -2,7 +2,7 @@ * * Copyright 2012 Elie De Brauwer -USE_SWAPOFF(NEWTOY(swapoff, "<1>1", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) +USE_SWAPOFF(NEWTOY(swapoff, "<1>1", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) config SWAPOFF bool "swapoff" diff --git a/toys/other/swapon.c b/toys/other/swapon.c index 49f12499..838d382a 100644 --- a/toys/other/swapon.c +++ b/toys/other/swapon.c @@ -2,7 +2,7 @@ * * Copyright 2012 Elie De Brauwer -USE_SWAPON(NEWTOY(swapon, "<1>1p#<0>32767", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) +USE_SWAPON(NEWTOY(swapon, "<1>1p#<0>32767", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) config SWAPON bool "swapon" diff --git a/toys/other/sysctl.c b/toys/other/sysctl.c index d3c4d81d..d4ed1b0b 100644 --- a/toys/other/sysctl.c +++ b/toys/other/sysctl.c @@ -5,7 +5,7 @@ * * No Standard -USE_SYSCTL(NEWTOY(sysctl, "^neNqwpaA[!ap][!aq][!aw][+aA]", TOYFLAG_USR|TOYFLAG_BIN)) +USE_SYSCTL(NEWTOY(sysctl, "^neNqwpaA[!ap][!aq][!aw][+aA]", TOYFLAG_SBIN)) config SYSCTL bool "sysctl" -- cgit v1.2.3