summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-09-05 16:19:27 -0300
committerTomás Touceda <chiiph@leap.se>2014-09-05 16:19:27 -0300
commita96c163b3ef6281eae1cf9c04fcbeb46b9fc43f4 (patch)
tree0de24bdf00b62f28f8ddf90b1d4cf497737dc437
parent125a83037657bd7783ebc5b9e8aca75b5e886780 (diff)
parentb7b2c18b8d8ae09ac7f5ad86173380bf69409b80 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/6048_python2-bitmask-root' into develop
-rw-r--r--changes/bug-6048_python2-bitmask-root1
-rwxr-xr-xpkg/linux/bitmask-root2
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug-6048_python2-bitmask-root b/changes/bug-6048_python2-bitmask-root
new file mode 100644
index 00000000..038196b0
--- /dev/null
+++ b/changes/bug-6048_python2-bitmask-root
@@ -0,0 +1 @@
+- Use python2 to run bitmask-root to work fine on systems with python3 as default. Closes #6048.
diff --git a/pkg/linux/bitmask-root b/pkg/linux/bitmask-root
index c9034b0d..fa7fc92a 100755
--- a/pkg/linux/bitmask-root
+++ b/pkg/linux/bitmask-root
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# -*- coding: utf-8 -*-
#
# Copyright (C) 2014 LEAP