From 7ed780014dfbdcf4b63785517fc7c08a9290ed84 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sat, 10 Sep 2016 14:55:28 +0200
Subject: [PATCH 1/4] [mhwdcfg] replace hardwarecfg

---
 settings.conf                                 |   2 +-
 src/modules/hardwarecfg/main.py               | 119 ------------------
 src/modules/hardwarecfg/mhwd.sh               |  50 --------
 src/modules/mhwdcfg/main.py                   |  98 +++++++++++++++
 src/modules/mhwdcfg/mhwdcfg.conf              |  17 +++
 .../{hardwarecfg => mhwdcfg}/module.desc      |   2 +-
 6 files changed, 117 insertions(+), 171 deletions(-)
 delete mode 100644 src/modules/hardwarecfg/main.py
 delete mode 100755 src/modules/hardwarecfg/mhwd.sh
 create mode 100644 src/modules/mhwdcfg/main.py
 create mode 100644 src/modules/mhwdcfg/mhwdcfg.conf
 rename src/modules/{hardwarecfg => mhwdcfg}/module.desc (83%)

diff --git a/settings.conf b/settings.conf
index e12434026..0b0bd7238 100644
--- a/settings.conf
+++ b/settings.conf
@@ -81,7 +81,7 @@ sequence:
   - initcpio
   - users
   - displaymanager
-  - hardwarecfg
+  - mhwdcfg
   - networkcfg
   - hwclock
   - services
