X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=88a8b0efb7a302605a8d9f50974124971fdc55f9;hb=563cc41a1f3ddb95bedf595cc249f53aea6629c1;hp=ac86b2d1f67a4fc30c5d5b8c09a6c8af94993ed1;hpb=103a2e153f844343c359882079936b2521c82f15;p=distro-setup diff --git a/distro-begin b/distro-begin index ac86b2d..88a8b0e 100755 --- a/distro-begin +++ b/distro-begin @@ -100,7 +100,7 @@ source $script_dir/pkgs set +x source /a/bin/distro-functions/src/identify-distros $interactive || set -x -for f in kd x2 x3 frodo tp li bk je demohost kw sy bo; do +for f in kd x2 x3 x8 frodo tp li bk je demohost kw sy bo; do eval "$f() { [[ $HOSTNAME == $f ]]; }" done codename=$(debian-codename) @@ -637,6 +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 EOF if ! mountpoint /d &>/dev/null; then sudo mkdir -p /d @@ -645,6 +646,17 @@ EOF fi fi ;; + frodo) + tu /etc/fstab <<'EOF' +/dev/mapper/crypt_dev_ata-ata-Hitachi_HDS722020ALA330_JK1121YAG7SXWS-part1 /i btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvol=i 0 0 +EOF + if ! mountpoint /i &>/dev/null; then + sudo mkdir -p /i + if [[ -d /mnt/i/i ]]; then + sudo mount /i + fi + fi + ;; esac if bitfolk; then @@ -705,20 +717,17 @@ if has_monitor; then dir=/etc/X11/xinit/xinitrc.d/ sudo mkdir -p $dir sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir - s teeu /etc/systemd/logind.conf <<'EOF' -HandleLidSwitch= -EOF - # this works on - dir=/etc/gdm3 - sudo mkdir -p $dir/PostLogin - sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default + ## disabled since i'm not using gdm atm + # dir=/etc/gdm3 + # sudo mkdir -p $dir/PostLogin + # sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default sudo mkdir -p /etc/lightdm/lightdm.conf.d # etiona lightdm.log: # [SeatDefaults] is now called [Seat:*], please update this configuration sudo dd of=/etc/lightdm/lightdm.conf.d/12-iank.conf <<'EOF' [Seat:*] -display-setup-script=/a/bin/ds/lightdm-start +# display-setup-script=/a/bin/ds/lightdm-start session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh EOF