root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso-image] add support to disable VB-drv

Browse source
This commit is contained in:
Philip 2017-06-22 22:22:29 +02:00
parent 1e3795f8c3
commit 965de2f5fc
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/util-iso-image.sh
View file

@ -45,11 +45,11 @@ set_xdm(){
configure_mhwd_drivers(){ configure_mhwd_drivers(){
local path=$1${mhwd_repo}/ \ local path=$1${mhwd_repo}/ \
drv_path=$1/var/lib/mhwd/db/pci/graphic_drivers drv_path=$1/var/lib/mhwd/db/pci/graphic_drivers
info "Configuring mwwd db ..." info "Configuring mhwd db ..."
if [ -z "$(ls $path | grep catalyst-utils 2> /dev/null)" ]; then if [ -z "$(ls $path | grep catalyst-utils 2> /dev/null)" ]; then
msg2 "Disabling Catalyst driver" msg2 "Disabling Catalyst driver"
mkdir -p $drv_path/catalyst/ mkdir -p $drv_path/catalyst/
touch $drv_path/catalyst/MHWDCONFIG echo "" > $drv_path/catalyst/MHWDCONFIG
fi fi
if [ -z "$(ls $path | grep nvidia-utils 2> /dev/null)" ]; then if [ -z "$(ls $path | grep nvidia-utils 2> /dev/null)" ]; then
msg2 "Disabling Nvidia driver" msg2 "Disabling Nvidia driver"
@ -57,22 +57,27 @@ configure_mhwd_drivers(){
touch $drv_path/nvidia/MHWDCONFIG touch $drv_path/nvidia/MHWDCONFIG
msg2 "Disabling Nvidia Bumblebee driver" msg2 "Disabling Nvidia Bumblebee driver"
mkdir -p $drv_path/hybrid-intel-nvidia-bumblebee/ mkdir -p $drv_path/hybrid-intel-nvidia-bumblebee/
touch $drv_path/hybrid-intel-nvidia-bumblebee/MHWDCONFIG echo "" > $drv_path/hybrid-intel-nvidia-bumblebee/MHWDCONFIG
fi fi
if [ -z "$(ls $path | grep nvidia-304xx-utils 2> /dev/null)" ]; then if [ -z "$(ls $path | grep nvidia-304xx-utils 2> /dev/null)" ]; then
msg2 "Disabling Nvidia 304xx driver" msg2 "Disabling Nvidia 304xx driver"
mkdir -p $drv_path/nvidia-304xx/ mkdir -p $drv_path/nvidia-304xx/
touch $drv_path/nvidia-304xx/MHWDCONFIG echo "" > $drv_path/nvidia-304xx/MHWDCONFIG
fi fi
if [ -z "$(ls $path | grep nvidia-340xx-utils 2> /dev/null)" ]; then if [ -z "$(ls $path | grep nvidia-340xx-utils 2> /dev/null)" ]; then
msg2 "Disabling Nvidia 340xx driver" msg2 "Disabling Nvidia 340xx driver"
mkdir -p $drv_path/nvidia-340xx/ mkdir -p $drv_path/nvidia-340xx/
touch $drv_path/nvidia-340xx/MHWDCONFIG echo "" > $drv_path/nvidia-340xx/MHWDCONFIG
fi fi
if [ -z "$(ls $path | grep xf86-video-amdgpu 2> /dev/null)" ]; then if [ -z "$(ls $path | grep xf86-video-amdgpu 2> /dev/null)" ]; then
msg2 "Disabling AMD gpu driver" msg2 "Disabling AMD gpu driver"
mkdir -p $drv_path/xf86-video-amdgpu/ mkdir -p $drv_path/xf86-video-amdgpu/
touch $drv_path/xf86-video-amdgpu/MHWDCONFIG echo "" > $drv_path/xf86-video-amdgpu/MHWDCONFIG
fi
if [ -z "$(ls $path | grep virtualbox-guest-modules 2> /dev/null)" ]; then
msg2 "Disabling VirtualBox guest driver"
mkdir -p $drv_path/virtualbox/
echo "" > $drv_path/virtualbox/MHWDCONFIG
fi fi
} }
@ -270,9 +275,16 @@ clean_up_image(){
local path local path
if [[ ${1##*/} == 'mhwdfs' ]];then if [[ ${1##*/} == 'mhwdfs' ]];then
path=$1/var path=$1/var
if [[ -d $path/lib/mhwd ]];then
mv $path/lib/mhwd $1 &> /dev/null
fi
if [[ -d $path ]];then if [[ -d $path ]];then
find "$path" -mindepth 0 -delete &> /dev/null find "$path" -mindepth 0 -delete &> /dev/null
fi fi
if [[ -d $1/mhwd ]];then
mkdir -p $path/lib
mv $1/mhwd $path/lib &> /dev/null
fi
path=$1/etc path=$1/etc
if [[ -d $path ]];then if [[ -d $path ]];then
find "$path" -mindepth 0 -delete &> /dev/null find "$path" -mindepth 0 -delete &> /dev/null