Commit Graph

86 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 30be93c6e2 am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'

* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
  Userland support for VM interconnection
2010-07-29 15:55:34 -07:00
Jean-Baptiste Queru 60c8f863ca resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
2010-07-29 15:53:16 -07:00
Jean-Baptiste Queru 0fcbdb4147 Merge "Userland support for VM interconnection" 2010-07-29 15:04:57 -07:00
Kenny Root 7a58bcfb1e am 331eb52d: am 5a0adf95: Merge "Add basic lsof command" into gingerbread
Merge commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657'

* commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657':
  Add basic lsof command
2010-07-27 13:02:58 -07:00
Kenny Root 331eb52d61 am 5a0adf95: Merge "Add basic lsof command" into gingerbread
Merge commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4' into gingerbread-plus-aosp

* commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4':
  Add basic lsof command
2010-07-27 13:00:58 -07:00
Kenny Root 5a0adf95b1 Merge "Add basic lsof command" into gingerbread 2010-07-27 12:58:23 -07:00
Kenny Root 2d392f24b8 am 65757da0: am 53308d4c: Correct copyright header for uptime and NOTICE
Merge commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd'

* commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd':
  Correct copyright header for uptime and NOTICE
2010-07-27 11:41:50 -07:00
Kenny Root 65757da0c9 am 53308d4c: Correct copyright header for uptime and NOTICE
Merge commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f' into gingerbread-plus-aosp

* commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f':
  Correct copyright header for uptime and NOTICE
2010-07-27 11:39:19 -07:00
Kenny Root 53308d4cd5 Correct copyright header for uptime and NOTICE
Change-Id: I89f91c21db87955b20b1ef9b4590f7009f106b26
2010-07-27 11:26:06 -07:00
Kenny Root 8b9b105bc7 Add basic lsof command
Basic "list open files" command.

Supports reading all processes for their "exe", "cwd", "root", and "fd"
entries.

Change-Id: I2e2f0911dd65a1993aa1ce9f51222bf264a9d68d
2010-07-27 11:22:20 -07:00
The Android Open Source Project 534bc027a2 am 869cc685: merge from open-source master
Merge commit '869cc685b171c5c0c1efbad5df693cfaebe0af43'

* commit '869cc685b171c5c0c1efbad5df693cfaebe0af43':
  fix insmod reading more than one module parameter
2010-07-16 13:30:54 -07:00
The Android Open Source Project 869cc685b1 merge from open-source master
Change-Id: I9365615f5f94484fb5ab28bb076b25fb4721e2bc
2010-07-16 13:23:40 -07:00
Jean-Baptiste Queru e3f6a6e1d3 Merge "fix insmod reading more than one module parameter" 2010-07-16 07:26:05 -07:00
Dries Harnie 2a743730c7 Userland support for VM interconnection
Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
2010-07-15 13:19:37 +02:00
The Android Open Source Project f4f7697f69 am 0bcda269: merge from open-source master
Merge commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60'

* commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60':
  Add -R to chmod
  Add -p support to mkdir
2010-07-14 16:16:20 -07:00
The Android Open Source Project 0bcda26970 merge from open-source master
Change-Id: If9a300a80228f30166ed42853ae13236aaa2eee5
2010-07-14 16:12:40 -07:00
Jean-Baptiste Queru 6cebee2647 Merge "Add -R to chmod" 2010-07-14 15:17:47 -07:00
Jean-Baptiste Queru 34225919ab Merge "Add -p support to mkdir" 2010-07-14 15:15:53 -07:00
Anthony Newnam 365a09e817 Add -R to chmod
Change-Id: I30f976598bd937f656a3ad3395349f09e695cfce
2010-07-14 13:30:11 -05:00
Anthony Newnam b55de67985 Add -p support to mkdir
Change-Id: Ia0298ccc6b476d6bd6756471c05ef2a345312734
2010-07-14 13:29:42 -05:00
Kenny Root 45f7fde3c9 am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly
Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'

* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
  Display file sizes larger than 2GB correctly
2010-06-25 14:21:11 -07:00
Kenny Root 0b1ff6be08 am eb42170e: Display file sizes larger than 2GB correctly
Merge commit 'eb42170e6c8b70f11dca9965785aa04a80290c72' into gingerbread-plus-aosp

* commit 'eb42170e6c8b70f11dca9965785aa04a80290c72':
  Display file sizes larger than 2GB correctly
2010-06-25 09:50:08 -07:00
Kenny Root eb42170e6c Display file sizes larger than 2GB correctly
File size was cast to a signed integer which displayed files over 2GB as
negative sizes on devices. Use a long long for printing instead which
matches the stat struct.

Change-Id: I0ec07f33716bb4c2e5d120633ed435f637238f46
2010-06-25 09:08:05 -07:00
Jean-Baptiste Queru 7570ab61d4 am f72961d0: merge from froyo-plus-aosp 2010-06-09 16:28:31 -07:00
Jean-Baptiste Queru f72961d068 merge from froyo-plus-aosp
Change-Id: I82ec6dbd7c8c3b37b9505eaef351042f2ee53fb5
2010-06-09 16:26:32 -07:00
The Android Open Source Project 7c84efe083 merge from open-source master
Change-Id: I2f725ca20bf08748a4b3e81a4e98fbe08fcf1a47
2010-06-09 07:16:49 -07:00
David 'Digit' Turner aa2106b008 toolbox-ls: sort file and directory lists
Sorts file and directory names properly in 'ls'
+ accept group flags (e.g. '-ld' instead of '-l -d')
+ accept flags in any position on the command line (e.g. 'ls foo -l' works)

