Commit graph

11691 commits

Author SHA1 Message Date
Elliott Hughes
1fdd4dc0bc am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""
* commit '4083ed7dff6e1dd8e20bec04f9451061951394f5':
  Revert "fs_mgr: Support filesystem labels in fstab"
2015-01-23 00:50:46 +00:00
JP Abgrall
253b9cfba5 am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"
* commit 'f9e2339553f70aebdd170e96ab9332b28c3851b4':
  fs_mgr: Support filesystem labels in fstab
2015-01-23 00:50:36 +00:00
Elliott Hughes
4083ed7dff Merge "Revert "fs_mgr: Support filesystem labels in fstab"" 2015-01-23 00:34:08 +00:00
Elliott Hughes
572226c25c Revert "fs_mgr: Support filesystem labels in fstab"
This reverts commit 69407ccb02.

Change-Id: I537a3b4257b7bc2a69f1f4d62b4e18e91f2dc713
2015-01-23 00:33:43 +00:00
JP Abgrall
f9e2339553 Merge "fs_mgr: Support filesystem labels in fstab" 2015-01-22 23:59:05 +00:00
Mark Salyzyn
6f355d2c8f am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"
* commit '045be135de5acee7a2d0fd7e303dc15ded2d69fa':
  liblog: logcat color output corrupted on 32-bit
2015-01-22 19:08:27 +00:00
Mark Salyzyn
045be135de Merge "liblog: logcat color output corrupted on 32-bit" 2015-01-22 18:12:14 +00:00
Mark Salyzyn
e2428429e0 liblog: logcat color output corrupted on 32-bit
sizeof(suffixBuf), not sizeof(suffixLen)!

Change-Id: I6e085089237585bb8b406372639b644556747699
2015-01-22 10:00:04 -08:00
Christopher Ferris
bd3bbff674 am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
* commit 'd426a4e7b62c18124827868ddbf8987aa433451b':
  Move 32 bit/64 bit check into debuggerd.
2015-01-22 00:13:01 +00:00
Christopher Ferris
d426a4e7b6 Merge "Move 32 bit/64 bit check into debuggerd." 2015-01-21 18:39:49 +00:00
Christopher Ferris
9774df6134 Move 32 bit/64 bit check into debuggerd.
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone
try and directly contact the correct debuggerd (32 bit vs 64 bit)
by reading the elf information for the executable.
Unfortunately, system_server makes a call to dump_backtrace_to_file
and it doesn't have permissions to read the executable data, so it
defaults to always contacting the 64 bit debuggerd.
This CL changes the code so that all dump requests go to the 64 bit
debuggerd, which reads the elf information and redirects requests for
32 bit processes to the 32 bit debuggerd.

Testing:

- Forced the watchdog code in system_server to dump stacks and
  verified that all native stacks are dumped correctly.
- Verified that dumpstate and bugreport still properly dump the native
  processes on a 64 bit and 32 bit system.
- Intentionally forced the 64 bit to 32 bit redirect to write only a
  byte at a time and verified there are no errors, and no dropped data.
- Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes
  seemlessly.
- Used debuggerd on a 32 bit system to dump native stacks.

Bug: https://code.google.com/p/android/issues/detail?id=97024
Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
2015-01-20 17:22:07 -08:00
Christoffer Dall
69407ccb02 fs_mgr: Support filesystem labels in fstab
When mounting fstab entries it is practical to be able to specify
for example LABEL=data instead of a specific block device.

This is particularly important for the new Android Emulator code base,
which uses virtio block devices for the various partitions
(system,data,cache), because there is no defined ordering between the
way the filesystems are specified to the emulator and how they are
enumerated by the android kernel as /dev/vdX.

Change-Id: I12c3db0ba6a515dc8e917e0349afd257888d3aef
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-17 21:05:39 +01:00
Elliott Hughes
f8eac2ffc6 am ce34551c: Merge "Lose id to toybox."
* commit 'ce34551ce6559fe97043a26e3df65396c91bdffc':
  Lose id to toybox.
