Commit graph

13153 commits

Author SHA1 Message Date
Elliott Hughes
799d8a165b am d503cc21: am b749be0b: Merge "Clean up init signal handling a little."
* commit 'd503cc21ec663b39e8d84feb373d3a287bb02d63':
  Clean up init signal handling a little.
2015-04-25 01:31:14 +00:00
Elliott Hughes
d503cc21ec am b749be0b: Merge "Clean up init signal handling a little."
* commit 'b749be0bc36b3ae610aa05541581ef8cc5e484ee':
  Clean up init signal handling a little.
2015-04-25 01:20:29 +00:00
Elliott Hughes
b749be0bc3 Merge "Clean up init signal handling a little." 2015-04-25 01:10:58 +00:00
Elliott Hughes
9042cae40b Clean up init signal handling a little.
We can set it up earlier, and error reporting like this helped me find
the SELinux problem with the last change to this code.

Change-Id: If0f38bc5ff0465c4030e2d39d34f31f49b2d8487
2015-04-24 17:43:21 -07:00
Elliott Hughes
7c6d5dd863 am bdf133de: am 662baefb: Merge "Setup signal handler before any exec command"
* commit 'bdf133de65a1fbb2d5e91fcd854d9824bcff4ea1':
  Setup signal handler before any exec command
2015-04-25 00:42:58 +00:00
Elliott Hughes
bdf133de65 am 662baefb: Merge "Setup signal handler before any exec command"
* commit '662baefbb7ceaf2f2502f4e7752d4a6d835f216a':
  Setup signal handler before any exec command
2015-04-25 00:31:12 +00:00
Elliott Hughes
662baefbb7 Merge "Setup signal handler before any exec command" 2015-04-25 00:24:55 +00:00
Mark Salyzyn
2bca03cd0c am a76d2bb4: am 05c92d2b: Merge "liblog: Add BM_is_loggable benchmark"
* commit 'a76d2bb40be45d5523182ebedd145503904f1f25':
  liblog: Add BM_is_loggable benchmark
2015-04-24 22:06:19 +00:00
Mark Salyzyn
a76d2bb40b am 05c92d2b: Merge "liblog: Add BM_is_loggable benchmark"
* commit '05c92d2b4fa7e96f6e64384f197e12916ed1d821':
  liblog: Add BM_is_loggable benchmark
2015-04-24 21:54:42 +00:00
Mark Salyzyn
05c92d2b4f Merge "liblog: Add BM_is_loggable benchmark" 2015-04-24 21:42:47 +00:00
Elliott Hughes
813c769cf6 am e6433c12: am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command."""
* commit 'e6433c12456324812a9ea791da3bf462ee2476d7':
  Revert "Revert "Remove now-unusable 'setcon' command.""
2015-04-24 20:45:29 +00:00
Elliott Hughes
e6433c1245 am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command."""
* commit 'a5669861c1abd023aa708d21e6f9d7f2c8803903':
  Revert "Revert "Remove now-unusable 'setcon' command.""
2015-04-24 20:39:14 +00:00
Elliott Hughes
a5669861c1 Merge "Revert "Revert "Remove now-unusable 'setcon' command.""" 2015-04-24 20:31:19 +00:00
Elliott Hughes
a8088f3809 am ec389902: am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition."""
* commit 'ec389902980c88956ab8e3e630e3503cbb22d39b':
  Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
2015-04-24 19:54:09 +00:00
Elliott Hughes
ec38990298 am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition."""
* commit '132440b087d35ebddd021b86bdcb3aa5c8feec80':
  Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
2015-04-24 19:43:14 +00:00
Elliott Hughes
c7ca9dd6c8 Revert "Revert "Remove now-unusable 'setcon' command.""
This reverts commit b862bd00a4.

This change was fine but an earlier change it depended on was broken.
That change has been fixed and resubmitted.

