Commit Graph

5936 Commits

Author SHA1 Message Date
Jeff Brown 3884a9b252 init.rc: Add input flinger.
Change-Id: Ibcb1116bdcd9189272db620910b9958c8ffb4552
2013-07-15 15:08:39 -07:00
Nick Kralevich 459d879160 Merge "init: call restorecon on /sys" 2013-07-15 21:58:04 +00:00
Rom Lemarchand 4a291b339e Merge "init.rc: configure memory cgroups" 2013-07-15 21:11:40 +00:00
Nick Kralevich 56adf99267 am 9a4913d4: init.rc: remove "on fs" section
* commit '9a4913d422f4c18033333afe8e2e1d699b112d44':
  init.rc: remove "on fs" section
2013-07-15 13:28:44 -07:00
Nick Kralevich f29c533c49 init: call restorecon on /sys
Not all files on /sys are not getting labeled properly. Fix them.

Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
2013-07-15 13:10:02 -07:00
Rom Lemarchand 435a52ef07 init.rc: configure memory cgroups
Create the memory cgroups folders and configure them

Change-Id: I06c4bb486b204f7e98b0bc6757deec8bd7f6349e
2013-07-15 12:43:47 -07:00
Nick Kralevich 9a4913d422 init.rc: remove "on fs" section
This was only ever used by the emulator. Now the emulator
uses an fstab file.

Change-Id: I1a071e567e1f1a379f9c8079cc2dc17660d8455f
2013-07-12 13:48:50 -07:00
Nick Kralevich e1dbdd6978 am 7d6ddc7d: am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs"
* commit '7d6ddc7d395e909d841bb7eadfc12a167076aecf':
  use ext4 instead of yaffs
2013-07-12 11:22:00 -07:00
Nick Kralevich 7d6ddc7d39 am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs"
* commit '2713be91a84078e8b0b9b755ce17881b750e85a7':
  use ext4 instead of yaffs
2013-07-12 11:20:15 -07:00
Nick Kralevich 2713be91a8 am fb1c9cf6: Merge "use ext4 instead of yaffs"
* commit 'fb1c9cf6fa4efafb3e0c6b0bc93c7f087d926a48':
  use ext4 instead of yaffs
2013-07-12 11:18:26 -07:00
Nick Kralevich fb1c9cf6fa Merge "use ext4 instead of yaffs" 2013-07-12 18:16:48 +00:00
Elliott Hughes 81274e9e6c am 6b78fad1: am a9396549: Fix my incorrect merge resolution for 132b7d750e harder.
* commit '6b78fad147c772075eae5cfc25f5a50748bc4015':
  Fix my incorrect merge resolution for 132b7d750e harder.
2013-07-11 19:12:18 -07:00
Elliott Hughes 6b78fad147 am a9396549: Fix my incorrect merge resolution for 132b7d750e harder.
* commit 'a9396549b37d13c518c662c04f6ff42e9ae47c24':
  Fix my incorrect merge resolution for 132b7d750e harder.
2013-07-11 19:10:01 -07:00
Elliott Hughes a9396549b3 Fix my incorrect merge resolution for 132b7d750e harder.
Change-Id: I3f8bc955f035b49407540053462e53b3f262d381
2013-07-11 19:07:06 -07:00
Elliott Hughes ae118966da am 43564031: am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e.
* commit '435640312ce48dab201d6f26a6258143a82f551e':
  Fix my incorrect merge resolution for 132b7d750e.
2013-07-11 19:05:32 -07:00
Elliott Hughes 435640312c am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e.
* commit '7b9c33b1e0e47f72d0af35d8a948900697da5871':
  Fix my incorrect merge resolution for 132b7d750e.
2013-07-11 19:01:36 -07:00
Elliott Hughes 7b9c33b1e0 Fix my incorrect merge resolution for 132b7d750e.
The conflict was the actual intended change.

Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b
2013-07-11 18:58:07 -07:00
Elliott Hughes ad989d038e am dccd7773: am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master
* commit 'dccd77730754b681f3517308359a34f86aecd99f':
  fs_mgr_priv: Extend fs wait timeout to 20 seconds
