Elliott Hughes
b5fc3132ee
Add ps --ppid.
...
Needed for a libcore test.
Change-Id: Ia21ecf5f7bd8be7f1882d0014d7949d40f6841a5
2015-01-29 17:20:47 -08:00
Elliott Hughes
2e14f61731
am 06b4e982
: Merge "Add missing <malloc.h> and <string.h> includes."
...
* commit '06b4e9826a33ddbdbddf7e74076ac29f9450414a':
Add missing <malloc.h> and <string.h> includes.
2015-01-28 19:57:27 +00:00
Elliott Hughes
a744b05984
Add missing <malloc.h> and <string.h> includes.
...
Change-Id: Ia41756e607663d056e7d2fdd7ecbec7e5841a913
2015-01-28 11:37:57 -08:00
Elliott Hughes
68a6f887e6
am ae79cb5a
: Merge "Add missing <string.h> includes."
...
* commit 'ae79cb5a819bd5bbd86a3496141d45c22db8c86b':
Add missing <string.h> includes.
2015-01-25 20:42:49 +00:00
Elliott Hughes
2b7d75d2e6
Add missing <string.h> includes.
...
Change-Id: I3d1ad54418f69f947e2d829d63b53d44581bfd86
2015-01-24 20:03:09 -08: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
1bf5054342
Lose id to toybox.
...
Change-Id: I0b92482d06055207e133112e74c58964c7ef0362
2015-01-16 19:24:26 -08: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
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
6eb88b2c1d
Lose chown to toybox.
...
Change-Id: Ic56addb183ce7f1d289b807527047c37924c1aa6
2015-01-15 13:47:00 -08: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
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
Elliott Hughes
e5efa98207
am da3dec3c
: Merge "Lose toolbox notify in favor of toybox inotifyd."
...
* commit 'da3dec3c19d1489f5997aea9dafd34b68c2b515b':
Lose toolbox notify in favor of toybox inotifyd.
2015-01-14 19:14:12 +00:00
Elliott Hughes
f84994ba0d
Lose ifconfig to toybox.
...
Change-Id: Id3fd2898e137d3a70a3dc5ed65689ef5e029c8cd
2015-01-14 11:05:05 -08:00
Elliott Hughes
c5d17fde1e
am 4503a145
: Merge "Switch to toybox cat."
...
* commit '4503a1450ce9b2ed86fd9bd3eb3c34c845e8ed08':
Switch to toybox cat.
2015-01-14 18:56:07 +00:00
Elliott Hughes
30286c8467
Lose toolbox notify in favor of toybox inotifyd.
...
Change-Id: I02e3849c0b944289c6541ff14f1e80a7f8041829
2015-01-14 10:50:17 -08:00
Elliott Hughes
532bb72a84
Switch to toybox cat.
...
Change-Id: I0bab6018010c71f6c17eb10bea20dceb470c5242
2015-01-14 10:37:43 -08:00
Elliott Hughes
9c359a3dd2
am 69159ba0
: Merge "Fix missing #includes in system/core."
...
* commit '69159ba0b70178a24e6f592dfb9d903629c23a09':
Fix missing #includes in system/core.
2014-12-30 12:21:10 +00:00
Elliott Hughes
0badbd6565
Fix missing #includes in system/core.
...
Change-Id: I4736e8c4f7bb8bb03640d26d58243efaa67dc75c
2014-12-29 12:24:25 -08:00
Elliott Hughes
b01c52aac2
am d106305f
: Merge "Lose getenforce and setenforce to toybox."
...
* commit 'd106305f67b71653d4409a416c69796cbcc948e8':
Lose getenforce and setenforce to toybox.
2014-12-24 19:51:55 +00:00
Elliott Hughes
2e67705cff
Lose getenforce and setenforce to toybox.
...
Change-Id: Ie03161cc2d6ae410e079e1142e62e6836858c9db
2014-12-24 11:31:14 -08:00
Elliott Hughes
4138f9df99
am dbe49757
: Merge "Lose netstat to toybox."
...
* commit 'dbe4975791a4592d863a1418eb68b84fd614937e':
Lose netstat to toybox.
2014-12-23 18:38:05 +00:00
Elliott Hughes
7e3879e467
Lose netstat to toybox.
...
Change-Id: I165ff67fc47286b992f167ff7392246a805b6d68
2014-12-23 09:13:33 -08:00
Elliott Hughes
9332f9c44d
am 12677383
: Merge "Lose mv to toybox."
...
* commit '12677383ae247b26225cf9c961e3fb46bcdfc6a6':
Lose mv to toybox.
2014-12-17 04:26:43 +00:00
Elliott Hughes
a264cca35a
Lose mv to toybox.
...
Change-Id: Ibbba4d516d55460c6d627b766cc087e6a7edcabd
2014-12-16 19:20:10 -08:00
Elliott Hughes
37dc409af8
am 300a85e5
: Merge "Lose rm to toybox."
...
* commit '300a85e5a786e7e59d847a4bcd927014337a60e2':
Lose rm to toybox.
2014-12-17 01:43:19 +00:00
Elliott Hughes
1d0c3fb751
am cc825ae7
: Merge "Lose cp to toybox."
...
* commit 'cc825ae79219f2b5d9fa768d50963ad2f43bbd11':
Lose cp to toybox.
2014-12-17 00:28:18 +00:00
Elliott Hughes
dc74ad2df8
am 700a9570
: Merge "Lose ln to toybox."
...
* commit '700a9570703bb2c0880c3ef5087925693daa3afc':
Lose ln to toybox.
2014-12-17 00:23:18 +00:00
Elliott Hughes
fdab0f5be5
Lose rm to toybox.
...
Change-Id: I93904b85e180d4324b64e2e90a4832c4d4169627
2014-12-16 16:22:54 -08:00
Elliott Hughes
b3fa82607c
Lose cp to toybox.
...
Change-Id: Idfe52737093d243ae2dcb054f686f6d6af0c2de6
2014-12-16 16:15:32 -08:00
Elliott Hughes
4592237808
am a7e6dbd3
: Merge "Lose rmdir to toybox."
...
* commit 'a7e6dbd3c269e80a6e6959428e60e8639c48efea':
Lose rmdir to toybox.
2014-12-16 23:40:34 +00:00
Elliott Hughes
ae96efca51
Lose ln to toybox.
...
I accidentally enabled the toybox ln in my original commit, so which ln
you've been running for the last few weeks has depended on which directory
you built more recently...
Change-Id: If73783477aa4eb4d058d6e170d6291ba0d9c5f40
2014-12-16 15:38:04 -08:00
Elliott Hughes
9e69ee9185
am 8dc9777b
: Merge "Lose mkdir to toybox."
...
* commit '8dc9777b33fa073bcd6e1b52f7e9a117978e43f6':
Lose mkdir to toybox.
2014-12-16 23:37:01 +00:00
Elliott Hughes
ff60f7c94a
Lose rmdir to toybox.
...
Change-Id: I80ecc7c19bf7fc44039235c846727853d78a5d15
2014-12-16 15:28:03 -08:00
Elliott Hughes
de4fd83e0b
Lose mkdir to toybox.
...
Change-Id: Ie2ad916893ba36e7cee6d5a4533e60732871c8dd
2014-12-16 15:18:56 -08:00
Elliott Hughes
d57e0d5d7e
am 8641daee
: Merge "Lose chcon to toybox."
...
* commit '8641daeea1c9990934562593828b85d8dceb5a04':
Lose chcon to toybox.
2014-12-16 20:35:04 +00:00
Elliott Hughes
2f5d6d3d1c
Lose chcon to toybox.
...
Change-Id: I9ae70ff53da6e31ccb1c4e127ce9349ab794f78f
2014-12-16 09:18:50 -08:00
Elliott Hughes
f404c649a7
am ffe4d9cd
: Merge "toybox has md5sum, so lose toolbox\'s md5."
...
* commit 'ffe4d9cdc7e354cfa487223dd2bd5adb38869163':
toybox has md5sum, so lose toolbox's md5.
2014-12-12 03:19:50 +00:00
Elliott Hughes
014ab468f3
toybox has md5sum, so lose toolbox's md5.
...
We've now removed enough that for the first time toolbox has
dipped below toybox in size:
-rwxr-xr-x root shell 230800 2014-12-11 18:55 toolbox
-rwxr-xr-x root shell 233632 2014-12-11 18:32 toybox
Change-Id: I6b150f195dd9f803ddce58a89aa7c23a5b930e5b
2014-12-11 18:56:38 -08:00
Elliott Hughes
3e49bbc4c1
am efd482f5
: Merge "Lose mknod to toybox."
...
* commit 'efd482f5e41aaca30521f2cb20e4dcad731cc9f8':
Lose mknod to toybox.
2014-12-12 02:53:23 +00:00
Elliott Hughes
71cf21fe1f
Lose mknod to toybox.
...
Change-Id: Ib81efed6c06a776626a42c25508b15461e495288
2014-12-11 18:33:46 -08:00
Elliott Hughes
4f5fddea23
am fc383879
: Merge "Remove toolbox hd."
...
* commit 'fc383879eb8a6ee940f56128d33ec9e59924d9ba':
Remove toolbox hd.
2014-12-12 00:40:31 +00:00
Elliott Hughes
c6251d8f46
Remove toolbox hd.
...
No one runs this anyway; they get the slightly better one from mksh instead.
Change-Id: I5e629cb3b443d3d38206f11f365fe483936d5440
2014-12-11 16:20:02 -08:00
Elliott Hughes
8313dddcb9
am 81784ae8
: Merge "Lose chmod to toybox."
...
* commit '81784ae8ddae139646441eb1dcaa5e1d89ab29de':
Lose chmod to toybox.
2014-12-11 21:07:37 +00:00
Elliott Hughes
98c80a0f40
Lose chmod to toybox.
...
Change-Id: I358f1761238b48f2de94cc43716581d24c846edd
2014-12-11 12:13:25 -08:00
Elliott Hughes
45765c74fc
am e19e3fc7
: Merge "Lose kill to toybox."
...
* commit 'e19e3fc72d230809d75fff6d7b246a2cd2525029':
Lose kill to toybox.
2014-12-05 16:57:11 +00:00
Elliott Hughes
049ee390df
Lose kill to toybox.
...
Change-Id: Icca3eb4b78e07eb49b090cc98dc3ca3f5c5ea8a6
2014-12-04 20:08:26 -08:00
Andreas Gampe
df8d6f6eeb
am 7f55e82c
: Merge "Toolbox: Disable unused-XXX warnings"
...
* commit '7f55e82cd2673c89d7fc52e076b81f2379a75283':
Toolbox: Disable unused-XXX warnings
2014-12-05 03:38:15 +00:00
Andreas Gampe
7f55e82cd2
Merge "Toolbox: Disable unused-XXX warnings"
2014-12-05 03:23:41 +00:00
Andreas Gampe
e826877117
Toolbox: Disable unused-XXX warnings
...
For build-system CFLAGS clean-up, disable warnings locally.
Should be reverted when the code is fixed.
Bug: 18632512
Change-Id: Ia373784ec36d37545a7e50db1df9f8cc37d7bf30
2014-12-04 18:01:26 -08:00
Elliott Hughes
79991acbfc
am ba037592
: Merge "Lose vmstat to toybox."
...
* commit 'ba03759264e62d5592688957cb70ffa567356074':
Lose vmstat to toybox.
2014-12-04 22:57:17 +00:00
Elliott Hughes
ba03759264
Merge "Lose vmstat to toybox."
2014-12-04 22:42:08 +00:00
Elliott Hughes
a03656d884
resolved conflicts for merge of 809965cc
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a
2014-11-27 11:31:06 -08:00
Elliott Hughes
330d892782
am b553a18a
: Merge "Lose dmesg to toybox."
...
* commit 'b553a18a02cd90298716c88d9167f877b63a36b6':
Lose dmesg to toybox.
2014-11-27 12:01:22 +00:00
Elliott Hughes
0085d948f2
Lose readlink to toybox.
...
Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
2014-11-26 15:19:47 -08:00
Elliott Hughes
b553a18a02
Merge "Lose dmesg to toybox."
2014-11-26 19:37:30 +00:00
Elliott Hughes
a7ec5f1067
am 50ac7725
: Merge "Lose nohup to toybox."
...
* commit '50ac7725a5f1c195989888277341f22ab54f979b':
Lose nohup to toybox.
2014-11-26 02:03:41 +00:00
Elliott Hughes
38228a2c10
Lose vmstat to toybox.
...
Change-Id: Ifcb64292bb147ad592d1a627bb8dbb684f4a27e4
2014-11-25 17:17:17 -08:00
Elliott Hughes
402f7e97d5
Lose nohup to toybox.
...
Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
2014-11-25 16:58:53 -08:00
Elliott Hughes
8e8cd0cf7a
Lose dmesg to toybox.
...
Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
2014-11-25 16:23:15 -08:00
Elliott Hughes
8e76610cfc
am 077ff309
: Merge "Lose mkswap, swapoff, and swapon to toybox."
...
* commit '077ff30954275e635c5faa8b75afcd0a44a78dcc':
Lose mkswap, swapoff, and swapon to toybox.
2014-11-25 19:03:59 +00:00
Elliott Hughes
4d7a262c63
am 75afd633
: Merge "Lose printenv to toybox."
...
* commit '75afd63340b2a19ff85e5a577a8a0bdd1ca46d26':
Lose printenv to toybox.
2014-11-25 19:03:43 +00:00
Elliott Hughes
45f296ec48
am bcece29c
: Merge "Lose sleep to toybox."
...
* commit 'bcece29c4438c6b92c973d30bc8a46331f16369f':
Lose sleep to toybox.
2014-11-25 19:03:35 +00:00
Elliott Hughes
f2f0b0fa69
am e494c513
: Merge "Lose sync to toybox."
...
* commit 'e494c513f919b405f92d3a3ebefa105a2482ec5b':
Lose sync to toybox.
2014-11-25 19:03:25 +00:00
Ying Wang
b14bc39b36
am 9f693b8f
: Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks"
...
* commit '9f693b8f1e97fd8977d66e3bf003d7b9460be0e7':
Use LOCAL_POST_LINK_CMD to install toolbox symlinks
2014-11-25 19:03:21 +00:00
Elliott Hughes
59acfee63f
am f3c8eb83
: Merge "Remove dead tools."
...
* commit 'f3c8eb838db02a5fc215e178e4eb319831894d48':
Remove dead tools.
2014-11-25 19:03:20 +00:00
Elliott Hughes
a0959e90f5
am 8eb770d3
: Merge "Remove long-dead readtty."
...
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
Remove long-dead readtty.
2014-11-25 19:03:12 +00:00
Elliott Hughes
0c0ab6bb06
resolved conflicts for merge of db38d10a
to lmp-mr1-dev-plus-aosp
...
Change-Id: I81b1fa2c3014abee75a32e82202b3f6b18435c9b
2014-11-25 11:00:41 -08:00
Elliott Hughes
7376cef149
Lose mkswap, swapoff, and swapon to toybox.
...
Change-Id: Iedb371ad0f1f74822b3ff4bc1b7b1f9e6ecd300d
2014-11-24 16:13:03 -08:00
Elliott Hughes
64d2944674
Lose printenv to toybox.
...
Change-Id: Icdc6766a7ef853bc846fe811fa2ad2284ed8a18f
2014-11-24 15:32:51 -08:00
Elliott Hughes
493faf525c
Lose sleep to toybox.
...
No pun intended.
Change-Id: Ic1d9c8fa9719a7749b4eeaeac20df313600c0b88
2014-11-24 15:22:22 -08:00
Elliott Hughes
47b3f9e29d
Lose sync to toybox.
...
Change-Id: I36c98135bb4ab1e2ca7137b7a83782fce5ac683a
2014-11-24 14:53:09 -08:00
Ying Wang
9f693b8f1e
Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks"
2014-11-24 22:17:57 +00:00
Ying Wang
7d45be0e4a
Use LOCAL_POST_LINK_CMD to install toolbox symlinks
...
It's simpler; Also whenever toolbox is updated the symlinks get
recreated.
Change-Id: I03fb61a5e0f14fd4ed23680dd6db87eed5b46787
2014-11-24 14:09:24 -08:00
Elliott Hughes
3024977037
Remove dead tools.
...
These have all been obsolete since we first moved to git!
Change-Id: Ie5bfc1b30000930ef6a604b4313ff7af1b7c4573
2014-11-24 14:03:28 -08:00
Elliott Hughes
8eb770d37c
Merge "Remove long-dead readtty."
2014-11-24 21:43:32 +00:00
Elliott Hughes
b120134bd1
Remove long-dead readtty.
...
Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
2014-11-24 12:01:21 -08:00
Elliott Hughes
b054178a15
Lose insmod/lsmod/rmmod to toybox.
...
Change-Id: Ia654cdca14a4fda958a406f5e6ccd0919ce88a8f
2014-11-24 11:34:14 -08:00
Elliott Hughes
3d5b5162e3
am 7f187c5f
: Merge "Lose clear, false, and true to toybox."
...
* commit '7f187c5f95d6bf0514e71e0e074768bd5395d45f':
Lose clear, false, and true to toybox.
2014-11-23 18:10:39 +00:00
Elliott Hughes
ed7959fe62
Lose clear, false, and true to toybox.
...
Change-Id: I125ea881e61b834b188d9a5411f3b6efe59b9bad
2014-11-22 22:58:42 -08:00
Elliott Hughes
b0669f5aa2
am caed3d9f
: Merge "notify: dynamically allocate filename buffer"
...
* commit 'caed3d9fae1fd372dfa01cb60fbf157233c9052e':
notify: dynamically allocate filename buffer
2014-11-21 20:25:58 +00:00
Johan Redestig
80bf9a456e
notify: dynamically allocate filename buffer
...
use asprintf to dynamically allocate filename buffer
rather than just reserving 512 bytes on the stack to
avoid potential overflow.
Change-Id: Ieeb9c6c2e5f97a9574f8128d84eba0b8efdb7263
2014-11-20 15:25:18 +01:00
Elliott Hughes
450c4ad097
am 16068830
: Merge "toolbox: enable mkswap to work on block devices"
...
* commit '16068830444361ab65cbc9804b76e2d415aff9a2':
toolbox: enable mkswap to work on block devices
2014-11-18 19:19:49 +00:00
Andrew Boie
d90615cefd
toolbox: enable mkswap to work on block devices
...
Change-Id: I9b71ca3fa09ffbe12dcc4d04229edab80851db4d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-11-18 10:42:14 -08:00
Elliott Hughes
23ac318d56
am 91cb2cb3
: Merge "toolbox: indicate why swap{on|off} failed"
...
* commit '91cb2cb3411472a567c8ec4e8dad9d3a1ebc1dca':
toolbox: indicate why swap{on|off} failed
2014-11-18 18:06:06 +00:00
Elliott Hughes
91cb2cb341
Merge "toolbox: indicate why swap{on|off} failed"
2014-11-18 17:57:59 +00:00
Dmitriy Ivanov
e4d7eaab97
am 359d58dc
: resolved conflicts for merge of cb8c583d
to stage-aosp-master
...
* commit '359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5':
Fix ps <process name>
2014-11-03 17:38:04 +00:00
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
Iliyan Malchev
343e66d6e0
toolbox: add prlimit command
...
automerge: 5b244cd
* commit '5b244cd4141d7e42bf9382e39c669e1ccf96266c':
toolbox: add prlimit command
2014-10-28 00:25:18 +00:00
Iliyan Malchev
5b244cd414
toolbox: add prlimit command
...
adb shell prlimit <pid> <cur> <max>
prlimit uses prlimit internally to allow you to set the limits on an arbitrary
process, if you have the privileges to.
Change-Id: Ie9a5dc510c7c695debd8f948361d4c51befa5604
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-10-27 12:25:41 -07:00
Daniel Rosenberg
9011c1bc7a
am 86b4dba9
: am b63aab58
: am 8218b6aa
: newfs_msdos: Set sectors per fat once
...
* commit '86b4dba9c48841659c566ac71a034230f02ec259':
newfs_msdos: Set sectors per fat once
2014-10-11 04:55:01 +00:00
Daniel Rosenberg
86b4dba9c4
am b63aab58
: am 8218b6aa
: newfs_msdos: Set sectors per fat once
...
* commit 'b63aab58065f5fb2a04c5d7c49f1d61bf7e17179':
newfs_msdos: Set sectors per fat once
2014-10-11 02:49:40 +00: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
5c9d4227fe
am f7c287b7
: am 47d24416
: Merge "Fix top for very large VSS."
...
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
Fix top for very large VSS.
2014-10-08 18:29:57 +00:00
Elliott Hughes
2c05b4fe41
Fix top for very large VSS.
...
Bug: 17913995
(cherry picked from commit 052d78f334
)
Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c
2014-10-08 11:21:23 -07: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
ddf510d478
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:20:55 +00: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
4ac3d28dea
am 5da0e2ee
: am 49e37652
: Merge "bionic has O_RSYNC now."
...
* commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8':
bionic has O_RSYNC now.
2014-09-24 05:08:59 +00: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
Greg Hackmann
4dc379b59b
am 5d93823e
: am 153c7aab
: am 5eedd9d6
: Merge "toolbox: fix build"
...
* commit '5d93823e557834c9b17771241ea6eecad74a5749':
toolbox: fix build
2014-05-21 18:10:38 +00:00
Greg Hackmann
2122aac5c9
toolbox: fix x86 build
...
Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 11:04:32 -07:00
Greg Hackmann
eeed45fa24
toolbox: fix build
...
Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 10:39:44 -07:00
Mark Salyzyn
6cd488e95a
resolved conflicts for merge of faf84529
to master
...
Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
2014-05-21 10:07:55 -07:00
Mark Salyzyn
36ccca155c
Merge "toolbox: turn on -Werror"
2014-05-21 15:40:14 +00:00
Narayan Kamath
50415394c5
am b3bd09cd
: am 9cbc8088
: am 5f6beb12
: Merge ""stop" / "start must apply to the secondary zygote as well."
...
* commit 'b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2':
"stop" / "start must apply to the secondary zygote as well.
2014-05-15 09:24:12 +00:00
Narayan Kamath
5f6beb12c1
Merge ""stop" / "start must apply to the secondary zygote as well."
2014-05-15 09:15:52 +00:00
Kenny Root
7c01585339
resolved conflicts for merge of 101e92ac
to master
...
Change-Id: I837bc0732c2e72d99ce47d0534915012ff43a21e
2014-05-14 17:29:21 -07:00
Elliott Hughes
569e834602
am 7c633e6f
: am 233bbd9d
: am ed02fbf0
: Merge "Clean up some unnecessary system_properties cruft."
...
* commit '7c633e6fe6f69006ca4299a475230dd583da38f3':
Clean up some unnecessary system_properties cruft.
2014-05-15 00:08:58 +00:00
Kenny Root
d20ba7fca2
Merge "ps: add flag to show ABI"
2014-05-15 00:03:41 +00:00
Elliott Hughes
f94853f294
Clean up some unnecessary system_properties cruft.
...
Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
2014-05-14 16:51:09 -07:00
Kenny Root
8f197e6579
ps: add flag to show ABI
...
Allow us to easily identify the 32/64 bitness of the process. Yes, I
know this is not technically an ABI, but it seemed close enough!
Change-Id: Ia03a17fd74d61e7619911cb26b3dd7d82b62930c
2014-05-14 16:11:37 -07:00
Mark Salyzyn
aa907768af
toolbox: turn on -Werror
...
- Deal with some signedness issues
- Deal with some size issues
- Deal with NULL pointer issues
- Deal with some -Wunused issues
Change-Id: I1479dd90d690084491bae3475f2c547833519a57
2014-05-14 12:41:24 -07:00
Narayan Kamath
22e22acbf0
"stop" / "start must apply to the secondary zygote as well.
...
Would've been nice if we could use the sys property
observer to start and stop all services in a service
class but service classes do not appear to be fully
supported.
Change-Id: Iaf17a2dbcf913c4c646bc1e8e13adee9f952c45e
2014-05-13 17:32:43 +01:00
Andrew Boie
c82b8d217d
toolbox: indicate why swap{on|off} failed
...
Change-Id: I1247e3592ab0f9878fb27d114fd14f9b29282b0e
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-04-30 12:57:45 +08:00
Elliott Hughes
265a1d285e
am 0888e52f
: am afe5bbef
: am a67914e4
: Merge "Fix top(1) SIGPIPE behavior."
...
* commit '0888e52fa8141acdcf62eff1b14059d9aab17382':
Fix top(1) SIGPIPE behavior.
2014-04-21 15:59:27 +00:00
Elliott Hughes
a67914e4d6
Merge "Fix top(1) SIGPIPE behavior."
2014-04-19 00:19:00 +00:00
Elliott Hughes
5922d3b5be
Fix top(1) SIGPIPE behavior.
...
Bug: 14166609
Change-Id: I4aad1e0db2e875735405d094fb0d1a36862b5b19
2014-04-18 16:53:04 -07:00
Colin Cross
dd8e1bbbb0
am 8d57b79c
: am bf66e448
: am a1551e9b
: Merge "Fix buffer overflow in syren utility"
...
* commit '8d57b79c26c9618ec50d3ee304e9abba41bfe4c9':
Fix buffer overflow in syren utility
2014-04-14 15:49:17 +00:00
nks
3967f81b56
Fix buffer overflow in syren utility
...
Patch for https://code.google.com/p/android/issues/detail?id=68268
A length check for the argv[2] was added in order to prevent buffer
overflow. Also replace strcpy with strlcpy.
Signed-off-by: nks <nks@sixserv.org>
Change-Id: If65b83e9b658315c672e684f64e3ae00e69fac31
2014-04-13 10:45:30 -07:00
Elliott Hughes
241d5aa3d2
am 8f2a205f
: am 1a09a804
: am 47d374ec
: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."
...
* commit '8f2a205f34bfad9eddbd62a073d1ca492276d538':
Move date off the non-portable bionic32 'strtotimeval'.
2014-04-07 22:42:28 +00:00
Elliott Hughes
e25a6413d3
Move date off the non-portable bionic32 'strtotimeval'.
...
Change-Id: Ib706d3a536c409810cfbc47270448c6375314506
2014-04-07 15:24:47 -07:00
Mark Salyzyn
731e24e99f
am fd0f4d9a
: am 8b8974ef
: am 31fa9604
: Merge "toolbox: ls: 64 bit compile warnings"
...
* commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8':
toolbox: ls: 64 bit compile warnings
2014-03-14 21:35:41 +00:00
Mark Salyzyn
4727c7711e
toolbox: ls: 64 bit compile warnings
...
Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
2014-03-14 13:47:16 -07:00
Mark Salyzyn
ed6178976d
am 713aedd7
: am 9e38da5f
: am 1a379899
: Merge "toolbox: schedtop 64 bit build issue"
...
* commit '713aedd74a9e7bf81929ccd8225d2784afcbb9c9':
toolbox: schedtop 64 bit build issue
2014-03-14 17:13:11 +00:00
Mark Salyzyn
161b55fc5d
toolbox: schedtop 64 bit build issue
...
Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
2014-03-13 17:14:15 -07:00
Dmitriy Ivanov
fbbc85ea8e
am 6bb6372b
: am 508240c3
: am 2a16a584
: Merge "fix: making lsof show devies and loaded .so file names correctly"
...
* commit '6bb6372b3ee930e2e8517262ec7db4f057a50725':
fix: making lsof show devies and loaded .so file names correctly
2014-03-04 20:16:46 +00:00
Dmitriy Ivanov
7c1fc0ed42
fix: making lsof show devies and loaded .so file names correctly
...
Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
2014-03-04 11:17:57 -08:00
Elliott Hughes
6a732d423f
am 2ae567c8
: am 1a5bc28f
: am a0e4d164
: Merge "Declare (and simplify) uid_from_user."
...
* commit '2ae567c82ee34fb7e51e797fce140313de34338b':
Declare (and simplify) uid_from_user.
2014-03-01 01:51:23 +00:00
Elliott Hughes
e12311fcb2
am f767e9c9
: am 7c5a9d24
: am fbcdf6f9
: Merge "Switch to BSD chown (for -R, primarily)."
...
* commit 'f767e9c97a0719b342e91c7770885c108a66e02f':
Switch to BSD chown (for -R, primarily).
2014-03-01 01:31:51 +00:00
Elliott Hughes
3f6b63e74d
Declare (and simplify) uid_from_user.
...
uid_from_user doesn't need to cope with numeric ids in the BSD code
like it did with the old Android code; the caller now handles those.
Also explain what SUPPORT_DOT is for.
Change-Id: I185c9f02b7039795069aa30545563b8a6ef54cd5
2014-02-28 17:27:08 -08:00
Elliott Hughes
7bc9748420
am 1f570812
: am d262b2a8
: am 54bb1d3b
: Merge "Fix grep -f."
...
* commit '1f57081216a2eae81672dadd67c94476b27fbf63':
Fix grep -f.
2014-03-01 01:24:37 +00:00
Elliott Hughes
fbcdf6f9fe
Merge "Switch to BSD chown (for -R, primarily)."
2014-03-01 01:18:29 +00:00
Elliott Hughes
0b024677ec
Switch to BSD chown (for -R, primarily).
...
Change-Id: I45381b8a04f4cb651123a2d43860418e06df6e65
2014-02-28 16:48:49 -08:00
Elliott Hughes
4014501d79
Fix grep -f.
...
bionic has getline now.
Change-Id: I5e4ee137768ab3113dbe8a07406fa39f4b6546af
2014-02-28 16:45:56 -08:00
Elliott Hughes
dc3dd44c02
am 51437ed2
: am 56ae6b68
: am 410f51a8
: Merge "Remove unused #includes of <asm/page.h>."
...
* commit '51437ed26565f4bc55e516b73b7e9cafef8e012f':
Remove unused #includes of <asm/page.h>.
2014-02-24 23:53:26 +00:00
Elliott Hughes
2f77bb6931
Remove unused #includes of <asm/page.h>.
...
(<asm/page.h> is going away.)
Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
2014-02-24 15:38:44 -08:00
Nick Kralevich
5a78e23a00
am 490963a5
: am c0f95624
: am 783eb168
: Merge "Add -D option to restorecon for relabeling /data/data."
...
* commit '490963a54e5ef0c421f0e1ac87eafc2b46c32b95':
Add -D option to restorecon for relabeling /data/data.
2014-02-20 23:15:40 +00:00
Stephen Smalley
500308a7e6
Add -D option to restorecon for relabeling /data/data.
...
This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83.
Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-18 11:15:52 -05:00
Nick Kralevich
3049f23915
am e41420bd
: am 488b5eaf
: am 2e7347d6
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:19:47 +00:00
Nick Kralevich
2e7347d617
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
2014-02-12 23:09:28 +00:00
Elliott Hughes
4160507b75
am a1ebd4d5
: am 696c75c1
: am 829ae5be
: Merge "Remove a pre-uapi hack from nandread."
...
* commit 'a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73':
Remove a pre-uapi hack from nandread.
2014-02-10 12:51:27 +00:00
Elliott Hughes
2c1d62d622
Remove a pre-uapi hack from nandread.
...
We only have uapi headers now.
Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
2014-02-07 17:10:37 -08:00
Stephen Smalley
27a93650c0
Convert all selinux_android_restorecon and _setfilecon calls to new API.
...
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.
Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.
Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-07 09:38:32 -05:00
Nick Kralevich
b3e2d02588
am 52ca10d1
: am e3b1810e
: am 71de56a0
: Merge "Unify toolbox restorecon and libselinux restorecon implementations."
...
* commit '52ca10d15aa803333467db456a40d2bbc89dc18e':
Unify toolbox restorecon and libselinux restorecon implementations.
2014-02-07 00:02:23 +00:00
Stephen Smalley
2761b71d3f
Unify toolbox restorecon and libselinux restorecon implementations.
...
Extend the libselinux restorecon implementation to allow reuse
by the toolbox restorecon command. This simply requires adding
support for the nochange (-n) and verbose (-v) options to the
libselinux functions and rewriting the toolbox restorecon command
to use the libselinux functions. Also add a force (-F) option to
support forcing a restorecon_recursive even if the restorecon_last
attribute matches the current file_contexts hash so that we can
continue to force a restorecon via the toolbox command for testing
or when we know something else has changed (e.g. for when we support
relabeling /data/data and package information has changed).
Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-06 09:42:04 -05:00
Sujith Ramakrishnan
42e5fda53a
Merge "Add mknod utility to system/core/toolbox"
2014-01-24 22:31:17 +00:00
Sujith Ramakrishnan
71bbbd1578
Add mknod utility to system/core/toolbox
...
Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
2014-01-17 19:14:47 -08:00
Elliott Hughes
5dbb002217
am 1571dac4
: am 1b37794b
: am f62b602f
: am 6192eedb
: Merge "Fix \'r\' for LP64."
...
* commit '1571dac49fee8d7304a082a787aed15520ed48b4':
Fix 'r' for LP64.
2014-01-17 20:11:24 +00:00
Elliott Hughes
2430a064bd
Fix 'r' for LP64.
...
Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
2014-01-17 09:50:56 -08:00
Elliott Hughes
3215ed4228
am b1091958
: am 320f2940
: am e20b5f71
: am 524b3a0c
: Merge "Remove obsolete \'setconsole\' command."
...
* commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a':
Remove obsolete 'setconsole' command.
2014-01-17 01:06:44 +00:00
Elliott Hughes
c1e91b0034
Remove obsolete 'setconsole' command.
...
Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
2014-01-16 14:50:23 -08:00
Elliott Hughes
b70375abc2
resolved conflicts for merge of ec9e5891
to master
...
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
2014-01-16 14:42:35 -08:00