Bug: http://b/19702273
Change-Id: I17e565721026e48e2a73526f729f2481d4d6edb5
2015-04-24 12:41:47 -07:00
Elliott Hughes
132440b087 Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition.""" 2015-04-24 19:33:21 +00:00
Elliott Hughes
f65730e620 Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
This reverts commit 4217374611.

It turns out that the kernel passes any unrecognized arguments on to init,
and (at least) N6 and N9 have such arguments. My lazy check of argc was
thus insufficient to recognize what stage of init we were in, so we'd
skip to stage 2 and not set up SELinux. And apparently you can get a
very long way with SELinux off... We'll fix that in a later change.

Bug: 19702273
Change-Id: I43b3fb722fed35dd217cb529cbcac9a29aff4e4b
2015-04-24 12:26:05 -07:00
Elliott Hughes
92f075aa08 am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."
* commit '48ba758782bed8c50f450fd77c4b3284c3fa7316':
  Improve bad error reporting seen in shamu SELinux boot failures.
2015-04-24 18:58:21 +00:00
Elliott Hughes
48ba758782 am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."
* commit '34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72':
  Improve bad error reporting seen in shamu SELinux boot failures.
2015-04-24 18:46:59 +00:00
Elliott Hughes
34dd04dbb5 Merge "Improve bad error reporting seen in shamu SELinux boot failures." 2015-04-24 18:36:55 +00:00
Elliott Hughes
5e7dd4454f Improve bad error reporting seen in shamu SELinux boot failures.
Explain why mount failed, and explicitly say that the umount fixed it.

Change-Id: I13b0927a36517f2fc9f9580945ba6ebefc4882df
2015-04-24 11:05:48 -07:00
Tom Cherry
17560f8884 am 92b82635: am 10936d1f: Merge "init: consider all platform devices for find_platform_device"
* commit '92b826357692988407018c5754584ef2da9e390e':
  init: consider all platform devices for find_platform_device
2015-04-24 17:53:19 +00:00
Tom Cherry
92b8263576 am 10936d1f: Merge "init: consider all platform devices for find_platform_device"
* commit '10936d1fdb639c91ed9062b92909d9928e6b69ea':
  init: consider all platform devices for find_platform_device
2015-04-24 17:42:07 +00:00
Tom Cherry
10936d1fdb Merge "init: consider all platform devices for find_platform_device" 2015-04-24 17:34:32 +00:00
Nick Kralevich
b706a8acff am 2db3cd3e: am 46fee19c: Merge "Revert "Make init re-exec itself for its SELinux domain transition.""
* commit '2db3cd3e5e5957da4cf8429b7bbc9b6d36c934a5':
  Revert "Make init re-exec itself for its SELinux domain transition."
2015-04-24 17:17:00 +00:00
Nick Kralevich
22fed877d1 am ac699569: am f0b47920: Merge "Revert "Remove now-unusable \'setcon\' command.""
* commit 'ac6995690a329fd07d434c7fce417d75b794df48':
  Revert "Remove now-unusable 'setcon' command."
2015-04-24 17:16:59 +00:00
Nick Kralevich
2db3cd3e5e am 46fee19c: Merge "Revert "Make init re-exec itself for its SELinux domain transition.""
* commit '46fee19cb27dd24a58bbcad608058f25ca7b3e52':
  Revert "Make init re-exec itself for its SELinux domain transition."
2015-04-24 17:05:47 +00:00
Nick Kralevich
ac6995690a am f0b47920: Merge "Revert "Remove now-unusable \'setcon\' command.""
* commit 'f0b4792017b338ac6397e9809f3629c33ef94c2d':
  Revert "Remove now-unusable 'setcon' command."
2015-04-24 17:05:46 +00:00
Nick Kralevich
46fee19cb2 Merge "Revert "Make init re-exec itself for its SELinux domain transition."" 2015-04-24 16:58:01 +00:00
Nick Kralevich
4217374611 Revert "Make init re-exec itself for its SELinux domain transition."
shamu isn't booting.

This reverts commit adf0d1bbfa.

Change-Id: I89d568838cebbe14cc4a8ae3843f0f1ac54987af
2015-04-24 16:57:21 +00:00
Nick Kralevich
f0b4792017 Merge "Revert "Remove now-unusable 'setcon' command."" 2015-04-24 16:56:44 +00:00
Nick Kralevich
b862bd00a4 Revert "Remove now-unusable 'setcon' command."
Temporarily revert because device isn't booting.

This reverts commit 7b15ac99f3.

Change-Id: Ice986bac62e20c70f7bedf1744a617b97392ae8c
2015-04-24 16:55:16 +00:00
Mark Salyzyn
1ac79cbd89 liblog: Add BM_is_loggable benchmark
- On a N9 64-bit benchmark, the __android_log_is_loggable overhead
  is roughly 500ns (1/2 of a syscall?)

Bug: 19544788
Bug: 17760225
Bug: 20416721
Change-Id: Ib9e4d06d96e1b19ca5d459e569ead451ef47a9c0
2015-04-24 07:59:44 -07:00
Elliott Hughes
9e690e0287 am 301691c2: am 659b7d63: Merge "Remove now-unusable \'setcon\' command."
* commit '301691c258cb7e1901eec835a55f227a5af8e5eb':
  Remove now-unusable 'setcon' command.
2015-04-24 04:16:59 +00:00
Elliott Hughes
77260323e2 am 20dfbb0f: am fa66b4e1: Merge "Remove long-obsolete file."
* commit '20dfbb0fd1dbe467ecfde3309f1abdbb01608ead':
  Remove long-obsolete file.
2015-04-24 04:16:58 +00:00
Elliott Hughes
301691c258 am 659b7d63: Merge "Remove now-unusable \'setcon\' command."
* commit '659b7d633a03a03674f82f02f567ac5ff18fba41':
  Remove now-unusable 'setcon' command.
2015-04-24 04:07:24 +00:00
Elliott Hughes
20dfbb0fd1 am fa66b4e1: Merge "Remove long-obsolete file."
* commit 'fa66b4e136e0baeb41311405635d5852048e6ce7':
  Remove long-obsolete file.
2015-04-24 04:07:23 +00:00
Elliott Hughes
659b7d633a Merge "Remove now-unusable 'setcon' command." 2015-04-24 04:01:59 +00:00
Elliott Hughes
fa66b4e136 Merge "Remove long-obsolete file." 2015-04-24 03:59:05 +00:00
Elliott Hughes
2a87d2b155 Remove long-obsolete file.
Change-Id: I728cc13b4a7ac93f9c923d2fc9bda2bb65ffe99d
2015-04-23 20:57:12 -07:00
Elliott Hughes
7b15ac99f3 Remove now-unusable 'setcon' command.
Bug: http://b/19702273
Change-Id: Icd340c80ba074476dcc63f1c1dd5c61a5c768893
2015-04-23 20:54:46 -07:00
Elliott Hughes
3d671000c7 am 28693983: am 1a39a994: Merge "Correct magic number on umount2"
* commit '28693983510b140240e7b3e83c082e516b83896f':
  Correct magic number on umount2
2015-04-24 03:39:31 +00:00
Elliott Hughes
77434ab362 am ef68fd3f: am d4656784: Merge "Make init re-exec itself for its SELinux domain transition."
* commit 'ef68fd3f807438fd9aae3b8f104f3a85ef9eb699':
  Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:28:45 +00:00
Elliott Hughes
2869398351 am 1a39a994: Merge "Correct magic number on umount2"
* commit '1a39a994d9c1d407fec17e0b9a00383d50c48085':
  Correct magic number on umount2
2015-04-24 03:28:43 +00:00
Elliott Hughes
1a39a994d9 Merge "Correct magic number on umount2" 2015-04-24 03:21:43 +00:00
Elliott Hughes
ef68fd3f80 am d4656784: Merge "Make init re-exec itself for its SELinux domain transition."
* commit 'd46567848bfcdc8f2cbc3faeef487cf5c770b43a':
  Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:18:39 +00:00
Elliott Hughes
d46567848b Merge "Make init re-exec itself for its SELinux domain transition." 2015-04-24 03:10:16 +00:00
William Roberts
4555b69f26 Correct magic number on umount2
The umount2 call was using the magic constant 2 which is
has a defined and proper macro in mount.h as MNT_DETATCH.

Change-Id: I4ca4a6d31cbf5495c545088e3d90a8894a9f912f
2015-04-24 01:13:35 +00:00
Mark Salyzyn
44f1356e42 am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"
* commit '85a9566f7c1b9bcef150edc587a3e64b1196ffc8':
  rootfs: init.rc start logd parse error
2015-04-23 22:45:50 +00:00