Commit Graph

353 Commits

Author SHA1 Message Date
Dmitriy Ivanov 359d58dc0f resolved conflicts for merge of cb8c583d to stage-aosp-master
Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
2014-11-03 09:27:47 -08:00
Dmitriy Ivanov 65267bcc27 Fix ps <process name>
Use /proc/pid/cmdline instead of /proc/pid/stat
 to filter process by name.

Bug: 8638853
Change-Id: I469f55186e0d8b93311438cc8a1d0f73834f3fb5
2014-11-03 01:28:31 -08:00
Daniel Rosenberg 8bdcc99d60 am 8218b6aa: newfs_msdos: Set sectors per fat once
* commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447':
  newfs_msdos: Set sectors per fat once
2014-10-10 23:38:45 +00:00
Daniel Rosenberg 8218b6aae9 newfs_msdos: Set sectors per fat once
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>
2014-10-10 14:40:48 -07:00
Elliott Hughes 28a78a25cf am f7c287b7: am 47d24416: Merge "Fix top for very large VSS."
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
  Fix top for very large VSS.
2014-10-08 18:30:26 +00:00
Elliott Hughes 052d78f334 Fix top for very large VSS.
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
2014-10-08 11:20:03 -07:00
Elliott Hughes eb7072a576 am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."
* commit '85cac2abd416120646b0fe058aac812ca517d71b':
  Fix a typo in ioctl usage message.
2014-10-06 17:19:38 +00:00
Elliott Hughes a0d61ba3e9 Fix a typo in ioctl usage message.
Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
2014-10-06 10:09:25 -07:00
Elliott Hughes 45625ecc43 am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now."
* commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8':
  bionic has O_RSYNC now.
2014-09-24 05:08:24 +00:00
Elliott Hughes c2d9837c0e bionic has O_RSYNC now.
Change-Id: Idad77b6ddc0abe270edff773bb0316d30b9f894d
2014-09-23 20:12:05 -07:00
Elliott Hughes e10d297e33 am 61b4b809: am d1d11fcb: Merge "Build the optional \'r\' tool separately."
* commit '61b4b8095a4de1e4d8ea27f860c32ea345b37bfa':
  Build the optional 'r' tool separately.
2014-08-29 16:41:04 +00:00
Elliott Hughes 660e750b12 Build the optional 'r' tool separately.
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>
2014-08-28 20:44:20 -07:00
Elliott Hughes 2f26c56a49 am 619765d7: am 31e29dbe: Merge "Remove duplication from sendevent.c."
* commit '619765d7364234f5f13c3e2a1d3094be6c6839aa':
  Remove duplication from sendevent.c.
2014-08-26 16:13:02 +00:00
Elliott Hughes 8e947fe716 Remove duplication from sendevent.c.
Change-Id: I402e68f843e9673e1c02e4f84f4832380c0e91ac
2014-08-25 22:16:08 -07:00
Elliott Hughes a024c2e770 am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
* commit 'b48c46bcc2986ccb0a2bcac5549285537d8d9d1a':
  Add BSD false(1) and true(1).
2014-08-24 08:57:39 +00:00
Elliott Hughes 50221f5837 Add BSD false(1) and true(1).
Bug: 17000769
Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
2014-08-22 20:26:23 -07:00
Elliott Hughes c2e2e4271e am 70b5cb79: am c9343cfe: Merge "Refresh toolbox."
* commit '70b5cb79486e2af9df2213b7305c4e0b5ee18dfd':
  Refresh toolbox.
2014-07-25 18:50:46 +00:00
Elliott Hughes 7bb5660647 Refresh toolbox.
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 fd4c6b0a3a)

Change-Id: I53267edaac0b92ad062a5df0f3201e3952eb084e
2014-07-25 10:51:19 -07:00
Elliott Hughes fd4c6b0a3a Refresh toolbox.
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
2014-07-24 17:20:51 -07:00
Elliott Hughes 82ad033562 am 04857219: am 2fd1fec6: Merge "Switch to NetBSD\'s kill(1)."
* commit '04857219b2a28653aeed8e42891d995cd0d712f7':
  Switch to NetBSD's kill(1).
2014-07-22 20:47:05 +00:00
Elliott Hughes d40c7560e4 am 1ff2df3f: am 82a2687a: Merge "Fix cp(1) for files in /proc."
* commit '1ff2df3f642018277066d73fcd57db08d41d387f':
  Fix cp(1) for files in /proc.
2014-07-22 20:36:12 +00:00
Sreeram Ramachandran c7e85bf5e3 am 1575e163: am 34627d82: Merge "Stop and start netd explicitly for "adb shell stop/start"."
* commit '1575e1639c7c72f042fe20f0d862f53b55ded651':
  Stop and start netd explicitly for "adb shell stop/start".
2014-07-22 20:09:20 +00:00
Elliott Hughes 2fd1fec619 Merge "Switch to NetBSD's kill(1)." 2014-07-22 16:25:43 +00:00
Elliott Hughes 5054c0db70 Switch to NetBSD's kill(1).
Change-Id: Idd1635673e01758b5a7d34f1fdfbb695296c6164
2014-07-22 10:46:15 -07:00
Elliott Hughes 82a2687a3c Merge "Fix cp(1) for files in /proc." 2014-07-22 16:18:32 +00:00
Elliott Hughes 1dc64f7a46 Fix cp(1) for files in /proc.
Also modernize the Android-specific hacks.

