resolved conflicts for merge of 0b1fee1b to master

Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
2012-03-30 21:26:01 -07:00
parent b2364342a0 0b1fee1b2a
commit 41dda82d84
12 changed files with 167 additions and 16 deletions
@@ -31,6 +31,8 @@
 static int num_volumes = 0;
 static Volume* device_volumes = NULL;

+extern struct selabel_handle *sehandle;
+
 static int parse_options(char* options, Volume* volume) {
    char* option;
    while ((option = strtok(options, ","))) {
@@ -269,7 +271,7 @@ int format_volume(const char* volume) {
    }

    if (strcmp(v->fs_type, "ext4") == 0) {
-        int result = make_ext4fs(v->device, v->length);
+        int result = make_ext4fs(v->device, v->length, volume, sehandle);
        if (result != 0) {
            LOGE("format_volume: make_extf4fs failed on %s\n", v->device);
            return -1;