Commit 24defa3c authored by udeved's avatar udeved
Browse files

mhwd-live*: adopt new driver=free/nonfree param

parent 681f6117
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
[[ -r @libdir@/util-live.sh ]] && source @libdir@/util-live.sh [[ -r @libdir@/util-live.sh ]] && source @libdir@/util-live.sh
USENONFREE="$(kernel_cmdline nonfree no)" DRIVER="$(kernel_cmdline driver nonfree)"
MODULES_DIR='/etc/calamares/modules' MODULES_DIR='/etc/calamares/modules'
echo "Setting MHWD nonfree driver: ${USENONFREE} ..." >> /var/log/mhwd-live.log echo "Setting MHWD nonfree driver: ${DRIVER} ..." >> /var/log/mhwd-live.log
if [[ "${USENONFREE}" == "yes" ]] || [[ "${USENONFREE}" == "true" ]]; then if [[ "${DRIVER}" == "nonfree" ]]; then
sed -e "s|^.*driver:.*|driver: nonfree|" -i "${MODULES_DIR}/mhwdcfg.conf" sed -e "s|^.*driver:.*|driver: nonfree|" -i "${MODULES_DIR}/mhwdcfg.conf"
else else
sed -e "s|^.*driver:.*|driver: free|" -i "${MODULES_DIR}/mhwdcfg.conf" sed -e "s|^.*driver:.*|driver: free|" -i "${MODULES_DIR}/mhwdcfg.conf"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
[[ -r @libdir@/util-live.sh ]] && source @libdir@/util-live.sh [[ -r @libdir@/util-live.sh ]] && source @libdir@/util-live.sh
USENONFREE="$(kernel_cmdline nonfree no)" DRIVER="$(kernel_cmdline driver nonfree)"
VIDEO="$(kernel_cmdline xdriver no)" VIDEO="$(kernel_cmdline xdriver no)"
REPO_PATH='/opt' REPO_PATH='/opt'
...@@ -39,7 +39,7 @@ done ...@@ -39,7 +39,7 @@ done
if [[ -e "${PAC_CONF}" ]]; then if [[ -e "${PAC_CONF}" ]]; then
MODULES_DIR='/etc/calamares/modules' MODULES_DIR='/etc/calamares/modules'
echo "Running MHWD..." >> /var/log/mhwd-live.log echo "Running MHWD..." >> /var/log/mhwd-live.log
if [[ "${USENONFREE}" == "yes" ]] || [[ "${USENONFREE}" == "true" ]]; then if [[ "${DRIVER}" == "nonfree" ]]; then
sed -e "s|^.*driver:.*|driver: nonfree|" -i "${MODULES_DIR}/mhwdcfg.conf" sed -e "s|^.*driver:.*|driver: nonfree|" -i "${MODULES_DIR}/mhwdcfg.conf"
if [[ "${VIDEO}" == "vesa" ]]; then if [[ "${VIDEO}" == "vesa" ]]; then
mhwd --install pci video-vesa --pmconfig "${PAC_CONF}" >> /var/log/mhwd-live.log mhwd --install pci video-vesa --pmconfig "${PAC_CONF}" >> /var/log/mhwd-live.log
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment