iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
formatting and dns changes
[automated-distro-installer]
/
fai
/
config
/
scripts
/
GRUB_PC
/
11-iank
diff --git
a/fai/config/scripts/GRUB_PC/11-iank
b/fai/config/scripts/GRUB_PC/11-iank
index 949f1817627b1450732694ee90b23193335cb909..12d5182342a74d326a8cb7a50211da149304bd3f 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/11-iank
+++ b/
fai/config/scripts/GRUB_PC/11-iank
@@
-41,7
+41,7
@@
if [[ ! -e $dst && -e $src ]]; then
fi
$FAI/distro-install-common/end
fi
$FAI/distro-install-common/end
-if ifclass VOL_ST
ABLE
_BOOTSTRAP; then
+if ifclass VOL_ST
RETCH
_BOOTSTRAP; then
fcopy -ri /etc/systemd/system
chroot $FAI_ROOT bash <<'EOFOUTER'
systemctl enable fai_check.service
fcopy -ri /etc/systemd/system
chroot $FAI_ROOT bash <<'EOFOUTER'
systemctl enable fai_check.service
@@
-61,6
+61,7
@@
$ROOTCMD apt-get update
chroot $FAI_ROOT bash <<'EOF'
chroot $FAI_ROOT bash <<'EOF'
+#### begin .ssh setup ###
set -eE -o pipefail
mkdir -p /home/iank/.ssh
f=/root/.ssh/authorized_keys
set -eE -o pipefail
mkdir -p /home/iank/.ssh
f=/root/.ssh/authorized_keys
@@
-70,10
+71,16
@@
fi
chown -R 1000:1000 /home/iank/.ssh
chmod -R u=Xrw,og= /home/iank/.ssh
rm -rf /root/.ssh
chown -R 1000:1000 /home/iank/.ssh
chmod -R u=Xrw,og= /home/iank/.ssh
rm -rf /root/.ssh
+# remove broken symlinks or the following cp will fail
+find /home/iank/.ssh -xtype l -exec rm '{}' \;
cp -rL /home/iank/.ssh /root
chown -R root:root /root/.ssh
chmod 700 /root/.ssh
cp -rL /home/iank/.ssh /root
chown -R root:root /root/.ssh
chmod 700 /root/.ssh
+#### end .ssh setup ###
+# this is needed to enable resolvconf, making /etc/resolv.conf be a symlink.
+# why? i dun know, it\'s really dumb.
+dpkg-reconfigure -fnoninteractive resolvconf
# default jessie groups + kvm, systemd-journal, adm
usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
# default jessie groups + kvm, systemd-journal, adm
usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank