Commit Graph

173 Commits

Author SHA1 Message Date
Colin Cross 6e0b9ecb50 Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 2013-04-06 19:02:01 +00:00
William Roberts 403b195548 Add -i option to toolbox cmd ls
Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
2013-04-03 17:39:19 -07:00
James Sullins edee93dc5b toolbox/dmesg: do not hardcode KLOG_BUF_LEN
Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
2013-04-01 21:50:03 +05:30
Dima Zavin 82ea44f88f Merge "Change setsebool syntax to be consistent with other init built-ins." 2012-12-18 23:42:09 -08:00
Stephen Smalley 0e23fee505 Change setsebool syntax to be consistent with other init built-ins.
Change setsebool syntax from name=value to name value.
This is to make it consistent with setprop and similar commands.
Update both the init built-in command and the toolbox command
for consistency.

Change-Id: I2c8e016ba26731c4a2ad4a49ae3b89362bf8f8a8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2012-12-13 15:41:53 -05:00
Elliott Hughes 777991d939 Merge "Fixed improper size displaying in 'df' utility" 2012-12-03 07:33:38 -08:00
Kenny Root 20f5daa865 resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp
Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
2012-10-16 17:51:14 -07:00
Kenny Root b83c09812f Remove HAVE_SELINUX guards
Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3
2012-10-16 12:34:06 -07:00
Kenny Root e47eb98a33 am 674c0445: Merge "toolbox: silence some compiler warnings"
* commit '674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0':
  toolbox: silence some compiler warnings
2012-10-11 00:29:10 -07:00
Kenny Root ef5d0340e4 toolbox: silence some compiler warnings
Comparison of signed and unsigned integers. Use parenthesis around a
group of bitwise OR operations.

Change-Id: Ia404380593ce2c2a291133c07c0fc7a016a3ad3f
2012-10-10 11:28:27 -07:00
Michal Frynas 1f90dcd0c0 Fixed improper size displaying in 'df' utility
'df' command used to display filesystem usage statistics as integer
values, in most cases rounding the actual value down. Because of
that 'df' tended to display faulty size values.
This fix to 'df' utility calculates the fractional part of the size,
then it rounds it when needed to the nearest one-digit integer value
and displays after decimal dot.

Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
2012-10-02 10:39:19 +02:00
Jeff Sharkey bfcd810b79 Iteration on multi-user external storage.
Define /storage as top-level concept, so that we enforce permissions
uniformly.  Moves external storage paths from headers to per-device
environment variables.  Added missing mount flags, and we no longer
have adb-specific external storage.

Bug: 6925012
Change-Id: Ic7ca953be2f552d3f0ec9e69f89fef751daa1b29
2012-08-22 14:28:37 -07:00
Jean-Baptiste Queru 2ab69388cb am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag"
* commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad':
  vmstat: Fix -n flag
2012-08-20 14:51:52 -07:00
Jean-Baptiste Queru 52d5dfc8d3 Merge "vmstat: Fix -n flag" 2012-08-20 14:25:13 -07:00
Kenny Root ba822edb30 am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static."
* commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c':
  Make setenforce usage function static.
2012-08-13 16:03:25 -07:00
Matt Finifter 492051ed2a Make setenforce usage function static.
Change-Id: I6de204dc072418805160a35d799b8948ecb39251
2012-08-13 12:56:23 -07:00
Kenny Root 605103fb55 resolved conflicts for merge of 4dcd52ab to jb-mr1-dev
Change-Id: Ibd0c03a7883a2e31adab18543c016776b7b36866
2012-08-13 10:21:35 -07:00
Stephen Smalley ae6f3d7c05 Add support for reloading policy from /data/system.
To support runtime policy management, add support for reloading
policy from /data/system.  This can be triggered by setting the
selinux.loadpolicy property to 1, whether from init.rc after
mounting /data or from the system_server (e.g. upon invocation of
a new device admin API for provisioning policy). ueventd and
installd are restarted upon policy reloads to pick up the new
policy configurations relevant to their operation.

Change-Id: I97479aecef8cec23b32f60e09cc778cc5520b691
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2012-08-09 09:59:10 -04:00
Elliott Hughes 8268a75e86 am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT"
* commit 'c5db017cc3d30b1b15544ca9889e66890710f93c':
  Conditionally use SIGSTKFLT
2012-08-08 14:06:25 -07:00
Chris Dearman 7ac420972a Conditionally use SIGSTKFLT
Change-Id: I555b33b5a93df332c556944a1c00fff417825247
2012-08-01 15:51:09 -07:00
Jeff Sharkey 3e8b1581ff Ported "grep" from NetBSD to toolbox.
Bug: 6798417
Change-Id: I581c496a726a4814edaaa3672849c090bac8552c
2012-07-13 16:37:38 -07:00
Jeff Sharkey 57df14c654 Ported "cp" from NetBSD to toolbox.
Bug: 6798417
Change-Id: I716ab459b9edf4c7405bf042adbee0300b6f51c9
2012-07-13 16:26:30 -07:00
Arun Raghavan 6caab4ce95 vmstat: Fix -n flag
The loop condition for the number of iterations basically caused the
argument to -n to be ignored. This fixes the condition appropriately.
2012-07-10 10:43:57 +05:30
Ken Sumrall 8103e91483 Add the du command to toolbox
The code is from NetBSD, with the -n and -h options removed to make
porting easy.  Also, removed support for the BLOCKSIZE environment
variable for the same reason.

Change-Id: Ib927ff3527e02802785fdd7f75bab1f05222918e
2012-07-09 17:33:08 -07:00
Nick Kralevich 3f2b0a506f Add mode when open(O_CREAT) is used.
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a runtime error in a future version of Android.

Change-Id: I00609f37d2ea68e21b6404d542830386be354202
2012-06-26 14:59:36 -07:00
Jean-Baptiste Queru 60f3d65c83 am 2a2e10fb: am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '2a2e10fbb38e4f4d7759f619275fa4ebd596259a':
  toolbox: rmmod: fix module unloading
2012-06-11 15:28:12 -07:00
Jean-Baptiste Queru 2a2e10fbb3 am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
  toolbox: rmmod: fix module unloading
2012-06-11 15:25:44 -07:00
Jean-Baptiste Queru 91e5551f88 Merge "toolbox: rmmod: fix module unloading" 2012-06-11 15:16:07 -07:00
Jeff Sharkey 393e559ddc Enable conv=fdatasync in dd.
Matches behavior of coreutils dd.  Also removes unsupported
conversions.

Change-Id: I9ed5a7d43b5b083041b261ce70f6c835b41dc7ac
2012-05-29 14:26:04 -07:00
Jean-Baptiste Queru 79c71831ca am a802b837: am 1d5e7885: Merge "toolbox: implement rm -f flag"
* commit 'a802b8374a22da9f52541e1fc286dcbdb1cfa1b4':
  toolbox: implement rm -f flag
2012-05-25 08:12:59 -07:00
Vishal Bhoj fc26c0ba59 toolbox: rmmod: fix module unloading
Replace "-" with "_" in module name. This would keep
rmmod compatible with module-init-tools version of rmmod

Change-Id: I4470d9a98bc2f299acd94859fca4403aee279d2b
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2012-05-15 18:01:34 +05:30
Jeff Brown 1ee467c760 Delete dead code.
This file is not compiled and not used.

Bug: 6435382
Change-Id: I3a08690950f1c77f8b0bc57a9e5cdb6eb402ac77
2012-05-11 17:35:16 -07:00
Tanguy Pruvot 0ffc5b37e5 toolbox: implement rm -f flag
this prevent compatibility errors in scripts (file "-f" not found)
The force flag will not return an error if the file doesnt exist.

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Change-Id: I3267963284ee247629da5ab299e900c6e4a4ac68
2012-05-06 02:36:00 +02:00
Kenny Root a64adba539 Add signal names to kill
mksh provides a kill primitive with signal names, but also offer it in
our toolbox binary. This will allow anyone to use "kill -HUP <pid>" or
"kill -l" to look at the name to number signal mapping.

Change-Id: Id683721f4ad3f2b518b4dc54a6073510290cbe04
2012-04-06 09:05:49 -07:00
Ken Sumrall ec3b164524 Make sure FAT32 filesystems contain a minimum of 65527 clusters
Some versions of windows cannot handle FAT32 filesystems with less
than 65527 clusters, so make sure we don't create such beasts.