Change-Id: Idc24a69ae31fe0c13726d39892357ac89a8830db
2010-06-04 10:44:56 -07:00
The Android Open Source Project a92be64809 am 53a79a84: am 49337b27: merge from open-source master 2010-05-19 11:35:48 -07:00
The Android Open Source Project 53a79a841b am 49337b27: merge from open-source master
Merge commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d' into kraken

* commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d':
  Fix "route add default dev <iface>" behaviour
2010-05-19 11:33:56 -07:00
The Android Open Source Project 49337b27d9 merge from open-source master
Change-Id: I77e33ce567b9682f51785cc574e37dc2cd15028f
2010-05-19 11:28:01 -07:00
Colin Cross 4e7dd3d270 mount: Add support for remounting without specifying device
Change-Id: I48c84fab3ab2a9704ec5b7bf7002b8960fa53c27
2010-05-07 12:09:19 -07:00
Daniel Baeyens e898faddb3 Fix "route add default dev <iface>" behaviour
Previous behaviour was to set route's network mask as 255.255.255.255
Setting a destination network with netmask /32 blocks the connections
just to the specified host. 0.0.0.0/32 defines the exact IPv4 address
0.0.0.0 and not the whole IPv4 hosts range.
This patch allows traffic to any network, setting a 0.0.0.0/0 route.

Change-Id: I1665f2fac52526337bb2c48e3b09564d9da448e7
2010-04-21 01:51:18 +02:00
Viral Mehta 918fb893e8 fix insmod reading more than one module parameter
it seems wrong to put '/0' after reading one argument
if we are passing more than one module parameters, they are not being propogated
to the kernel properly.

Second module parameters onwards are simply being ignored by kernel
since insmod incorrectly put '/0' after reading first module parameter

Change-Id: I54283eb30a66a83d5c619ffb1fb174ccf5fdcaf7
2010-04-20 09:53:12 +05:30
Jean-Baptiste Queru 1ded19f455 fix build
Change-Id: I93714131dc9d18797009154e6e25dc6e122058c7
2010-04-12 14:15:23 -07:00
The Android Open Source Project a8415325a8 am 1888de8e: merge from open-source master
Merge commit '1888de8e13f82f7af21bce267254fac124237afe' into kraken

* commit '1888de8e13f82f7af21bce267254fac124237afe':
  toolbox: add "uptime" command
2010-04-12 13:28:12 -07:00
The Android Open Source Project 1888de8e13 merge from open-source master
Change-Id: Ife9c7a92ed7abd59b6b3612ba908bcae77055767
2010-04-12 13:23:51 -07:00
Mike Lockwood 5ffbf26ebf toolbox: add "uptime" command
Prints elapsed real time since boot, as well as idle time and sleep time.

Change-Id: I97f482d6087e9f802d74e91147bf767e6b2d4f42
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-09 16:42:42 -04:00
Mike Lockwood a699d6256f toolbox: add "uptime" command
Prints elapsed real time since boot, as well as idle time and sleep time.

Change-Id: I97f482d6087e9f802d74e91147bf767e6b2d4f42
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-09 15:30:06 -04:00
Arve Hjønnevåg b51cb880c0 Merge "toolbox: nandread: Add options to extract raw images, partial images, and fix bad block check." 2010-03-08 14:51:01 -08:00
Arve Hjønnevåg b6b8793b8b toolbox: nandread: Add options to extract raw images, partial images, and fix bad block check. 2010-03-03 16:48:38 -08:00
San Mehat 661aff600c newfs_msdos: Allow -s option to work by itself
Signed-off-by: San Mehat <san@google.com>
2010-03-03 12:40:21 -08:00
San Mehat 10d469bff9 system: Add support for getting/setting i/o priorities and include a userspace tool
Signed-off-by: San Mehat <san@google.com>
2010-02-25 14:02:55 -08:00
Andrew Stadler 715c889713 Allow numeric uid & gid in chown
This makes it more like the POSIX version which accepts number or name.
2010-02-12 13:46:58 -08:00
Colin Cross 1b1fd61295 Remove definitions that are now in bionic libc 2010-01-14 12:47:12 -08:00
San Mehat eab453c612 toolbox: newfs_msdos: Exit on write failure, and handle bogus geometry from the kernel
Signed-off-by: San Mehat <san@google.com>
2010-01-10 11:10:21 -08:00
San Mehat ff3bcd0307 toolbox: newfs_msdos: If geometry is not available, use some sane-ish defaults
Signed-off-by: San Mehat <san@google.com>
2010-01-05 13:49:11 -08:00
San Mehat 0163f77a83 am 6dba735a: am 0d6f587f: am 39274417: toolbox: Add scheduling policy display to top/ps
Merge commit '6dba735a61d4b65594fa0ad7fd15ec09c3c42ce9'

* commit '6dba735a61d4b65594fa0ad7fd15ec09c3c42ce9':
  toolbox: Add scheduling policy display to top/ps
2009-10-28 23:50:56 -07:00
San Mehat 392744175c toolbox: Add scheduling policy display to top/ps
Signed-off-by: San Mehat <san@google.com>
2009-10-27 12:27:47 -07:00
Android (Google) Code Review b44224d56d Merge change Ic0e6195f
* changes:
  toolbox: Add nandread command
2009-10-08 20:11:36 -04:00
Arve Hjønnevåg 7c953d04bc toolbox: Add nandread command
Extracts a nand image from an mtd partition with page data followed by
64 bytes of extra data.
2009-10-01 17:40:33 -07:00