summaryrefslogtreecommitdiffstats
path: root/toolbox
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of cb8c583d to stage-aosp-masterDmitriy Ivanov2014-11-031-1/+1
|\ | | | | | | Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
| * Fix ps <process name>Dmitriy Ivanov2014-11-031-1/+1
| | | | | | | | | | | | | | | | Use /proc/pid/cmdline instead of /proc/pid/stat to filter process by name. Bug: 8638853 Change-Id: I469f55186e0d8b93311438cc8a1d0f73834f3fb5
* | am 8218b6aa: newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-101-1/+3
|\ \ | | | | | | | | | | | | * commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447': newfs_msdos: Set sectors per fat once
| * | newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an issue causing the fat size to shrink too small, causing a fsck check to fail. Bug: 17949028 Bug: 17761281 Change-Id: Id0207f2ab44e57ff81f5a53494b45344822a6495 Signed-off-by: Daniel Rosenberg <drosen@google.com>
| * | Refresh toolbox.Elliott Hughes2014-07-2550-2089/+5901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more upstream NetBSD, and update those things that were already NetBSD. Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have changes marked by __ANDROID__. Bug: 16493461 (cherry picked from commit fd4c6b0a3a25921a9fe24691a695d715aecb6afe) Change-Id: I53267edaac0b92ad062a5df0f3201e3952eb084e
| * | Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGESreeram Ramachandran2014-07-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netd is supposed to be restarted when the zygote is restarted (see the "onrestart" section for "service zygote" in init.zygote*.rc). But this only works if you send a restart command (say via "ctl.restart"). "stop && start" != "restart". It seems ingrained in developers to do "stop && start", so we don't have much hope of convincing everyone to switch to "adb shell restart", even if we did add such a toolbox command. (cherry picked from commit 018c6a57f3ba41b46deb8dc5fe542765e5b78791) Bug: 15855807 Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
| * | Switch to NetBSD's kill(1).Elliott Hughes2014-07-223-154/+272
| | | | | | | | | | | | | | | | | | (cherry picked from commit 5054c0db7075c5565c476f74ec0a995e9b756660) Change-Id: I7e1e311d8d8e43e4ee59119eef4eec13c552cae9
| * | Fix cp(1) for files in /proc.Elliott Hughes2014-07-222-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also modernize the Android-specific hacks. Bug: https://code.google.com/p/android/issues/detail?id=70793 (cherry picked from commit 1dc64f7a46a9cbac4a90c2cb7445fbbb7c5c8193) Change-Id: Icacb20e735ec4ab3a93889f06a8d7b1a917f6b16
* | | am f7c287b7: am 47d24416: Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
|\ \ \ | | |/ | |/| | | | | | | * commit 'f7c287b750a2353976fc51aa3b45b380024ae84b': Fix top for very large VSS.
| * | Fix top for very large VSS.Elliott Hughes2014-10-081-17/+30
| | | | | | | | | | | | | | | Bug: 17913995 Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
* | | am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."Elliott Hughes2014-10-061-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '85cac2abd416120646b0fe058aac812ca517d71b': Fix a typo in ioctl usage message.
| * | Fix a typo in ioctl usage message.Elliott Hughes2014-10-061-1/+1
| | | | | | | | | | | | Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
* | | am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now."Elliott Hughes2014-09-241-3/+0
|\ \ \ | |/ / | | | | | | | | | * commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8': bionic has O_RSYNC now.
| * | bionic has O_RSYNC now.Elliott Hughes2014-09-231-3/+0
| | | | | | | | | | | | Change-Id: Idad77b6ddc0abe270edff773bb0316d30b9f894d
* | | am 61b4b809: am d1d11fcb: Merge "Build the optional \'r\' tool separately."Elliott Hughes2014-08-292-5/+11
|\ \ \ | |/ / | | | | | | | | | * commit '61b4b8095a4de1e4d8ea27f860c32ea345b37bfa': Build the optional 'r' tool separately.
| * | Build the optional 'r' tool separately.Elliott Hughes2014-08-282-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | You can't use $(TARGET_BUILD_VARIANT) to change how a module is built like this makefile used to. Change-Id: Ie6a274cab9a77eb2376a9494e9c17aae8ba0ee0b Signed-off-by: Olivier Fourdan <olivier.fourdan@intel.com> Signed-off-by: Guilhem IMBERTON <guilhem.imberton@intel.com>
* | | am 619765d7: am 31e29dbe: Merge "Remove duplication from sendevent.c."Elliott Hughes2014-08-261-42/+4
|\ \ \ | |/ / | | | | | | | | | * commit '619765d7364234f5f13c3e2a1d3094be6c6839aa': Remove duplication from sendevent.c.
| * | Remove duplication from sendevent.c.Elliott Hughes2014-08-251-42/+4
| | | | | | | | | | | | Change-Id: I402e68f843e9673e1c02e4f84f4832380c0e91ac
* | | am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)."Elliott Hughes2014-08-243-2/+109
|\ \ \ | |/ / | | | | | | | | | * commit 'b48c46bcc2986ccb0a2bcac5549285537d8d9d1a': Add BSD false(1) and true(1).
| * | Add BSD false(1) and true(1).Elliott Hughes2014-08-223-2/+109
| | | | | | | | | | | | | | | Bug: 17000769 Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
* | | am 70b5cb79: am c9343cfe: Merge "Refresh toolbox."Elliott Hughes2014-07-2550-2089/+5901
|\ \ \ | |/ / | | | | | | | | | * commit '70b5cb79486e2af9df2213b7305c4e0b5ee18dfd': Refresh toolbox.
| * | Refresh toolbox.Elliott Hughes2014-07-2450-2089/+5901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more upstream NetBSD, and update those things that were already NetBSD. Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have changes marked by __ANDROID__. Bug: 16493461 Change-Id: I99762bfe02caa0945ea4a184670888a4b5435a1d
* | | am 04857219: am 2fd1fec6: Merge "Switch to NetBSD\'s kill(1)."Elliott Hughes2014-07-223-154/+272
|\ \ \ | |/ / | | | | | | | | | * commit '04857219b2a28653aeed8e42891d995cd0d712f7': Switch to NetBSD's kill(1).
| * | Merge "Switch to NetBSD's kill(1)."Elliott Hughes2014-07-223-154/+272
| |\ \
| | * | Switch to NetBSD's kill(1).Elliott Hughes2014-07-223-154/+272
| | | | | | | | | | | | | | | | Change-Id: Idd1635673e01758b5a7d34f1fdfbb695296c6164
* | | | am 1ff2df3f: am 82a2687a: Merge "Fix cp(1) for files in /proc."Elliott Hughes2014-07-222-12/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1ff2df3f642018277066d73fcd57db08d41d387f': Fix cp(1) for files in /proc.
| * | | Merge "Fix cp(1) for files in /proc."Elliott Hughes2014-07-222-12/+12
| |\ \ \
| | * | | Fix cp(1) for files in /proc.Elliott Hughes2014-07-222-12/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Also modernize the Android-specific hacks. Bug: https://code.google.com/p/android/issues/detail?id=70793 Change-Id: I2aebcd2ff10ca2466017379d87f5fabdb77c05e2
* | | | am 1575e163: am 34627d82: Merge "Stop and start netd explicitly for "adb ↵Sreeram Ramachandran2014-07-222-0/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | shell stop/start"." * commit '1575e1639c7c72f042fe20f0d862f53b55ded651': Stop and start netd explicitly for "adb shell stop/start".
| * | Stop and start netd explicitly for "adb shell stop/start".Sreeram Ramachandran2014-07-192-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | netd is supposed to be restarted when the zygote is restarted (see the "onrestart" section for "service zygote" in init.zygote*.rc). But this only works if you send a restart command (say via "ctl.restart"). "stop && start" != "restart". It seems ingrained in developers to do "stop && start", so we don't have much hope of convincing everyone to switch to "adb shell restart", even if we did add such a toolbox command. Bug: 15855807 Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
* | newfs_msdos: Added option to cluster-align the start of the root directoryDaniel Rosenberg2014-07-161-31/+69
| | | | | | | | | | | | | | This follows the recommendations of the SD-card association. Change-Id: Ie89a5972d086b3df9d92e631c394a521f807b016 Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | am ce61f74f: am 56cbd19b: Merge "Fix build."Christopher Ferris2014-07-121-1/+1
|\ \ | |/ | | | | | | * commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963': Fix build.
| * Fix build.Christopher Ferris2014-07-101-1/+1
| | | | | | | | Change-Id: Ied4adacde94ee10deb30647156f07d46a38fbe1f
* | am 802943ab: am 8098114c: Merge "Sync with upstream grep."Elliott Hughes2014-07-124-19/+19
|\ \ | |/ | | | | | | * commit '802943ab514de0814078b2e0a400d18632daa188': Sync with upstream grep.
| * Sync with upstream grep.Elliott Hughes2014-07-104-19/+19
| | | | | | | | Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
* | am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing"Elliott Hughes2014-07-121-1/+0
|\ \ | |/ | | | | | | * commit '895d67473854e89abf5834be66a79589de8c4b9e': fix duplicated grep usage printing
| * fix duplicated grep usage printingRocky Zhang2014-07-111-1/+0
| | | | | | | | | | Change-Id: I579d2046f96ba8ae9fd0bf8f36e2e2f64da622ea Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
* | Made formatting for newfs_msdos.c more uniformDaniel Rosenberg2014-07-091-646/+617
| | | | | | | | | | Change-Id: I3d14350c70c05a7e2f713d0065524d78f9a413c6 Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | am f0c19562: am fdd4ffd1: am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c."Elliott Hughes2014-06-261-17/+18
|\ \ | |/ | | | | | | * commit 'f0c195625b499257d8b957321b75b52aacac857e': Fix %llx to PRIx64 in nandread.c.
| * Fix %llx to PRIx64 in nandread.c.Elliott Hughes2014-06-251-17/+18
| | | | | | | | Change-Id: I541d1f4efac3c91d1a26f60735c72e799490fcc9
* | am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ↵Colin Cross2014-06-191-14/+8
|\ \ | |/ | | | | | | | | | | ipaddr and mask values" * commit '08c704a0fe64927fa8618c576c20e39de7f1aa19': Use inet_ntoa to display ipaddr and mask values
| * Use inet_ntoa to display ipaddr and mask valuesBhanu Chetlapalli2014-06-181-14/+8
| | | | | | | | | | Signed-off-by: Chris Dearman <chris@mips.com> Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
| * Add mknod utility to system/core/toolboxSujith Ramakrishnan2014-06-112-0/+96
| | | | | | | | Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
| * Getevent: make sure the monotonic timestamp is displayed; warning cleanup.Sasha Levitskiy2014-06-111-4/+10
| | | | | | | | | | Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5 Signed-off-by: Sasha Levitskiy <sanek@google.com>
| * toolbox: Add nohup commandGlenn Kasten2014-06-112-0/+27
| | | | | | | | | | Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | resolved conflicts for merge of 41b797de to masterKenny Root2014-06-112-70/+68
|\ \ | |/ | | | | Change-Id: Id433da0bde006a6661431ee58a627497f07c7cdf
| * Switch md5 over to openssl rather than libc.Elliott Hughes2014-06-092-68/+66
| | | | | | | | | | | | | | | | | | It doesn't make any sense for the C library to contain private stuff that's only used by toolbox. Rather than move that stuff out of bionic and into here, let's just use the same MD5 implementation the rest of the system's using. Change-Id: Ia1c73164124094b532af3453b90c4bd1ebfdaa24
* | am 7bbfb8cb: am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes ↵Elliott Hughes2014-05-221-2/+0
|\ \ | |/ | | | | | | | | | | of <sys/atomics.h>." * commit '7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b': Remove unnecessary #includes of <sys/atomics.h>.
| * Remove unnecessary #includes of <sys/atomics.h>.Elliott Hughes2014-05-221-2/+0
| | | | | | | | | | Bug: 14903517 Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
* | am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"Greg Hackmann2014-05-211-2/+2
|\ \ | |/ | | | | | | * commit 'ac239a915b08823166657d6a3bfad094e57db0be': toolbox: fix x86 build
generated by cgit v1.1 at 2025-01-26 14:11:33 +0000