2013-07-11 18:52:12 -07:00
Elliott Hughes dccd777307 am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master
* commit '786b1232d201d46f59bd9da84bfcfcb9ad80bb6c':
  fs_mgr_priv: Extend fs wait timeout to 20 seconds
2013-07-11 18:50:25 -07:00
Elliott Hughes 786b1232d2 resolved conflicts for merge of 42031e0e to stage-aosp-master
Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6
2013-07-11 18:48:30 -07:00
Ken Sumrall 42031e0ed7 Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds" 2013-07-10 22:42:37 +00:00
Ken Sumrall a76baaabe5 Add swapon_all to init's builtin commands
For enabling swap devices found in the fstab file

Change-Id: Iec4fd4d208df3d7a161a90d95f8606e8b516334a
2013-07-09 18:42:09 -07:00
Nick Kralevich f4c1512db8 use ext4 instead of yaffs
This is needed to allow the emulator to use ext4 images.

Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I02fde6382ad67cf7f4f3b695396841f70bb9301d
2013-07-09 18:06:11 -07:00
Ken Sumrall 5bc31a2632 Add support for swap entries in fstab
Swap entries can optionally specify a swapprio= or zramsize= flag
in the fs_mgr flags field.

Change-Id: I30530501efd4112af4e158898a9f65f6443c4fdb
2013-07-09 15:04:56 -07:00
Colin Cross 894de22021 am 983939f7: am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
* commit '983939f79453433ca67b5382673b891d94343273':
  Added net.dns1 prop for emulator, as Android emulator ignores it by default.
2013-07-03 15:51:11 -07:00
Colin Cross 983939f794 am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
* commit '149a9b68ab09e4934556e9247ee5f98008a65662':
  Added net.dns1 prop for emulator, as Android emulator ignores it by default.
2013-07-03 15:47:31 -07:00
Colin Cross 149a9b68ab am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
* commit 'fafcabd0dd4432de3c7f5956edec23f6ed241b56':
  Added net.dns1 prop for emulator, as Android emulator ignores it by default.
2013-07-03 15:45:16 -07:00
Colin Cross fafcabd0dd Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default." 2013-07-03 22:35:42 +00:00
Rom Lemarchand fb3280886d Merge "toolbox: swap utils" 2013-07-02 02:07:10 +00:00
Rom Lemarchand 622810ceff fastboot: add support for sparse images in flashall and update
Change-Id: I66a73b16a988a65fc91fb22a26d11986025089de
Signed-off-by: Rom Lemarchand <romlem@google.com>
2013-07-01 12:42:58 -07:00
Rom Lemarchand c9cce4b981 fastboot: Remove legacy MINGW workarounds
The version of MINGW we compile with has more advanced POSIX support.
Removing legacy MINGW workarounds as those are not needed anymore.

Change-Id: Id5d67176b719db6c3667be6d63c41432e0ba9f30
Signed-off-by: Rom Lemarchand <romlem@google.com>
2013-06-28 17:00:41 -07:00
Nick Kralevich 1d932e2bc6 Merge "init: allow disabling selinux via a kernel command line" 2013-06-28 20:02:00 +00:00
Nick Kralevich 4838aa1b7b init: allow disabling selinux via a kernel command line
Create a new "androidboot.selinux" option, to control how userspace
handles SELinux. This kernel command line can have three options:

* disabled
* permissive
* enforcing

"disabled" completely disables userspace support for SELinux. No
policy is ever loaded, nor is the SELinux filesystem /sys/fs/selinux
ever mounted.

"permissive" loads the SELinux policy, but puts SELinux into
permissive mode. SELinux policy violations are logged, but not rejected.

"enforcing", the default, loads the SELinux policy, and places
SELinux into enforcing mode. Policy violations are rejected.

This change addresses post review comments for change
b710ed21de .

Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
2013-06-28 12:05:07 -07:00
Eric Laurent f519c04d28 Merge "Add defines for audio offload and non-blocking write" 2013-06-28 17:47:23 +00:00
Ken Sumrall cf0b4d94fa Merge "Do not exit early on errors when -f is specified" 2013-06-28 02:47:01 +00:00
Ken Sumrall 3b2b2b5137 Merge "Update the touch command to take a human readable timestamp" 2013-06-28 02:46:09 +00:00
Richard Fitzgerald 05529a1a10 Add defines for audio offload and non-blocking write
- Defines audio output flags for offloaded playback of compressed
    streams, and non-blocking HAL write()/drain()
