Commit Graph

9694 Commits

Author SHA1 Message Date
JP Abgrall 5c01dac6d8 fsmgr: support multiple fs-types/mountpoint
Previous attempt was broken.
It would incorrectly be affected by mount failures.

This changes allows an fstab to contain multiple lines for a given
mount point.
The lines sharing a mount MUST be after each other.

The 1st matching line is the primary when it comes to mounting
and look ups for wiping.

Mounting based on a mount_point will attempt each dup in turn
until one succeeds.
The reported error will be that of the last failed attempt.

This is to allow quick experimentation between different FSes.

Bug: 15702546
Change-Id: I378d68ad13eb0098ec1ccb8dcf108b82acbe9ebb
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-18 22:18:24 +00:00
JP Abgrall da7a448f38 Merge "fastboot: correctly set dependency on f2fs dynamic lib" 2014-06-18 19:24:54 +00:00
Ying Wang e35e709ecb am fd9cfb4c: am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
* commit 'fd9cfb4c226fe76b50d828c737e7664d8b04a59b':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 23:09:23 +00:00
Mark Salyzyn 025133a8db am 4700dfa0: am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize"
* commit '4700dfa0fbb9be31809b250c001d0275ce0b38dc':
  logcat: test: modernize
2014-06-18 21:40:30 +00:00
Nick Kralevich 000a62f644 am 4224edf5: am 89e4fad0: am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"
* commit '4224edf51dcddf9e014b198bb23fc40ef61a5834':
  adbd: unconditionally call setgroups
2014-06-18 21:40:27 +00:00
Mark Salyzyn e53714bf59 am 2757d76c: am deae968a: am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit '2757d76cd6f0b0c0560751f5e8b9c2656692ffa9':
  logd: Allow apps to clear their UID-specific data
2014-06-18 21:09:34 +00:00
Mark Salyzyn 722e859dec am 9f621cf8: am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '9f621cf8724859419bbb058f197a0b4fa691aa4e':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 21:09:33 +00:00
Mark Salyzyn 2757d76cd6 am deae968a: am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit 'deae968a2c6384531d208f00f27085f5d725989f':
  logd: Allow apps to clear their UID-specific data
2014-06-18 19:19:32 +00:00
Mark Salyzyn 9f621cf872 am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '6bda7716405f3ddc8571c578beaaac4368c840d0':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 19:19:31 +00:00
Mark Salyzyn deae968a2c am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit '4da93e34388748879a25974ee33ff1eb6cc47cd2':
  logd: Allow apps to clear their UID-specific data
2014-06-18 19:16:04 +00:00
Mark Salyzyn 6bda771640 am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '9e7bef0ef91e819a11ceb8b14489cb451970e62e':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 19:16:03 +00:00
JP Abgrall 64c0ff21e4 fastboot: correctly set dependency on f2fs dynamic lib
In the past it would incorrectly also link against the dlopen()'d lib.

Now it clearly does not care about it.

ldd $(which fastboot)
        linux-gate.so.1 =>  (0xf7735000)
        libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf76d9000)
        libstdc++.so.6 => /usr/lib/i386-linux-gnu/libstdc++.so.6 (0xf75f4000)
        libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf75c7000)
        libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf75a9000)
        libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf73ff000)
        /lib/ld-linux.so.2 (0xf7736000)

Bug: 15717498
Change-Id: I5465e97a445b17f5493a1f590e181ef98a382451
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-18 11:13:05 -07:00
Torne (Richard Coles) 11d8ac2afb Only try and use f2fs on linux.
F2FS was already disabled on windows, but the library doesn't build for
mac either, so only try and use it on Linux hosts.

Change-Id: I8bacfa4c01c9ee13123aef6d05d17b3f9094c765
2014-06-18 13:48:38 +01:00
JP Abgrall 55e298e6dc Merge "fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)" 2014-06-17 22:59:52 +00:00
JP Abgrall f786fe5438 fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)
This is apparently breaking N5, so reverting for now.

This reverts commit a794f86522.

