iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9943957
)
rename ian to iank
author
Ian Kelling
<iank@fsf.org>
Wed, 9 Aug 2017 00:10:02 +0000
(17:10 -0700)
committer
Ian Kelling
<iank@fsf.org>
Wed, 9 Aug 2017 00:10:02 +0000
(17:10 -0700)
arch-init-chroot
patch
|
blob
|
history
fai/config/distro-install-common/end
patch
|
blob
|
history
fai/config/hooks/partition.DEFAULT
patch
|
blob
|
history
fai/config/scripts/GRUB_PC/11-ian
patch
|
blob
|
history
diff --git
a/arch-init-chroot
b/arch-init-chroot
index 7eaa5a20fd714155c3d2361baee6f0968c41c4aa..e1738632e39c27612c3386160be064bacff1cd0a 100755
(executable)
--- 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
/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/ian
k
/.ssh
+cp -r /root/.ssh /home/ian
k
+chown -R ian
k:iank /home/iank
/.ssh
# the groups recommended by
# https://wiki.archlinux.org/index.php/Users_and_groups#Group_list
# 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 ian
k
pacman -S --noconfirm net-tools # for route
pacman -S --noconfirm net-tools # for route
diff --git
a/fai/config/distro-install-common/end
b/fai/config/distro-install-common/end
index f230d3c4e662df3f88dd6390e1c6a2db46a78b0f..cb953a4e8073a562e864dd12a075f1aef7e54215 100755
(executable)
--- 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.
chpw root "$ROOTPW"
# 9 = user already exists. so we are idempotent.
-au ian
-chpw ian "$ROOTPW"
+au ian
k
+chpw ian
k
"$ROOTPW"
au traci
if ifclass frodo; then
chpw traci "$TPW"
fi
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 ian
k
's groups to traci, I see none she should join on arch
+$ROOTCMD usermod -a -G traci ian
k
$ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
$ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
-$ROOTCMD usermod -a -G docker ian
+$ROOTCMD usermod -a -G docker ian
k
# based on unison error, with 8192 from
# sysctl -a | grep fs.inotify.max_user_watches
# 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
$ROOTCMD sysctl --system
f=$target/etc/sudoers
-line='ian ALL=(ALL) NOPASSWD: ALL'
+line='ian
k
ALL=(ALL) NOPASSWD: ALL'
if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
echo "$line" >> $f
fi
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 1db0197f46a7cae93709e4985a19790fa99cd74e..94f6c25216926038270df6b910a0ee21bd4a685c 100755
(executable)
--- 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
if ifclass tp; then
lukspw=$(cat $luks_dir/traci)
else
- lukspw=$(cat $luks_dir/ian)
+ lukspw=$(cat $luks_dir/ian
k
)
fi
if ifclass demohost; then
lukspw=x
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 8df5b13147a5412e00ce03b7d19c35da2883e1f7..72dc7ec64d57f42ee0879e92f905a66c84c3fdaa 100755
(executable)
--- 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
chroot $FAI_ROOT bash <<'EOF'
set -eE -o pipefail
-mkdir -p /home/ian/.ssh
+mkdir -p /home/ian
k
/.ssh
f=/root/.ssh/authorized_keys
if [[ -e $f ]]; then
f=/root/.ssh/authorized_keys
if [[ -e $f ]]; then
- cp $f /home/ian/.ssh
+ cp $f /home/ian
k
/.ssh
fi
fi
-chown -R 1000:1000 /home/ian/.ssh
-chmod -R u=Xrw,og= /home/ian/.ssh
+chown -R 1000:1000 /home/ian
k
/.ssh
+chmod -R u=Xrw,og= /home/ian
k
/.ssh
rm -rf /root/.ssh
rm -rf /root/.ssh
-cp -rL /home/ian/.ssh /root
+cp -rL /home/ian
k
/.ssh /root
chown -R root:root /root/.ssh
chmod 700 /root/.ssh
# default jessie groups + kvm, systemd-journal, adm
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 ian
k
if getent group systemd-journal >/dev/null; then
if getent group systemd-journal >/dev/null; then
- usermod -aG systemd-journal ian
+ usermod -aG systemd-journal ian
k
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
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
EOF
-# reading through the groups that ian is in but traci isn't,
+# reading through the groups that ian
k
is in but traci isn't,
for g in plugdev audio video cdrom; do
$ROOTCMD usermod -a -G $g traci
done
for g in plugdev audio video cdrom; do
$ROOTCMD usermod -a -G $g traci
done