From 81fdd7a90cc0dfdc2bc2744d41a346c0d255a6af Mon Sep 17 00:00:00 2001 From: Gordon GECOS Date: Wed, 22 Nov 2023 15:07:29 -0500 Subject: cruft --- Makefile | 2 -- user.mk | 32 -------------------------------- 2 files changed, 34 deletions(-) delete mode 100644 user.mk diff --git a/Makefile b/Makefile index 9f7a5f5..ce0e826 100644 --- a/Makefile +++ b/Makefile @@ -99,8 +99,6 @@ else install -p -m0644 -DT conf/torrc ${instdir}/etc/tor/torrc endif -include user.mk - .PHONY: submodules build-submodules $(SUBMODULES) $(SUBMODULES): stack @a=$$(cd $@ && (exec 3>&1; exec >&2; if test -z "$$(git ls-files)"; then git reset; fi; git status -uno -s >&3)) && (if test -z "$$a"; then set -x; git submodule update --init --recursive $@/; fi) diff --git a/user.mk b/user.mk deleted file mode 100644 index 4292fe8..0000000 --- a/user.mk +++ /dev/null @@ -1,32 +0,0 @@ -user_username = u -user_home_path := $(shell getent passwd "$(user_username)" | (IFS=: read _ _ _ _ _ homedir _; echo $$homedir)) -user_home_btrfs = $(user_home_path).btrfs -user_home_bytes = 10GiB -user_home_force_replace = - -user_exists = getent passwd "$(user_username)" >/dev/null - -is_btrfs = df ~$(user_username) -t btrfs >/dev/null - -user-account: - [ "$(user_username)" ] - $(user_exists) || sudo useradd "$(user_username)" -G sudo -m -p '' -s /bin/bash - $(is_btrfs) || $(MAKE) mount-user-btrfs-home >/dev/null 2>&1 || $(MAKE) user-btrfs-home - -remove_user_home_btrfs = sudo mv -b "$(user_home_btrfs)" "$(user_home_btrfs)"~"$$(date -Is)" - -user-btrfs-home: - [ "$(user_home_path)" ] - [ ! -e "$(user_home_btrfs)" ] || $(if $(user_home_force_replace),$(remove_user_home_btrfs),false) - [ ! -e "$(user_home_btrfs)" ] - ! mountpoint -q "$(user_home_path)" || sudo umount "$(user_home_path)" - [ ! -e "$(user_home_path)" ] || sudo rmdir "$(user_home_path)" || sudo mv -b "$(user_home_path)" "$(user_home_path)"~"$$(date -Is)" - [ -e "$(user_home_btrfs)" ] || sudo fallocate -l "$(user_home_bytes)" "$(user_home_btrfs)" - sudo mkdir "$(user_home_path)" - sudo mkfs.btrfs "$(user_home_btrfs)" - sudo mount -t btrfs "$(user_home_btrfs)" "$(user_home_path)" - sudo rsync -a /etc/skel/ "$(user_home_path)"/ - sudo chown -R "$(user_username):" "$(user_home_path)" - -mount-user-btrfs-home: - mountpoint -q "$(user_home_path)" || sudo mount -t btrfs "$(user_home_btrfs)" "$(user_home_path)" -- cgit v1.2.3