Bug: https://code.google.com/p/android/issues/detail?id=70793
Change-Id: I2aebcd2ff10ca2466017379d87f5fabdb77c05e2
2014-07-22 13:27:16 -07:00
Sreeram Ramachandran 435fe9bb02 Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGE
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 018c6a57f3)

Bug: 15855807
Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
2014-07-22 22:43:42 +00:00
Elliott Hughes 930d53eae6 Switch to NetBSD's kill(1).
(cherry picked from commit 5054c0db70)

Change-Id: I7e1e311d8d8e43e4ee59119eef4eec13c552cae9
2014-07-22 14:22:02 -07:00
Elliott Hughes bb2e400ec7 Fix cp(1) for files in /proc.
Also modernize the Android-specific hacks.

Bug: https://code.google.com/p/android/issues/detail?id=70793

(cherry picked from commit 1dc64f7a46)

Change-Id: Icacb20e735ec4ab3a93889f06a8d7b1a917f6b16
2014-07-22 13:28:31 -07:00
Sreeram Ramachandran 018c6a57f3 Stop and start netd explicitly for "adb shell stop/start".
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
2014-07-19 18:36:32 +00:00
Daniel Rosenberg 052f275621 newfs_msdos: Added option to cluster-align the start of the root directory
This follows the recommendations of the SD-card association.

Change-Id: Ie89a5972d086b3df9d92e631c394a521f807b016
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-16 16:56:00 -07:00
Christopher Ferris 611dceecd5 am ce61f74f: am 56cbd19b: Merge "Fix build."
* commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963':
  Fix build.
2014-07-12 19:36:58 +00:00
Elliott Hughes c785caa4b4 am 802943ab: am 8098114c: Merge "Sync with upstream grep."
* commit '802943ab514de0814078b2e0a400d18632daa188':
  Sync with upstream grep.
2014-07-12 19:36:58 +00:00
Elliott Hughes 3aad879660 am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing"
* commit '895d67473854e89abf5834be66a79589de8c4b9e':
  fix duplicated grep usage printing
2014-07-12 19:36:58 +00:00
Elliott Hughes 04650ef7f6 Sync with upstream grep.
Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
2014-07-10 19:38:01 -07:00
Rocky Zhang b34b1fcb2b fix duplicated grep usage printing
Change-Id: I579d2046f96ba8ae9fd0bf8f36e2e2f64da622ea
Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
2014-07-11 09:49:35 +08:00
Christopher Ferris 3cbea9f056 Fix build.
Change-Id: Ied4adacde94ee10deb30647156f07d46a38fbe1f
2014-07-10 23:12:49 -07:00
Daniel Rosenberg 33e7b13167 Made formatting for newfs_msdos.c more uniform
Change-Id: I3d14350c70c05a7e2f713d0065524d78f9a413c6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-09 17:33:39 +00:00
Elliott Hughes d2b82e3099 am f0c19562: am fdd4ffd1: am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c."
* commit 'f0c195625b499257d8b957321b75b52aacac857e':
  Fix %llx to PRIx64 in nandread.c.
2014-06-26 00:19:53 +00:00
Elliott Hughes a5f28628b1 Fix %llx to PRIx64 in nandread.c.
Change-Id: I541d1f4efac3c91d1a26f60735c72e799490fcc9
2014-06-25 16:37:18 -07:00
Colin Cross bb8aec4175 am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
* commit '08c704a0fe64927fa8618c576c20e39de7f1aa19':
  Use inet_ntoa to display ipaddr and mask values
2014-06-19 00:57:07 +00:00
Bhanu Chetlapalli 9875ee97c7 Use inet_ntoa to display ipaddr and mask values
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
2014-06-18 17:24:04 -07:00
Kenny Root 7dfdb3c436 resolved conflicts for merge of 41b797de to master
Change-Id: Id433da0bde006a6661431ee58a627497f07c7cdf
2014-06-11 11:02:13 -07:00
Sujith Ramakrishnan 032d4e298b Add mknod utility to system/core/toolbox
Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
2014-06-11 11:10:28 -07:00
Sasha Levitskiy 140b13546a Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-06-11 11:10:28 -07:00
Glenn Kasten 38e5f07c0f toolbox: Add nohup command
Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-06-11 11:10:28 -07:00
Elliott Hughes 7fc47129cf Switch md5 over to openssl rather than libc.
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
2014-06-09 16:10:42 -07:00
Elliott Hughes 6963176fb2 am 7bbfb8cb: am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>."
* commit '7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b':
  Remove unnecessary #includes of <sys/atomics.h>.
2014-05-22 18:27:56 +00:00
Elliott Hughes 617681d355 Remove unnecessary #includes of <sys/atomics.h>.
Bug: 14903517
Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
2014-05-22 10:00:35 -07:00
Greg Hackmann e12dd29755 am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"
* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
  toolbox: fix x86 build
2014-05-21 18:20:55 +00:00