Bug: 15709256
Change-Id: I37a5160eead17e153e2c83fa94632ffa5d8553c2
2014-06-18 07:28:14 +00:00
JP Abgrall 6bd72beff6 fastboot: fix windows sdk build (don't do f2fs dyn load on windows)
Only do f2fs dynamic loading on linux.
Adds a stub for windows builds.

Change-Id: I7bbaaa1b2ff5992709d904b7ace40ae263d32922
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 23:43:18 -07:00
JP Abgrall a794f86522 fsmgr: allow for a multiple fs-types for a mount point.
This changes allows an fstab to contain multiple lines for a given
mount point.
The lines sharing a mount MUST be after each other.

The 1st matching line is the primary when it comes to mounting
and look ups for wiping.

Mounting based on a mount_point will attempt each dup in turn
until one succeeds.

This is to allow quick experimentations between different FSes.
It does not deal with checkfs yet, because the underlying invocation
of fs-type appropriate fsck does not handle the error code.
Only the primary FS (1st in the dups) is checked.

Change-Id: I8329737454b53e2681436fe85cd00a9bc522676b
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 17:01:20 -07:00
JP Abgrall 1235158c29 F2FS support for fastboot format and fsmgr
- Enables fsck.f2fs for partitions with type F2FS.
- Adds support for f2fs as format fs-type.
- f2fs is optional and support is dlopen()d when needed.

Needs changes in
  system/extras/f2fs_utils
  external/f2fs-tools

Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 17:01:14 -07:00
Elliott Hughes d478aec2a9 am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit 'bd80e0d8e6de5c2d4fbd2e8a1bc750dc6e0b7e20':
  Changed maps output in debuggerd.
2014-06-17 22:58:11 +00:00
Elliott Hughes bd80e0d8e6 am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit '0ef3fa24fb0c3c58b8440527e4de4f3f98ddaaa5':
  Changed maps output in debuggerd.
2014-06-17 22:52:46 +00:00
Nick Kralevich 4e6aa6a227 Merge "adbd: unconditionally call setgroups" 2014-06-17 21:47:03 +00:00
Nick Kralevich e5cbf4e044 adbd: unconditionally call setgroups
We should ensure that the appropriate supplementary groups are
set, regardless of whether we're running UID=0 or UID=shell.

Change-Id: I3a1624a574102be08176a41f9c7eb5f82af2b3e5
2014-06-18 11:24:27 -07:00
Mark Salyzyn 4da93e3438 Merge "logd: Allow apps to clear their UID-specific data" 2014-06-17 21:47:03 +00:00
Mark Salyzyn 3f55d2f4e6 Merge "logcat: test: modernize" 2014-06-17 21:42:00 +00:00
Mark Salyzyn 9879ac8e12 logcat: test: modernize
- split sequential sort output test out as a benchmark check
- Allow up to two failures of sort results because of occasional reader locks.
- logcat -g output was changed to handle wider set of values incorporating a
  multiplier for UX, and would not pass test if 'logcat -G 1M' was run.
- If spam filter is turned off, prune checks would fail, allowed for an
  empty default.

Change-Id: I06d6089e18279df7525d1c16a1f76b3125ddbf05
2014-06-18 13:18:17 -07:00
Ying Wang 4924d10ae0 Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed." 2014-06-17 21:42:00 +00:00
Ying Wang 2359b3c162 Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
(cherry picked from commit 7011a85606)

Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
2014-06-18 15:43:29 -07:00
Mark Salyzyn 9e7bef0ef9 Merge changes I759c65e8,I97699037
* changes:
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-17 21:42:00 +00:00
Mark Salyzyn 6e9aaae9ed logd: test: deal with spam filter turned off
Change-Id: I759c65e869d0c7cd81063fa7993ba3d67ef9cd06
2014-06-18 11:12:27 -07:00
Mark Salyzyn 0c57bd864d logd: test: modernize
- Correct default tense for kernel or user logger
- harden code that parses the benchmark data
- give more meaning to the spam filter test

Change-Id: I97699037ca9d56718f53f08d22be79092fb431de
2014-06-18 11:12:27 -07:00
Elliott Hughes e1f7c176f6 am 6419687f: am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '6419687fe05ea5b64e3db4f380f45b157d6fa10a':
  Fixed logcat debug output issue.
2014-06-17 21:40:41 +00:00
Elliott Hughes 6419687fe0 am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '929c7fe179dc8c7ca0e0f0268ffb1213d0c929f4':
  Fixed logcat debug output issue.
2014-06-17 21:35:40 +00:00
Elliott Hughes 929c7fe179 am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '5bc6b5b804546c683953393441e697e0eb84ac48':
  Fixed logcat debug output issue.
2014-06-17 21:30:24 +00:00
Elliott Hughes 0ef3fa24fb Merge "Changed maps output in debuggerd." 2014-06-17 20:56:23 +00:00
Brigid Smith 7b2078eeb4 Changed maps output in debuggerd.
Now the map output is only sent to the tombstone, and the entire
contents of /prod/$PID/maps is logged, not just 3 lines.  Additionally,
crasher now supports "crasher SIGSEGV-non-null", which attempts to write to a
dereferenced function address, causing a SIGSEGV at a non-zero address.
This new crasher mode can be used to test the new maps output.

Bug: 15343662
Change-Id: I796d92e8352a6b9714bbbfe96f3143c56565ef2f
2014-06-17 15:32:22 -07:00
Elliott Hughes 5bc6b5b804 Merge "Fixed logcat debug output issue." 2014-06-17 20:56:23 +00:00
Brigid Smith 1babede38b Fixed logcat debug output issue.
Change-Id: Ibeb048b683ec11b05af23371e5e4b17cdd50fea0
2014-06-17 14:24:43 -07:00
JP Abgrall e14efeac9a Merge topic 'f2fs'
* changes:
  fsmgr: allow for a multiple fs-types for a mount point.
  F2FS support for fastboot format and fsmgr
2014-06-17 20:49:29 +00:00
Elliott Hughes 429502d4da am d478aec2: am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit 'd478aec2a9aea7c0e041a9c4f81202fa77862622':
  Changed maps output in debuggerd.
2014-06-17 23:02:01 +00:00
Ian Rogers 4436749284 am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4ac17e3b1979f3dcdc2b515fc9d1f349f1b21da6':
  Enable host multilib for ART testing.
2014-06-17 18:53:03 +00:00
Ian Rogers 4ac17e3b19 am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4dfe6faa932e255413dc4dbbaada7e19dd01efd4':
  Enable host multilib for ART testing.
2014-06-17 18:48:51 +00:00
Nick Kralevich 545c6599fa am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit 'a029d14d03ecc9bde97b9394298c5123c14be081':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:48:30 +00:00
Nick Kralevich a029d14d03 am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit '2af91ffb6c5f93ecbc322183c755bb249edc2488':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:44:18 +00:00
William Luh 5695df2427 Merge "Add event log tag for Safety Net." 2014-06-17 04:56:28 +00:00
Ian Rogers 9db200f7ad am 44367492: am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4436749284dc2b74e6e0f430d0f803d1b7862d19':
  Enable host multilib for ART testing.
2014-06-17 18:58:34 +00:00
Nick Kralevich 3a53b49075 am 545c6599: am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit '545c6599fa2702a3a220f486367e9df42b20e0b6':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:53:56 +00:00
William Luh 66929dbe1b Add event log tag for Safety Net.
This is for clients who log to EventLog and want Safety Net to
pick up and send the logs.

Bug:15572351
Change-Id: I6fdbe7905ec8b3b27a36eb38aee61c97bcd8d4bf
2014-06-17 10:05:47 -07:00
Ian Rogers 4dfe6faa93 Merge "Enable host multilib for ART testing." 2014-06-17 03:56:33 +00:00
Ian Rogers 5af80aa119 Enable host multilib for ART testing.
Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c
2014-06-17 01:50:25 -07:00
Nick Kralevich 2af91ffb6c Merge "Extend ueventd to use the label-by-symlink support in libselinux." 2014-06-17 03:56:33 +00:00