From 645ab36988f8eed2e85d066bdf1ad8a12e7aabc0 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Tue, 8 Aug 2017 17:10:02 -0700
Subject: [PATCH] rename ian to iank

---
 arch-init-chroot                     |  8 ++++----
 fai/config/distro-install-common/end | 12 ++++++------
 fai/config/hooks/partition.DEFAULT   |  2 +-
 fai/config/scripts/GRUB_PC/11-ian    | 16 ++++++++--------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/arch-init-chroot b/arch-init-chroot
index 7eaa5a2..e173863 100755
--- a/arch-init-chroot
+++ b/arch-init-chroot
@@ -124,12 +124,12 @@ pacman -S --noconfirm sudo
 /a/bin/fai/fai/config/distro-install-common/end
 systemctl enable sshd
 
-rm -rf /home/ian/.ssh
-cp -r /root/.ssh /home/ian
-chown -R ian:ian /home/ian/.ssh
+rm -rf /home/iank/.ssh
+cp -r /root/.ssh /home/iank
+chown -R iank:iank /home/iank/.ssh
 # the groups recommended by
 # https://wiki.archlinux.org/index.php/Users_and_groups#Group_list
-usermod -aG games,rfkill,users,uucp,wheel ian
+usermod -aG games,rfkill,users,uucp,wheel iank
 
 
 pacman -S --noconfirm net-tools # for route
diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index f230d3c..cb953a4 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -51,18 +51,18 @@ au() { # add user
 
 chpw root "$ROOTPW"
 # 9 = user already exists. so we are idempotent.
-au ian
-chpw ian "$ROOTPW"
+au iank
+chpw iank "$ROOTPW"
 
 au traci
 if ifclass frodo; then
     chpw traci "$TPW"
 fi
-# comparing ian's groups to traci, I see none she should join on arch
-$ROOTCMD usermod -a -G traci ian
+# comparing iank's groups to traci, I see none she should join on arch
+$ROOTCMD usermod -a -G traci iank
 
 $ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
-$ROOTCMD usermod -a -G docker ian
+$ROOTCMD usermod -a -G docker iank
 
 # based on unison error, with 8192 from
 # sysctl -a | grep fs.inotify.max_user_watches
@@ -76,7 +76,7 @@ echo "fs.inotify.max_user_watches = 1000000" >> $f
 $ROOTCMD sysctl --system
 
 f=$target/etc/sudoers
-line='ian  ALL=(ALL)  NOPASSWD: ALL'
+line='iank  ALL=(ALL)  NOPASSWD: ALL'
 if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
     echo "$line" >> $f
 fi
diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 1db0197..94f6c25 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -235,7 +235,7 @@ fi
 if ifclass tp; then
     lukspw=$(cat $luks_dir/traci)
 else
-    lukspw=$(cat $luks_dir/ian)
+    lukspw=$(cat $luks_dir/iank)
 fi
 if ifclass demohost; then
     lukspw=x
diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 8df5b13..72dc7ec 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -62,24 +62,24 @@ $ROOTCMD apt-get update
 
 chroot $FAI_ROOT bash <<'EOF'
 set -eE -o pipefail
-mkdir -p /home/ian/.ssh
+mkdir -p /home/iank/.ssh
 f=/root/.ssh/authorized_keys
 if [[ -e $f ]]; then
-   cp $f /home/ian/.ssh
+   cp $f /home/iank/.ssh
 fi
-chown -R 1000:1000 /home/ian/.ssh
-chmod -R u=Xrw,og= /home/ian/.ssh
+chown -R 1000:1000 /home/iank/.ssh
+chmod -R u=Xrw,og= /home/iank/.ssh
 rm -rf /root/.ssh
-cp -rL /home/ian/.ssh /root
+cp -rL /home/iank/.ssh /root
 chown -R root:root /root/.ssh
 chmod 700 /root/.ssh
 
 
 # default jessie groups + kvm, systemd-journal, adm
-usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev ian
+usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
 
 if getent group systemd-journal >/dev/null; then
-  usermod -aG systemd-journal ian
+  usermod -aG systemd-journal iank
 fi
 # https://askubuntu.com/questions/33416/how-do-i-disable-the-boot-splash-screen-and-only-show-kernel-and-boot-text-inst
 # it suggests not having plymouth-theme-ubuntu-text, but
@@ -94,7 +94,7 @@ update-grub2
 EOF
 
 
-# reading through the groups that ian is in but traci isn't,
+# reading through the groups that iank is in but traci isn't,
 for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci
 done
-- 
2.30.2