3e18f2bf40
The earlier commit in 2dfc1a3898
unintentionally changed the behavior. It gives a different result when
looking up non-existent mount points (e.g. /cache on marlin).
The logic behind volume_for_path("/xyz") is unclear:
- It's fine to return non-null value if it's called by
ensure_path_mounted() before accessing that file "/xyz". (Just based
on the function name, we're not actually having this case.)
- It should return nullptr if the caller is interested in the existence
of that particular mount point "/xyz".
This CL renames the function to volume_for_mount_point(), which does an
exact match by querying the given mount point from libfs_mgr. The former
volume_for_path() has been moved down to function scope for serving
ensure_path_mounted() only.
Test: Build and boot into recovery on bullhead and marlin respectively.
'View recovery logs'.
Test: 'Mount /system'
Test: 'Apply update from ADB'
Change-Id: I1a16390f57540cae08a2b8f3d439d17886975217
56 lines
2 KiB
C++
56 lines
2 KiB
C++
/*
|
|
* Copyright (C) 2007 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef RECOVERY_ROOTS_H_
|
|
#define RECOVERY_ROOTS_H_
|
|
|
|
#include <string>
|
|
|
|
typedef struct fstab_rec Volume;
|
|
|
|
// Load and parse volume data from /etc/recovery.fstab.
|
|
void load_volume_table();
|
|
|
|
// Return the Volume* record for this mount point (or nullptr).
|
|
Volume* volume_for_mount_point(const std::string& mount_point);
|
|
|
|
// Make sure that the volume 'path' is on is mounted. Returns 0 on
|
|
// success (volume is mounted).
|
|
int ensure_path_mounted(const char* path);
|
|
|
|
// Similar to ensure_path_mounted, but allows one to specify the mount_point.
|
|
int ensure_path_mounted_at(const char* path, const char* mount_point);
|
|
|
|
// Make sure that the volume 'path' is on is unmounted. Returns 0 on
|
|
// success (volume is unmounted);
|
|
int ensure_path_unmounted(const char* path);
|
|
|
|
// Reformat the given volume (must be the mount point only, eg
|
|
// "/cache"), no paths permitted. Attempts to unmount the volume if
|
|
// it is mounted.
|
|
int format_volume(const char* volume);
|
|
|
|
// Reformat the given volume (must be the mount point only, eg
|
|
// "/cache"), no paths permitted. Attempts to unmount the volume if
|
|
// it is mounted.
|
|
// Copies 'directory' to root of the newly formatted volume
|
|
int format_volume(const char* volume, const char* directory);
|
|
|
|
// Ensure that all and only the volumes that packages expect to find
|
|
// mounted (/tmp and /cache) are mounted. Returns 0 on success.
|
|
int setup_install_mounts();
|
|
|
|
#endif // RECOVERY_ROOTS_H_
|