diff --git a/src/modules/hardwarecfg/main.py b/src/modules/hardwarecfg/main.py
deleted file mode 100644
index 08c49b3c8..000000000
--- a/src/modules/hardwarecfg/main.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf-8
-# === This file is part of Calamares - <http://github.com/calamares> ===
-#
-#   Copyright 2014, Philip Müller <philm@manjaro.org>
-#
-#   Calamares is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   Calamares is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import subprocess
-
-import libcalamares
-
-import shutil
-
-def run():
-    """ Configure the hardware """
-
-    install_path = libcalamares.globalstorage.value( "rootMountPoint" )
-
-    # Copy generated xorg.xonf to target
-    if os.path.exists("/etc/X11/xorg.conf"):
-        shutil.copy2('/etc/X11/xorg.conf',
-             os.path.join(install_path, 'etc/X11/xorg.conf'))
-
-    # TODO: Maybe we can drop this
-    # Configure ALSA
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Master 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Front 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Side 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Surround 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Center 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset LFE 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Headphone 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Speaker 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset PCM 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Line 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset External 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset FM 50% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Master Mono 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Master Digital 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Analog Mix 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Aux 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Aux2 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset PCM Center 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset PCM Front 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset PCM LFE 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset PCM Side 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset PCM Surround 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Playback 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset PCM,1 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset DAC 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset DAC,0 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset DAC,1 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Synth 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset CD 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Wave 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Music 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset AC97 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Analog Front 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset VIA DXS,0 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset VIA DXS,1 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset VIA DXS,2 70% unmute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset VIA DXS,3 70% unmute'])
-
-    # set input levels
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Mic 70% mute'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset IEC958 70% mute'])
-
-    # special stuff
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Master Playback Switch on'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Master Surround on'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset SB Live Analog/Digital Output Jack off'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Audigy Analog/Digital Output Jack off'])
-
-    # special stuff
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Master Playback Switch on'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Master Surround on'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset SB Live Analog/Digital Output Jack off'])
-    libcalamares.utils.target_env_call(['sh', '-c', 'amixer -c 0 sset Audigy Analog/Digital Output Jack off'])
-
-    # Set pulse
-    if os.path.exists("/usr/bin/pulseaudio-ctl"):
-        libcalamares.utils.target_env_call(['pulseaudio-ctl', 'normal'])
-
-    # Save settings
-    libcalamares.utils.target_env_call(['alsactl', '-f', '/etc/asound.state', 'store'])
-
-    if os.path.exists("/opt/livecd"):
-        repo_path="/opt/livecd/pacman-gfx.conf"
-    else:
-        repo_path="/opt/live/pacman-gfx.conf"
-
-    # Install xf86-video driver
-    if os.path.exists(repo_path):
-        # TODO: get mhwd-script path or port it to python
-        mhwd_script_path = '/usr/lib/calamares/modules/hardwarecfg/mhwd.sh'
-        #try:
-        subprocess.check_call(["/usr/bin/bash", mhwd_script_path, install_path])
-
-    # Remove virtualbox driver on real hardware
-    p1 = subprocess.Popen(["mhwd"], stdout=subprocess.PIPE)
-    p2 = subprocess.Popen(["grep", "0300:80ee:beef"], stdin=p1.stdout, stdout=subprocess.PIPE)
-    num_res = p2.communicate()[0]
-    if num_res == "0":
-        libcalamares.utils.target_env_call(['sh', '-c', 'pacman -Rsc --noconfirm $(pacman -Qq | grep virtualbox-guest-modules)'])
-
-    return None
diff --git a/src/modules/hardwarecfg/mhwd.sh b/src/modules/hardwarecfg/mhwd.sh
deleted file mode 100755
index cec032384..000000000
--- a/src/modules/hardwarecfg/mhwd.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-kernel_cmdline ()
-{
-    for param in $(/bin/cat /proc/cmdline); do
-        case "${param}" in
-            $1=*) echo "${param##*=}"; return 0 ;;
-            $1) return 0 ;;
-            *) continue ;;
-        esac
-    done
-    [ -n "${2}" ] && echo "${2}"
-    return 1
-}
-
-USENONFREE="$(kernel_cmdline nonfree no)"
-VIDEO="$(kernel_cmdline xdriver no)"
-DESTDIR="$1"
-
-REPO_PATH=/opt/live
-[ -d /opt/livecd ] && REPO_PATH=/opt/livecd
-PAC_CONF=${REPO_PATH}/pacman-gfx.conf
-
-echo "MHWD-Driver: ${USENONFREE}"
-echo "MHWD-Video: ${VIDEO}"
-
-mkdir -p ${DESTDIR}${REPO_PATH}
-mount -o bind ${REPO_PATH} ${DESTDIR}${REPO_PATH} > /tmp/mount.pkgs.log
-ls ${DESTDIR}${REPO_PATH} >> /tmp/mount.pkgs.log
-
-# Video driver
-if  [ "${USENONFREE}" == "yes" ] || [ "${USENONFREE}" == "true" ]; then
-	if  [ "${VIDEO}" == "vesa" ]; then
-		chroot ${DESTDIR} mhwd --install pci video-vesa --pmconfig "${PAC_CONF}"
-	else
-		chroot ${DESTDIR} mhwd --auto pci nonfree 0300 --pmconfig "${PAC_CONF}"
-	fi
-else
-	if  [ "${VIDEO}" == "vesa" ]; then
-		chroot ${DESTDIR} mhwd --install pci video-vesa --pmconfig "${PAC_CONF}"
-	else
-		chroot ${DESTDIR} mhwd --auto pci free 0300 --pmconfig "${PAC_CONF}"
-	fi
-fi
-
-# Network driver
-chroot ${DESTDIR} mhwd --auto pci free 0200 --pmconfig "${PAC_CONF}"
-chroot ${DESTDIR} mhwd --auto pci free 0280 --pmconfig "${PAC_CONF}"
-
-umount ${DESTDIR}${REPO_PATH}
-rmdir ${DESTDIR}${REPO_PATH}
diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py
new file mode 100644
index 000000000..95ed66c97
--- /dev/null
+++ b/src/modules/mhwdcfg/main.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# === This file is part of Calamares - <http://github.com/calamares> ===
+#
+#   Copyright 2016, Artoo <artoo@manjaro.org>
+#
+#   Calamares is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Calamares is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+
+import libcalamares
+
+from libcalamares.utils import check_target_env_call, target_env_call, debug
+from os.path import join
+from subprocess import check_call, call
+
+class MhwdController:
+	def __init__(self):
+		self.__root = libcalamares.globalstorage.value( "rootMountPoint" )
+		self.__bus = libcalamares.job.configuration.get('bus', [])
+		self.__identifier = libcalamares.job.configuration.get('identifier', [])
+		self.__local = libcalamares.job.configuration['local']
+		self.__repo = libcalamares.job.configuration['repo']
+		self._driver = libcalamares.job.configuration['driver']
+
+	@property
+	def driver(self):
+		return self._driver
+
+	@driver.setter
+	def driver(self, value):
+		self._driver = value
+		
+	@property
+	def root(self):
+		return self.__root
+
+	@property
+	def local(self):
+		return self.__local
+	
+	@property
+	def repo(self):
+		return self.__repo
+	
+	@property
+	def identifier(self):
+		return self.__identifier
+	
+	@property
+	def bus(self):
+		return self.__bus
+	
+	def umount(self, mp):
+		call(["umount", "-l", join(self.root, mp)])
+		
+	def mount(self, mp):
+		call(["mount", "-Br", "/" + mp, join(self.root, mp)])
+	
+	def configure(self, name, id):
+		cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)]
+		if self.local:
+			self.mount("opt")
+			cmd.extend(["--pmconfig", self.repo])
+			
+		self.mount("etc/resolv.conf")
+		check_target_env_call(cmd)
+		
+		if self.local:
+			self.umount("opt")
+		self.umount("etc/resolv.conf")
+		
+	def run(self):
+		for id in self.identifier['net']:
+			for b in self.bus:
+				self.configure(b, id)
+		for id in self.identifier['video']:
+			for b in self.bus:
+				self.configure(b, id)
+				
+		return None
+
+def run():
+	""" Configure the hardware """
+
+	mhwd = MhwdController()
+	
+	return mhwd.run()
diff --git a/src/modules/mhwdcfg/mhwdcfg.conf b/src/modules/mhwdcfg/mhwdcfg.conf
new file mode 100644
index 000000000..a4752f720
--- /dev/null
+++ b/src/modules/mhwdcfg/mhwdcfg.conf
@@ -0,0 +1,17 @@
+---
+identifier:
+    net:
+      - 200
+      - 280
+    video:
+      - 300
+
+bus:
+    - pci
+    - usb
+
+driver: free
+
+local: true
+
+repo: /opt/pacman-mhwd.conf
diff --git a/src/modules/hardwarecfg/module.desc b/src/modules/mhwdcfg/module.desc
similarity index 83%
rename from src/modules/hardwarecfg/module.desc
rename to src/modules/mhwdcfg/module.desc
index 0a05af30f..1e719bb0b 100644
--- a/src/modules/hardwarecfg/module.desc
+++ b/src/modules/mhwdcfg/module.desc
@@ -1,6 +1,6 @@
 # Syntax is YAML 1.2
 ---
 type:       "job"
