From 70ea52d1d896cc993771e6859138f529efc370ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 23 Feb 2020 13:52:59 +0900
Subject: [PATCH] Remove config files from the repo.

They don't apply to all models and we want to move installation to
a package install only process.

I've added updated instructions for configuring mwifiex here:
https://github.com/linux-surface/linux-surface/wiki/Known-Issues

as well as the sleep script.

The ath10k models need board firmware replacements besides the config.
Those entries were added to the Surface Go/SL3 AMD pages.
---
 .../etc/NetworkManager/conf.d/99-surface.conf |  5 --
 root/etc/modprobe.d/ath10k.conf               |  1 -
 root/lib/systemd/system-sleep/sleep           | 63 -------------------
 setup.sh                                      |  5 --
 4 files changed, 74 deletions(-)
 delete mode 100644 root/etc/NetworkManager/conf.d/99-surface.conf
 delete mode 100644 root/etc/modprobe.d/ath10k.conf
 delete mode 100755 root/lib/systemd/system-sleep/sleep

diff --git a/root/etc/NetworkManager/conf.d/99-surface.conf b/root/etc/NetworkManager/conf.d/99-surface.conf
deleted file mode 100644
index c34a6825c..000000000
--- a/root/etc/NetworkManager/conf.d/99-surface.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[connection]
-wifi.powersave = 2
-
-[device]
-wifi.scan-rand-mac-address=false
diff --git a/root/etc/modprobe.d/ath10k.conf b/root/etc/modprobe.d/ath10k.conf
deleted file mode 100644
index eb2d481ae..000000000
--- a/root/etc/modprobe.d/ath10k.conf
+++ /dev/null
@@ -1 +0,0 @@
-options ath10k_core skip_otp=y 
diff --git a/root/lib/systemd/system-sleep/sleep b/root/lib/systemd/system-sleep/sleep
deleted file mode 100755
index ff10cb224..000000000
--- a/root/lib/systemd/system-sleep/sleep
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-case $1 in
-  pre)    # unload the modules before going to sleep
-
-    # Disable bluetooth if no device is connected
-    if ps cax | grep bluetoothd && ! bluetoothctl info; then
-      bluetoothctl power off
-    fi
-
-    ## Disable bluetooth regardless if devices are connected (see notes below)
-    # if ps cax | grep bluetoothd; then
-    #   bluetoothctl power off
-    # fi
-
-    ## IPTS: see notes below
-    ## > Remove IPTS from ME side
-    # modprobe -r ipts_surface
-    # modprobe -r intel_ipts
-    # modprobe -r mei_hdcp
-    # modprobe -r mei_me
-    # modprobe -r mei
-    ## > Remove IPTS from i915 side
-    # for i in $(find /sys/kernel/debug/dri -name i915_ipts_cleanup); do
-    #   echo 1 > $i
-    # done
-    ;;
-  post)   # re-load modules after resume
-    ## IPTS: see notes below
-    ## > Load IPTS from i915 side
-    # for i in $(find /sys/kernel/debug/dri -name i915_ipts_init); do
-    #   echo 1 > $i
-    # done
-    ## > Load IPTS from ME side
-    # modprobe mei
-    # modprobe mei_me
-    # modprobe mei_hdcp
-    # modprobe intel_ipts
-    # modprobe ipts_surface
-
-    # Restart bluetooth
-    if ps cax | grep bluetoothd; then
-      bluetoothctl power on
-    fi
-    ;;
-esac
-
-# Notes:
-#
-# - For IPTS, see
-#   >  https://github.com/jakeday/linux-surface/issues/544#issuecomment-519126757
-#   for an explanation/discussion. We do not unload/reload modules for now as
-#   the IPTS drivers should be able to resume/suspend without this. If you
-#   experience any issues on suspend/resume, please file an appropriate issue or
-#   join the discussion linked above so that we can fix it. As a temporary
-#   workaround, you may want to uncomment the IPTS-related lines above.
-#
-# - For bluetooth: If you have spontaneous wakeups, you may want to disable
-#   bluetooth completely, regardless if any devices are connected or not, by
-#   removing the `! bluetoothctl info;` part as indicated in the comment (e.g.
-#   comment-out the original check and comment-in the one below). Note that you
-#   may be required to re-connect your devices after resume if you choose this
-#   change.
diff --git a/setup.sh b/setup.sh
index 65c29d6a4..10baa8fc6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -37,11 +37,6 @@ ask() {
     done
 }
 
-echo "==> Copying the config files under root to where they belong..."
-for dir in $(ls root/); do
-    sudo cp -Rbv "root/$dir/"* "/$dir/"
-done
-
 echo
 
 echo "Setting your clock to local time can fix issues with Windows dualboot."