diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-12-15 13:11:08 -0300 | 
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-12-15 13:11:08 -0300 | 
| commit | aff470b3efa671f6c04107f718d359054a739bdc (patch) | |
| tree | efa08835f1ff9c8d01ed93c08b614f056fd6cb4f /pkg/linux/bitmask-root | |
| parent | 43a67207845943d5e93c51844feb6666ac1911f5 (diff) | |
| parent | 9e89e4fc8dba7541f3475de0183b47fa9342ea84 (diff) | |
Merge branch 'release/0.7.x' into develop
Conflicts:
	pkg/tuf/release.py
	relnotes.txt
Diffstat (limited to 'pkg/linux/bitmask-root')
| -rwxr-xr-x | pkg/linux/bitmask-root | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/pkg/linux/bitmask-root b/pkg/linux/bitmask-root index ee195e3b..622a0b8a 100755 --- a/pkg/linux/bitmask-root +++ b/pkg/linux/bitmask-root @@ -51,7 +51,7 @@ cmdcheck = subprocess.check_output  # CONSTANTS  # -VERSION = "3" +VERSION = "4"  SCRIPT = "bitmask-root"  NAMESERVER = "10.42.0.1"  BITMASK_CHAIN = "bitmask" @@ -96,7 +96,8 @@ ALLOWED_FLAGS = {      "--management-client-user": ["USER"],      "--cert": ["FILE"],      "--key": ["FILE"], -    "--ca": ["FILE"] +    "--ca": ["FILE"], +    "--fragment": ["NUMBER"]  }  PARAM_FORMATS = { | 