-name:       "hardwarecfg"
+name:       "mhwdcfg"
 interface:  "python"
 script:     "main.py"   #assumed relative to the current directory

From 8627f291cac8f45b1c76e4a13ad9257a38b61599 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Mon, 12 Sep 2016 07:39:25 +0200
Subject: [PATCH 2/4] [mhwdcfg] update conf file - add 302 and 380 to gfx IDs -
 disable usb as we don't have any config for that yet

---
 src/modules/mhwdcfg/mhwdcfg.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/mhwdcfg/mhwdcfg.conf b/src/modules/mhwdcfg/mhwdcfg.conf
index a4752f720..a6e2510c3 100644
--- a/src/modules/mhwdcfg/mhwdcfg.conf
+++ b/src/modules/mhwdcfg/mhwdcfg.conf
@@ -5,10 +5,12 @@ identifier:
       - 280
     video:
       - 300
+      - 302
+      - 380
 
 bus:
     - pci
-    - usb
+#    - usb
 
 driver: free
 

From 5610e274ba21b393613a332247dec6bfff8be3d1 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 12 Sep 2016 18:30:39 +0200
Subject: [PATCH 3/4] [mhwdcfg] adopt development changes

---
 src/modules/mhwdcfg/main.py      | 35 ++++++++++++++++----------------
 src/modules/mhwdcfg/mhwdcfg.conf |  7 +++----
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py
index 95ed66c97..a3ae98d96 100644
--- a/src/modules/mhwdcfg/main.py
+++ b/src/modules/mhwdcfg/main.py
@@ -40,7 +40,7 @@ class MhwdController:
 	@driver.setter
 	def driver(self, value):
 		self._driver = value
