summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Collapse)AuthorAgeFilesLines
* Fix fstab memory leakIrina Tirdea2013-09-181-2/+4
| | | | | | | | | | When reading the fstab config file fails, fstab memory is not freed. When fstab structure is no longer needed, only half of it is freed. Free fstab memory in all cases (error or when it is no longer needed). Change-Id: Ib0758a5aaa69505285bf64143632986a2dbbdccb Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
* Cleanup fs_getline from fs_mgrIrina Tirdea2013-09-181-72/+16
| | | | | | | | | | Since getline is included in bionic, fs_mgr can use this version instead of the one defined internally by fs_getline. Replace fs_getline with getline. Change-Id: I49b53d639bd995f051256fb7573ff6ab45d9c36d Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
* Fix my incorrect merge resolution for ↵Elliott Hughes2013-07-111-10/+0
| | | | | | 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder. Change-Id: I3f8bc955f035b49407540053462e53b3f262d381
* Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.Elliott Hughes2013-07-111-1/+1
| | | | | | The conflict was the actual intended change. Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b
* resolved conflicts for merge of 42031e0e to stage-aosp-masterElliott Hughes2013-07-111-0/+10
|\ | | | | | | Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6
| * Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds"Ken Sumrall2013-07-101-1/+1
| |\
| | * fs_mgr_priv: Extend fs wait timeout to 20 secondsAndrew Boie2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In practice 5 seconds is too short to wait for a disk device node to show up if the disk is USB; 20 seconds is a much more comfortable window. Change-Id: Iaf2c1f46b41a44fc1240d52d8498ca9cb639ea80 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | Include liblog in fs_mgr to fix the build.Ken Sumrall2013-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | A recent change to how libcutils is built requires liblog to be explicitly included in the link list if it's needed. Change-Id: I8547f5e65c488c8f6e314ccd4eb96606742272be
* | | fs_mgr: Capture the output of e2fsck and add to the kernel logKen Sumrall2013-04-142-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the output of e2fsck is not saved, and we have no insight into how many errors e2fsck is finding and fixing. Using the new abbreviated logging feature in liblogwrap, up to the first 100 lines, and last 4K bytes of the output of e2fsck is captured by fs_mgr, and added to the kernel log. Usually, the filesystem will be clean, and this will only add a few lines to the kernel log on boot, but when things go wrong, it should save enough to indicate what the problem is, without potentially filling the kernel log with only e2fsck output if the filesystem is really corrupted. Change-Id: I9c264798e6fe721c8f818b5ce15d0975027ddbdd
* | | fs_mgr: add support for new recoveryonly flagKen Sumrall2013-02-222-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a device has an ext4 partition that contains the radio firmware, and that filesystem is not mounted in normal operation, we need a flag to prevent mount_all from mounting it, so the new flag recoveryonly was added. Change-Id: I361800c494e751b04c4faf956870f15fd0d8fe20
* | | fs_mgr: support a unified fstab format.Ken Sumrall2013-02-194-103/+288
|/ / | | | | | | | | | | | | Update fs_mgr to support more flags needed to unify the 3 fstabs currently in android into one. Change-Id: Ie46cea61a5b19882c55098bdd70f39e78fb603be
* | am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on ↵Ken Sumrall2012-11-121-2/+2
|\ \ | |/ |/| | | | | | | | | encrypted devices" into jb-mr1.1-dev * commit '7fd51b36dabedee4de159213237e71ba20865812': Fix fs_mgr to properly invoke e2fsck on encrypted devices
| * Fix fs_mgr to properly invoke e2fsck on encrypted devicesKen Sumrall2012-11-061-2/+2
| | | | | | | | Change-Id: Ie220f5cb7b614a48ec8afe66f4721ede3a368166
* | am cfd7c2a0: am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"Elliott Hughes2012-09-261-3/+3
|\ \ | |/ |/| | | | | * commit 'cfd7c2a05166a3ff27b2145b007834408d95a2e0': Rename getline to fs_getline for fs_mgr
| * am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"Elliott Hughes2012-09-261-3/+3
| |\ | | | | | | | | | | | | * commit '1c0c52503dcedff1a75775bf8bfffe7ec77b722b': Rename getline to fs_getline for fs_mgr
| | * Rename getline to fs_getline for fs_mgrIrina Tirdea2012-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fs_mgr defines its own version of getline and uses it internally. This leads to a build error if getline is also defined in bionic, since fs_mgr will see readline as defined internally. Rename getline in fs_mgr to a local name (fs_getline) so that there will no longer be any conflicts. This is needed it we want to add getline in bionic. Change-Id: I3a32be71a645e122629802d98ff8f9ab9c419e86 Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
* | | Support shared-subtree and bind mount flags.Jeff Sharkey2012-08-141-0/+6
|/ / | | | | | | | | Bug: 6925012 Change-Id: Id8d887d17c6b1b2f90cfd1a1de991ccaba730b7d
* | Mount/unmount filesystems before running e2fsckKen Sumrall2012-07-241-3/+24
|/ | | | | | | This works around a performance problem in the firmware of some emmc chips. Change-Id: Ia414b4604d11e47ce9cb3f86ac82602e081bb09e
* A filesystem manager library to mount filesystems for init.Ken Sumrall2012-05-015-0/+860
Instead of specifying in init what to mount, and having various hacks in init itself to deal with encryption, use a filesystem manager library to do the work, that can also be invoked by vold when mounting an encrypted volume. Keep all the magic filesystem info an a device specific fstab file. Change-Id: Ib988f1e4fb0638ba1d5fd98407fa6d8cf862aaca