X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=84ba7c4ac3c3f6ee68027842e254dbc2766c5cc0;hb=6f02137f46c6e692a4775e4600f102cf942138fa;hp=88a8b0efb7a302605a8d9f50974124971fdc55f9;hpb=563cc41a1f3ddb95bedf595cc249f53aea6629c1;p=distro-setup

diff --git a/distro-begin b/distro-begin
index 88a8b0e..84ba7c4 100755
--- a/distro-begin
+++ b/distro-begin
@@ -493,7 +493,7 @@ case $(debian-codename-compat) in
     file=/etc/modprobe.d/evbug.conf
     line="blacklist evbug"
     if [[ $(cat $file) != "$line" ]]; then
-      sudo dd of=$file 2>/dev/null <<<"$line"
+      sudo dd of=$file status=none <<<"$line"
       sudo depmod -a
       sudo update-initramfs -u
     fi
@@ -623,7 +623,7 @@ if has_btrfs; then
 
     first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
     tu /etc/fstab <<EOF
-$first_root_crypt  /nocow  btrfs  noatime,subvol=nocow$( ((`nproc` > 2)) && echo ,compress=zstd )  0 0
+$first_root_crypt  /nocow  btrfs  noatime,subvol=nocow$( (( $(nproc) > 2)) && echo ,compress=zstd )  0 0
 EOF
     sudo mkdir -p $dir
     sudo chown $USER:$USER $dir
@@ -637,7 +637,7 @@ case $HOSTNAME in
   kd)
     tu /etc/fstab <<'EOF'
 /dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7  /d  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvol=d  0 0
-/i /d/m none  bind,compress=zstd  0 0
+/d/m /i  none  bind,compress=zstd  0 0
 EOF
     if ! mountpoint /d &>/dev/null; then
       sudo mkdir -p /d
@@ -645,6 +645,10 @@ EOF
         sudo mount /d
       fi
     fi
+    if ! mountpoint /i &>/dev/null; then
+      sudo mkdir -p /i
+      sudo mount /i
+    fi
     ;;
   frodo)
     tu /etc/fstab <<'EOF'