Change-Id: Id00fb02c4f8476f7dcc0ef137bd9e4975d740591
2012-03-29 21:05:46 -07:00
Glenn Kasten 86c7cc8189 Add get_sched_policy_name() and use in ps and top
This will make it easier to add additional policies (cgroups) if needed.
Also added comments to the sched_policy APIs.

Change-Id: I33ce1cc4deae10983241f7391294b7a512d2c47c
2012-03-15 15:10:45 -07:00
Jeff Sharkey 0afee8b668 Merge "Change "chown" to coreutils syntax." 2012-03-02 16:10:50 -08:00
Jeff Sharkey 474cea824f Change "chown" to coreutils syntax.
Change-Id: I7d997b3254354908317feee54b6df9b2419718a6
2012-03-02 15:11:53 -08:00
Jean-Baptiste Queru ca3bf25570 am 25443f80: am 1e28088f: am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"
* commit '25443f80a27c6153c3406b4443fd07442e410a57':
  Toolbox implementation of chown has a bad print
2012-02-28 15:19:17 -08:00
Jean-Baptiste Queru 5cc398ef00 Merge "Toolbox implementation of chown has a bad print" 2012-02-28 14:59:56 -08:00
Jean-Baptiste Queru 1ae8d4eaa3 resolved conflicts for merge of 44898072 to master
Change-Id: Ib77a4d9161261306253a174727801526e7149621
2012-02-24 12:05:31 -08:00
Stephen Smalley 8290d1083e Extend toolbox with SE Android support.
Add -Z option to ls and ps for displaying security contexts.
Modify id to display security context.
Add new SELinux commands: chcon, getenforce, getsebool, load_policy, restorecon, runcon, setenforce, setsebool.

Change-Id: Ia20941be4a6cd706fe392fed6e38a37d880ec5f1
2012-02-03 11:11:15 -05:00
Johan Norberg 69ab6de333 Toolbox implementation of chown has a bad print
When the chown program fails it prints out an error message
and is describing itself as chmod. This has been corrected.

Change-Id: I2c489975f09343bdf66acbf7df6e7183c2daff78
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
2012-01-20 17:28:42 -08:00
Jean-Baptiste Queru f124435c46 am 82dd6af8: am e7b1f132: Merge "rmmod: fix full path syntax"
* commit '82dd6af84676f1ea6f67ce6fbd2c5cea7a8aa601':
  rmmod: fix full path syntax
2012-01-13 11:30:24 -08:00
Scott Anderson 7e4c303fe0 Fix hd command so it doesn't error out on EOF
hd would error out on files that were not a multiple of its read
buffer size (4096).  For example:
Read error on init.rc, offset 17040 len 4096, No such file or directory

The fix is to stop reading on EOF instead of treating it as an
error.

Signed-off-by: Scott Anderson <saa@google.com>

(cherry picked from commit a9fac4155f)

Change-Id: Ib2af725fc39e96c2f81559f61979d451604d4817
2012-01-12 15:17:07 -08:00
Tanguy Pruvot ec4db51f88 rmmod: fix full path syntax
rmmod /system/modules/multitouch.ko
rmmod: delete_module '/multitouch' failed (errno 2)

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2012-01-12 20:44:02 +01:00
Scott Anderson d0455c952d Add md5 command to toolbox.
This command outputs the MD5 for specified files.  The output is
in the same form as the md5sum command on Linux.

Change-Id: Ie0e6faf678469ac886bba8b46d98c0e54976a1ed
Signed-off-by: Scott Anderson <saa@google.com>
2012-01-11 18:13:26 -08:00
Kenny Root b953fc2849 Use strlcpy instead of strncpy
Also make sure the read cmdline is terminated with a null byte.

Change-Id: I6b4aa197ce9bc072a912b7163e8616a03b39c3fe
2011-12-01 14:54:13 -08:00
Jeff Brown e4e21796f7 Make timestamps friendlier.
Change-Id: I378c3028630a7f805c3f730da02bbbfe07ec3654
2011-11-23 15:02:41 -08:00
Jeff Brown 9de370e165 Show the resolution of each axis.
Change-Id: I81c4b7e6480b98e59fb389060ab2c8d34257ae5f
2011-08-16 17:19:30 -07:00