- Adds audio_offload_info_t to pass additional information about a
    compressed stream when offloading

Change-Id: I4592d0877edd39e68d0c1035d0652adbd397bf3a
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
2013-06-27 17:16:25 -07:00
Ken Sumrall 0354829763 Do not exit early on errors when -f is specified
When running with the -f option, do not stop recursion or proccessing
command line args if an error occurs.  Continue trying to remove all
the items specified on the command line.  However, still return an
error status if some files could not be removed.

Change-Id: I83d66babe833da8a68aad68248647ba0601c5d32
2013-06-26 17:42:38 -07:00
Ken Sumrall 13495a1cbb Update the touch command to take a human readable timestamp
Now the -t option to the toolbox touch command takes a timestamp
in the form of YYYYMMDD.hhmmss

Change-Id: I3812700edaa1a06590a07c15b050721b49e9b7e0
2013-06-26 17:42:25 -07:00
jp abgrall eecf40fce8 Merge "Revert "fastboot: add preflash command to help with large downloads+flash"" 2013-06-26 03:54:57 +00:00
jp abgrall 88e8f61a9e Revert "fastboot: add preflash command to help with large downloads+flash"
This reverts commit 6f1cd0b2ad.

It causes some devices to fail (b/9581613). Revert for now.

Change-Id: I076158c704c2b4f0459322aa157c19ebd0c4615f
2013-06-26 03:51:29 +00:00
Colin Cross 2a25ca0a24 am b1e3bb27: am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master
* commit 'b1e3bb2798bb6002b186081d9b0234bdfa432a14':
  init: move initial property area allocation into bionic
  property_service: make /dev/__properties__ readable
2013-06-25 16:30:35 -07:00
JP Abgrall 95b8790717 Merge "fastboot: add preflash command to help with large downloads+flash" 2013-06-25 22:18:21 +00:00
Nick Kralevich cbc76fcadb Merge "init: move SELinux into enforcing mode." 2013-06-25 21:08:56 +00:00
Rom Lemarchand 367297c3d7 toolbox: swap utils
Add swap utilities (mkswap, swapon, swapoff) to the toolbox

Change-Id: If5ed6981670a1cdda6b528b587dbc1be7ccdf832
Signed-off-by: Rom Lemarchand <romlem@google.com>
2013-06-25 13:21:53 -07:00
JP Abgrall 6f1cd0b2ad fastboot: add preflash command to help with large downloads+flash
Without the partition name, the bootloader would have to store all
of the data until the next flash command, which potentially wastes
time.
To help the bootloader deal with the data more efficiently, we now
issue a flashing hint ("preflash:%s", partname).
"preflash:" is used to indicate that the following download
should ignore any previous "preflash:%s".

Bug: 6045918
Change-Id: I4e9708f64f28a4781bde14eb3714d36b281ec5be
2013-06-25 11:52:05 -07:00
Nick Kralevich b710ed21de init: move SELinux into enforcing mode.
When init starts up, immediately put SELinux into enforcing mode.

This is currently a no-op. We currently have everything in the
unconfined domain, so this should not break anything.
(if it does, I'll roll it back immediately)

If the kernel doesn't have SELinux support compiled in, then
don't try loading a policy and continue without SELinux protections.

Change-Id: Id0279cf82c545ea0f7090137b7566a5bc3ddd641
2013-06-25 11:23:29 -07:00
Colin Cross 25383a5da2 am 372d668a: am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8
* commit '372d668a279934ff3b2ec2f07a76fe2f351789d5':
  init: Retain traditional restart behavior for critical and oneshot services.
  init: Safely restart services to avoid race conditions.
2013-06-25 05:59:40 -07:00
Colin Cross b1e3bb2798 am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master
* commit 'b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a':
  init: move initial property area allocation into bionic
  property_service: make /dev/__properties__ readable
2013-06-24 17:22:56 -07:00
Colin Cross b1a9f8cf4b resolved conflicts for merge of b6c60285 to stage-aosp-master
Change-Id: I5afba55b668065499fa28369cf217d4f5eafab4a
2013-06-24 17:19:43 -07:00