2015-01-17 03:50:05 +00:00
Elliott Hughes
ce34551ce6 Merge "Lose id to toybox." 2015-01-17 03:38:31 +00:00
Elliott Hughes
1bf5054342 Lose id to toybox.
Change-Id: I0b92482d06055207e133112e74c58964c7ef0362
2015-01-16 19:24:26 -08:00
Elliott Hughes
bb604524fb am 45c4c06f: Merge "Remove unused cruft from libcutils."
* commit '45c4c06ffe6f38e0f77f37f488e07f2537eddd45':
  Remove unused cruft from libcutils.
2015-01-16 16:02:24 +00:00
Elliott Hughes
45c4c06ffe Merge "Remove unused cruft from libcutils." 2015-01-16 15:52:17 +00:00
Jeff Sharkey
7c42c7f84f am 9f72ef89: Merge "Extend to receive NFLOG packets."
* commit '9f72ef8944a93bd333c6c7f87c7f7d79207ae663':
  Extend to receive NFLOG packets.
2015-01-16 06:07:29 +00:00
Elliott Hughes
f21717cd87 Remove unused cruft from libcutils.
Change-Id: I316d39e8e0a9aa385d8e1f37678b8bf2c03441eb
2015-01-15 21:16:03 -08:00
Jeff Sharkey
9f72ef8944 Merge "Extend to receive NFLOG packets." 2015-01-16 01:11:02 +00:00
Elliott Hughes
f5a6c6bbb5 am 17e2f436: Merge "Lose cmp to toybox."
* commit '17e2f436f0da70673498482921a642c8917677aa':
  Lose cmp to toybox.
2015-01-15 23:55:45 +00:00
Christopher Ferris
f4f4d10950 am 791a6905: Merge "Add timed versions of stack dumping functions."
* commit '791a690596a221c6cf05135c517e2f1834b86425':
  Add timed versions of stack dumping functions.
2015-01-15 23:51:56 +00:00
Elliott Hughes
17e2f436f0 Merge "Lose cmp to toybox." 2015-01-15 23:45:51 +00:00
Christopher Ferris
791a690596 Merge "Add timed versions of stack dumping functions." 2015-01-15 23:40:19 +00:00
Christopher Ferris
fa41e0f5c8 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581

(cherry picked from commit 5f2ff6a910)

Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
2015-01-15 15:34:21 -08:00
Elliott Hughes
b546991685 Lose cmp to toybox.
Change-Id: Ib8b078565e4951f7621d21fbe3573bfcf2435879
2015-01-15 14:59:22 -08:00
Elliott Hughes
d5c46b6370 am 3d7951d4: Merge "Lose chown to toybox."
* commit '3d7951d4a43af35fc7d61a8a69fb2acf4bc50f1b':
  Lose chown to toybox.
2015-01-15 22:58:23 +00:00
Elliott Hughes
3d7951d4a4 Merge "Lose chown to toybox." 2015-01-15 22:47:38 +00:00
Elliott Hughes
6eb88b2c1d Lose chown to toybox.
Change-Id: Ic56addb183ce7f1d289b807527047c37924c1aa6
2015-01-15 13:47:00 -08:00
Dmitry Shmidt
2901b30a58 am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev
* commit '70f6dea9d06876bc65181c40ee9e623be196fb4c':
  android_filesystem: Remove setuid bits from tcpdump
2015-01-15 20:51:35 +00:00
Jeff Sharkey
9a20e67fa6 Extend to receive NFLOG packets.
Packets captured and logged by the NFLOG target are unicast, so
extend to catch and decode them.  To avoid escaping issues, the raw
contents are passed around as hex strings.

Bug: 18335678
Change-Id: Ib7299500baa00080a1f000f9da843eb527363353
2015-01-15 12:50:59 -08:00
Dmitry Shmidt
70f6dea9d0 Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev 2015-01-15 20:45:06 +00:00
Dmitry Shmidt
33e4f4d81a android_filesystem: Remove setuid bits from tcpdump
Bug: 18669116

