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
small fixes
[automated-distro-installer]
/
fai
/
config
/
scripts
/
GRUB_PC
/
11-ian
diff --git
a/fai/config/scripts/GRUB_PC/11-ian
b/fai/config/scripts/GRUB_PC/11-ian
index 8cd841f875cfc76af9e1393d19aa63cd610f29f9..72dc7ec64d57f42ee0879e92f905a66c84c3fdaa 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/11-ian
+++ b/
fai/config/scripts/GRUB_PC/11-ian
@@
-40,17
+40,16
@@
if [[ ! -e $dst && -e $src ]]; then
mount -o bind $src $dst
fi
mount -o bind $src $dst
fi
+$FAI/distro-install-common/end
if ifclass VOL_STABLE_BOOTSTRAP; then
fcopy -ri /etc/systemd/system
chroot $FAI_ROOT bash <<'EOFOUTER'
systemctl enable fai_check.service
EOFOUTER
if ifclass VOL_STABLE_BOOTSTRAP; then
fcopy -ri /etc/systemd/system
chroot $FAI_ROOT bash <<'EOFOUTER'
systemctl enable fai_check.service
EOFOUTER
- exit 0
+ exit 0
# avoid unnecessary stuff in bootstrap vol
fi
fi
-$FAI/distro-install-common/end
-
# these get copied in an earlier stage by fai, but leaving it here since
# I run this as a single post-fai script to update things that have changed.
fcopy -riB /etc/apt
# these get copied in an earlier stage by fai, but leaving it here since
# I run this as a single post-fai script to update things that have changed.
fcopy -riB /etc/apt
@@
-63,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
@@
-95,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