22.06.1.9-12-t2

t2linux · Jul 1, 2022 · 4f2c6d9 · 4f2c6d9
1 parent d57ae29
commit 4f2c6d9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/calamares/scripts/chrooted_cleaner_script.sh b/calamares/scripts/chrooted_cleaner_script.sh
@@ -440,6 +440,12 @@ _misc_cleanups() {
     fi
 }
 
+_copy_mba91_soundconfig() {
+    cp /opt/extra-drivers/AppleT2.conf /usr/share/alsa/cards/AppleT2.conf
+    cp /opt/extra-drivers/apple-t2.conf /usr/share/alsa-card-profile/mixer/profile-sets/apple-t2.conf
+    cp /opt/extra-drivers/91-pulseaudio-custom.rules /usr/lib/udev/rules.d/91-pulseaudio-custom.rules
+}
+
 _clean_up(){
     local xx
 
@@ -625,6 +631,22 @@ EOF
     else
         _c_c_s_msg warning "GRUB config file not found"
     fi
+    # install audio configs
+    model=$(< /sys/devices/virtual/dmi/id/product_name)
+    if [ "$model" = "MacBookPro16,1" ] ; then
+	_c_c_s_msg info "installing audio configs for MacBookPro16,1"
+	pacman -U /opt/extra-drivers/apple-t2-audio-config-alt-0.1-5-any.pkg.tar.zst --noconfirm
+    elif [ "$model" = "MacBookPro16,4" ] ; then
+	_c_c_s_msg info "installing audio configs for MacBookPro16,4"
+	pacman -U /opt/extra-drivers/apple-t2-audio-config-alt-0.1-5-any.pkg.tar.zst --noconfirm
+    elif [ "$model" = "MacBookAir9,1" ] ; then
+	_c_c_s_msg info "installing audio configs for MacBookAir9,1"
+	_copy_mba91_soundconfig
+    else
+	_c_c_s_msg info "installing generic audio configs"
+	pacman -U /opt/extra-drivers/apple-t2-audio-config-0.1-5-any.pkg.tar.zst --noconfirm
+    fi
+
     _check_install_mode
     _endeavouros
     _virtual_machines

diff --git a/calamares/scripts/cleaner_script.sh b/calamares/scripts/cleaner_script.sh
@@ -102,11 +102,7 @@ _copy_files(){
         mkdir -p $target/opt/extra-drivers || _cleaner_msg warning "creating folder /opt/extra-drivers on target failed."
         cp /opt/extra-drivers/*.zst $target/opt/extra-drivers/ || _cleaner_msg warning "copying drivers to /opt/extra-drivers on target failed."
     fi
-    if [ -n "$(lsmod | grep r8168)" ] ; then
-        _cleaner_msg info "detected usage of r8168 driver"
-        touch $target/tmp/r8168_in_use
-    fi
-
+    cp -r /opt/extra-drivers/mba91 $target/opt/extra-drivers/ || _cleaner_msg warning "copying mba91 to /opt/extra-drivers on target failed."
 
     # copy endeavouros-release file
     local file=/usr/lib/endeavouros-release