various improvements and fixes, some flidas related

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 5ae900f8b122d296cc511598e25b9bcddb857f8f..4ea084246b4d59d9aae6c5977a6ef54df3c6c655 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -239,6 +239,8 @@ if isdeb; then
 
 fi
 
+
+###### begin arch aur wrapper ########
 if isarch; then
     #https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages
     sudo pacman -S --noconfirm --needed base-devel jq
@@ -264,18 +266,44 @@ if isarch; then
     sudo systemctl enable pacserve.service
     sudo systemctl start pacserve.service
 
+fi
+###### end arch aur wrapper ########
+
+pup
+
+
+###### begin trash cli install ######
+if isarch; then
     # strange error if just installing trash-cli: "pyalpm requires python",
     # so I see that it requires python2, and installing that manually fixes it.
-    # I didn't see this on earlier installation, main thing which changed was
-    # pacserve, so not sure if it's related.
+    # I didn\'t see this on earlier installation, main thing which changed was
+    # pacserve, so not sure if it\'s related.
     pi python2
 fi
-
-pup
 pi trash-cli
+###### end trash cli install ######
 
 
-###### link files ###########
+######## begin fix evbug bug ######
+case $distro in
+    trisquel|ubuntu)
+        # noticed in flidas.
+        #https://bugs.launchpad.net/ubuntu/+source/module-init-tools/+bug/240553
+        sudo rmmod evbug ||: # might not be loaded yet
+        file=/etc/modprobe.d/blacklist.conf
+        line="blacklist evbug"
+        if ! grep -xFq "$line" $file; then
+            sudo tee -a $file &>/dev/null <<<"$line"
+            sudo depmod -a
+            sudo update-initramfs -u
+        fi
+        ;;
+esac
+######## end fix evbug bug ######
+
+
+
+###### begin link files ###########
 # convenient to just do all file linking in one place
 
 
@@ -303,6 +331,8 @@ if has_p; then
     lnf -T /i/k/mboxes ~/mail
 fi
 
+###### end link files ###########
+
 
 ##### basic needed packages
 
@@ -511,7 +541,7 @@ if encrypted; then
     sudo systemctl enable fstrim.timer
 fi
 
-dirs=(/mnt/{1,2,3,4,5,6,7,8,9})
+dirs=(/mnt/{1,2,3,4,5,6,7,8,9} /nocow/t)
 s mkdir -p "${dirs[@]}"
 s chown $USER:$USER  "${dirs[@]}"