napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure the hwinfo executable exists before calling it

Browse Source
This commit is contained in:
Rohan Garg 2014-10-14 15:41:20 +02:00
parent eed387f7a4
commit f9bd0dfcfc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/initcpiocfg/main.py
View File

@ -20,19 +20,22 @@
import libcalamares import libcalamares
import os import os
import subprocess import subprocess
import shutil
from libcalamares.utils import check_chroot_call from libcalamares.utils import check_chroot_call
def get_cpu(): def get_cpu():
""" Check if system is an intel system. """ """ Check if system is an intel system. """
process1 = subprocess.Popen(["hwinfo", "--cpu"], stdout=subprocess.PIPE) if shutil.which("hwinfo") != None:
process2 = subprocess.Popen(["grep", "Model:[[:space:]]"], process1 = subprocess.Popen(["hwinfo", "--cpu"], stdout=subprocess.PIPE)
stdin=process1.stdout, stdout=subprocess.PIPE) process2 = subprocess.Popen(["grep", "Model:[[:space:]]"],
process1.stdout.close() stdin=process1.stdout, stdout=subprocess.PIPE)
out, err = process2.communicate() process1.stdout.close()
return out.decode().lower() out, err = process2.communicate()
return out.decode().lower()
return ""
def set_mkinitcpio_hooks_and_modules(hooks, modules, root_mount_point): def set_mkinitcpio_hooks_and_modules(hooks, modules, root_mount_point):
""" Set up mkinitcpio.conf """ """ Set up mkinitcpio.conf """