StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57 from CanonicalLtd/fix-show-disk-info 

Fix is_root check on sudo
This commit is contained in:
raharper 2015-09-29 16:23:42 -05:00
parent 3dc2af13da ce133c6b06
commit 349edfc7f5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subiquity/controllers/filesystem.py
View File

@ -196,7 +196,9 @@ class FilesystemController(ControllerPolicy):
def show_disk_information(self, device): def show_disk_information(self, device):
""" Show disk information, requires sudo/root """ Show disk information, requires sudo/root
""" """
if not utils.is_root(): root = utils.is_root()
log.debug('show_disk_info is_root ? {}'.format(root))
if not root:
result = "hdparm requires root permission." result = "hdparm requires root permission."
else: else:
out = utils.run_command("hdparm -i {}".format(device)) out = utils.run_command("hdparm -i {}".format(device))

5
subiquity/utils.py
View File

@ -119,7 +119,10 @@ def is_root():
""" Returns root or if sudo user exists """ Returns root or if sudo user exists
""" """
sudo_user = os.getenv('SUDO_USER', None) sudo_user = os.getenv('SUDO_USER', None)
euid = os.geteuid()
if os.geteuid() != 0 or not sudo_user: log.debug('is_root: euid={} sudo_user={}'.format(
euid, sudo_user))
if euid != 0 or sudo_user is not None:
return False return False
return True return True