iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lots: shellcheck, streaming stuff, fixes
[distro-setup]
/
distro-begin
diff --git
a/distro-begin
b/distro-begin
index 9780ed65226a08ab3b12861b154aaa4f9fc94469..61d8f8d002b56d3924c8547dade334ce76b99f59 100755
(executable)
--- a/
distro-begin
+++ b/
distro-begin
@@
-13,10
+13,17
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-# for setting up a new machine
+#
###
for setting up a new machine
# usage: $0 [-r] [HOSTNAME]
# HOSTNAME changes the machine's hostname
# usage: $0 [-r] [HOSTNAME]
# HOSTNAME changes the machine's hostname
+# Update target_down alerts in
+# /a/bin/ds/filesystem/etc/prometheus/rules/iank.yml
+#
+# Update hostnames in /b/ds/check-remote-mailqs
+
+### end new machine setup
+
# tips:
# run any sudo command first so your pass is cached
# set the scrollback to unlimited in case something goes wrong
# tips:
# run any sudo command first so your pass is cached
# set the scrollback to unlimited in case something goes wrong
@@
-52,7
+59,7
@@
interactive=true # set this to false to force set -x
if ! $interactive; then
set -x
fi
if ! $interactive; then
set -x
fi
-source /a/bin/
errhandle/er
r
+source /a/bin/
bash-bear-trap/bash-bea
r
mkdir -p ~/.local
err-cleanup() {
mkdir -p ~/.local
err-cleanup() {
@@
-474,6
+481,7
@@
if isarch; then
fi
#### update all packages
fi
#### update all packages
+# shellcheck disable=SC2119 # obvious
pup
pup
@@
-493,7
+501,7
@@
case $(debian-codename-compat) in
file=/etc/modprobe.d/evbug.conf
line="blacklist evbug"
if [[ $(cat $file) != "$line" ]]; then
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
sudo depmod -a
sudo update-initramfs -u
fi
@@
-623,7
+631,7
@@
if has_btrfs; then
first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
tu /etc/fstab <<EOF
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
EOF
sudo mkdir -p $dir
sudo chown $USER:$USER $dir
@@
-637,6
+645,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
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
+/d/m /i none bind,compress=zstd 0 0
EOF
if ! mountpoint /d &>/dev/null; then
sudo mkdir -p /d
EOF
if ! mountpoint /d &>/dev/null; then
sudo mkdir -p /d
@@
-644,6
+653,10
@@
EOF
sudo mount /d
fi
fi
sudo mount /d
fi
fi
+ if ! mountpoint /i &>/dev/null; then
+ sudo mkdir -p /i
+ sudo mount /i
+ fi
;;
frodo)
tu /etc/fstab <<'EOF'
;;
frodo)
tu /etc/fstab <<'EOF'
@@
-696,8
+709,7
@@
if has_monitor; then
###### install X
###### install X
- # no recommends due to this bug: https://trisquel.info/en/issues/26525
- pi --no-install-recommends i3
+ pi i3
##### install xinput
case $(distro-name) in
##### install xinput
case $(distro-name) in