Change-Id: I25486f2fe0e994f569b788fc9f03ef6d383f54d4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2015-01-15 10:35:54 -08:00
Jean-Michel Trivi
a2c6f6cdcf am c6c3c7d4: Merge "Remove explict use of ASCII encoding" into lmp-mr1-dev
* commit 'c6c3c7d44508dc8a80be794cbb97ed416b0eb539':
  Remove explict use of ASCII encoding
2015-01-15 18:24:02 +00:00
Jean-Michel Trivi
827f19154c am 6c555ea3: (-s ours) Merge "Return path including executable instead of without" into lmp-mr1-dev
* commit '6c555ea3058d957795c40bc07b264701427453a2':
  Return path including executable instead of without
2015-01-15 18:24:01 +00:00
Jean-Michel Trivi
b6327778e0 am 1a65d5b3: (-s ours) Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-dev
* commit '1a65d5b3516ba5750e17b3cb5bc64a585b17f69a':
  Fix building on modern versions of Xcode and OS X.
2015-01-15 18:07:08 +00:00
Jean-Michel Trivi
c6c3c7d445 Merge "Remove explict use of ASCII encoding" into lmp-mr1-dev 2015-01-15 17:16:22 +00:00
Jean-Michel Trivi
6c555ea305 Merge "Return path including executable instead of without" into lmp-mr1-dev 2015-01-15 17:16:01 +00:00
Jean-Michel Trivi
1a65d5b351 Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-dev 2015-01-15 17:15:33 +00:00
Narayan Kamath
50481146a9 am e232949c: Merge "sdcard : inode numbers must be fully representable as uint32_t."
* commit 'e232949c898c940d3528aaf187d7a359c430a311':
  sdcard : inode numbers must be fully representable as uint32_t.
2015-01-15 12:14:12 +00:00
Narayan Kamath
e232949c89 Merge "sdcard : inode numbers must be fully representable as uint32_t." 2015-01-15 11:59:45 +00:00
Narayan Kamath
5aadceb56f sdcard : inode numbers must be fully representable as uint32_t.
This works around a bug on on 64 bit kernels + sdcard daemons
where we were using memory addresses as inode numbers.

bug: 19012244

(cherry picked from commit faa0935ffb)

Change-Id: Idbf9e285e507e702e04e7461a10153df68ef2322
2015-01-15 11:58:53 +00:00
Narayan Kamath
4b69d15c03 am 0f86444b: Merge "sdcard : inode numbers must be fully representable as uint32_t." into lmp-mr1-dev
* commit '0f86444b3912cadb4227755f3b80d2ff74841575':
  sdcard : inode numbers must be fully representable as uint32_t.
2015-01-15 10:26:27 +00:00
Narayan Kamath
0f86444b39 Merge "sdcard : inode numbers must be fully representable as uint32_t." into lmp-mr1-dev 2015-01-15 09:43:10 +00:00
Christopher Ferris
844c7ccc0a am 5f2ff6a9: Add timed versions of stack dumping functions.
* commit '5f2ff6a9106083e2a79b8600a0bf6a5341c6ca38':
  Add timed versions of stack dumping functions.
2015-01-15 01:48:27 +00:00
Elliott Hughes
776158fed3 am 41341eea: Merge "Lose date to toybox (as date and hwclock)."
* commit '41341eea6b32b1c3012a976cfb75704007c39449':
  Lose date to toybox (as date and hwclock).
2015-01-15 00:42:41 +00:00
Christopher Ferris
5f2ff6a910 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
2015-01-14 15:24:33 -08:00
Elliott Hughes
41341eea6b Merge "Lose date to toybox (as date and hwclock)." 2015-01-14 23:01:05 +00:00
Elliott Hughes
587e30c91c am 3bb5654a: Merge "Lose ifconfig to toybox."
* commit '3bb5654a46f062b87f6bdbbf8b8945bc9e99947b':
  Lose ifconfig to toybox.
2015-01-14 20:24:51 +00:00
Elliott Hughes
f8bf054fab Lose date to toybox (as date and hwclock).
Change-Id: I7015454edd2240413d93509a96ad884592fcaae9
2015-01-14 12:24:23 -08:00