-		
+
 	@property
 	def root(self):
 		return self.__root
@@ -48,51 +48,50 @@ class MhwdController:
 	@property
 	def local(self):
 		return self.__local
-	
+
 	@property
 	def repo(self):
 		return self.__repo
-	
+
 	@property
 	def identifier(self):
 		return self.__identifier
-	
+
 	@property
 	def bus(self):
 		return self.__bus
-	
+
 	def umount(self, mp):
 		call(["umount", "-l", join(self.root, mp)])
-		
+
 	def mount(self, mp):
 		call(["mount", "-Br", "/" + mp, join(self.root, mp)])
-	
+
 	def configure(self, name, id):
 		cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)]
 		if self.local:
 			self.mount("opt")
 			cmd.extend(["--pmconfig", self.repo])
-			
+
 		self.mount("etc/resolv.conf")
 		check_target_env_call(cmd)
-		
+
 		if self.local:
 			self.umount("opt")
 		self.umount("etc/resolv.conf")
-		
+
 	def run(self):
-		for id in self.identifier['net']:
-			for b in self.bus:
-				self.configure(b, id)
-		for id in self.identifier['video']:
-			for b in self.bus:
-				self.configure(b, id)
-				
+		for b in self.bus:
+			for id in self.identifier['net']:
+					self.configure(b, id)
+			for id in self.identifier['video']:
+					self.configure(b, id)
+
 		return None
 
 def run():
 	""" Configure the hardware """
 
 	mhwd = MhwdController()
-	
+
 	return mhwd.run()
diff --git a/src/modules/mhwdcfg/mhwdcfg.conf b/src/modules/mhwdcfg/mhwdcfg.conf
index a6e2510c3..48d905d9c 100644
--- a/src/modules/mhwdcfg/mhwdcfg.conf
+++ b/src/modules/mhwdcfg/mhwdcfg.conf
@@ -1,4 +1,7 @@
 ---
+bus:
+    - pci
+
 identifier:
     net:
       - 200
@@ -8,10 +11,6 @@ identifier:
       - 302
       - 380
 
-bus:
-    - pci
-#    - usb
-
 driver: free
 
 local: true

From cc4ab32350ff57174e832c67c0f9b69ae3b118ba Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Tue, 13 Sep 2016 08:08:57 +0200
Subject: [PATCH 4/4] [mhwdcfg] clean up imports; use target_env_call()

---
 src/modules/mhwdcfg/main.py      | 6 +++---
 src/modules/mhwdcfg/mhwdcfg.conf | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py
index a3ae98d96..4b560ba8d 100644
--- a/src/modules/mhwdcfg/main.py
+++ b/src/modules/mhwdcfg/main.py
@@ -20,9 +20,9 @@
 
 import libcalamares
 
-from libcalamares.utils import check_target_env_call, target_env_call, debug
+from libcalamares.utils import target_env_call, debug
 from os.path import join
-from subprocess import check_call, call
+from subprocess import call
 
 class MhwdController:
 	def __init__(self):
@@ -74,7 +74,7 @@ class MhwdController:
 			cmd.extend(["--pmconfig", self.repo])
 
 		self.mount("etc/resolv.conf")
-		check_target_env_call(cmd)
+		target_env_call(cmd)
 
 		if self.local:
 			self.umount("opt")
diff --git a/src/modules/mhwdcfg/mhwdcfg.conf b/src/modules/mhwdcfg/mhwdcfg.conf
index 48d905d9c..18db7fbea 100644
--- a/src/modules/mhwdcfg/mhwdcfg.conf
+++ b/src/modules/mhwdcfg/mhwdcfg.conf
@@ -1,6 +1,7 @@
 ---
 bus:
     - pci
+#    - usb
 
 identifier:
     net: