diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-28 14:08:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-28 14:08:23 +0000 |
| commit | 269207970ea0a51a9ced8273a7153d5dbee46feb (patch) | |
| tree | 76f58080ca8339dc94f62772bf8be9d248793e83 /apexer/apexer.py | |
| parent | 6d887247e8d079e3ae31d1c525def82bc8c479c6 (diff) | |
| parent | 34c0fbbfcde17170222914642e5222ad993e0d3e (diff) | |
Merge "Set uid/gid/mode of files in an APEX"
Diffstat (limited to 'apexer/apexer.py')
| -rw-r--r-- | apexer/apexer.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py index b684b24..fd57c36 100644 --- a/apexer/apexer.py +++ b/apexer/apexer.py @@ -39,8 +39,10 @@ def ParseArgs(argv): help='verbose execution') parser.add_argument('--manifest', default='manifest.json', help='path to the APEX manifest file') - parser.add_argument('--file_contexts', + parser.add_argument('--file_contexts', required=True, help='selinux file contexts file') + parser.add_argument('--canned_fs_config', required=True, + help='canned_fs_config specifies uid/gid/mode of files') parser.add_argument('input_dir', metavar='INPUT_DIR', help='the directory having files to be packaged') parser.add_argument('output', metavar='OUTPUT', @@ -159,6 +161,7 @@ def CreateApex(args, work_dir): cmd.extend(['-f', args.input_dir]) cmd.extend(['-T', '0']) # time is set to epoch cmd.extend(['-S', compiled_file_contexts]) + cmd.extend(['-C', args.canned_fs_config]) cmd.append(img_file) RunCommand(cmd, args.verbose) @@ -177,6 +180,7 @@ def CreateApex(args, work_dir): cmd.extend(['-f', manifests_dir]) cmd.extend(['-T', '0']) # time is set to epoch cmd.extend(['-S', compiled_file_contexts]) + cmd.extend(['-C', args.canned_fs_config]) cmd.append(img_file) RunCommand(cmd, args.verbose) |