summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2012-04-07 03:03:49 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-07 03:03:49 +0200
commit78911bdf4f9dfff6583f3f8150a3257212ceea13 (patch)
treece93b39003a2edbf5406bc124a34f61f39454305
parentam 155cd3c1: Merge changes Ied379f26,I09fb9d56 (diff)
parentMerge "Change the format command to always take the mount point as an argument." (diff)
downloadandroid_bootable_recovery-78911bdf4f9dfff6583f3f8150a3257212ceea13.tar
android_bootable_recovery-78911bdf4f9dfff6583f3f8150a3257212ceea13.tar.gz
android_bootable_recovery-78911bdf4f9dfff6583f3f8150a3257212ceea13.tar.bz2
android_bootable_recovery-78911bdf4f9dfff6583f3f8150a3257212ceea13.tar.lz
android_bootable_recovery-78911bdf4f9dfff6583f3f8150a3257212ceea13.tar.xz
android_bootable_recovery-78911bdf4f9dfff6583f3f8150a3257212ceea13.tar.zst
android_bootable_recovery-78911bdf4f9dfff6583f3f8150a3257212ceea13.zip
-rw-r--r--updater/install.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/updater/install.c b/updater/install.c
index a59c4edac..64da2efd6 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -200,27 +200,20 @@ done:
// if fs_size == 0, then make_ext4fs uses the entire partition.
// if fs_size > 0, that is the size to use
// if fs_size < 0, then reserve that many bytes at the end of the partition
-// mount_point is used with SELinux as the location of the mount point, absent otherwise
Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) {
char* result = NULL;
- if (argc != 4 && argc != 5) {
- return ErrorAbort(state, "%s() expects 4 or 5 args, got %d", name, argc);
+ if (argc != 5) {
+ return ErrorAbort(state, "%s() expects 5 args, got %d", name, argc);
}
char* fs_type;
char* partition_type;
char* location;
char* fs_size;
- char* mount_point = NULL;
+ char* mount_point;
-#ifdef HAVE_SELINUX
if (ReadArgs(state, argv, 5, &fs_type, &partition_type, &location, &fs_size, &mount_point) < 0) {
return NULL;
}
-#else
- if (ReadArgs(state, argv, 4, &fs_type, &partition_type, &location, &fs_size) < 0) {
- return NULL;
- }
-#endif
if (strlen(fs_type) == 0) {
ErrorAbort(state, "fs_type argument to %s() can't be empty", name);
@@ -236,12 +229,10 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) {
goto done;
}
-#ifdef HAVE_SELINUX
- if (!mount_point || strlen(mount_point) == 0) {
+ if (strlen(mount_point) == 0) {
ErrorAbort(state, "mount_point argument to %s() can't be empty", name);
goto done;
}
-#endif
if (strcmp(partition_type, "MTD") == 0) {
mtd_scan_partitions();