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
misc new stuff
[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 eb315ce83b872345b01a1160452302414835f712..954afd4a3c1fa7c1622e05eff2092d496930f56f 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/11-iank
+++ b/
fai/config/scripts/GRUB_PC/11-iank
@@
-24,10
+24,15
@@
fi
# -r = recursive
# -i = ignore non-matching class warnings, always exit 0
# -B = no backup files
# -r = recursive
# -i = ignore non-matching class warnings, always exit 0
# -B = no backup files
-fcopy -riB /boot
+fcopy -riB
M
/boot
# this is also done by FABASE/10-misc by default (without B)
# this is also done by FABASE/10-misc by default (without B)
-fcopy -riB /root
-fcopy -riB /usr/local/bin
+fcopy -riBM /root
+fcopy -riBM /usr/local/bin
+
+# this gets done by fai, but just happens too often that
+# I add sources due to new distros, whatever.
+fcopy -riBM /etc/apt/preferences.d
+fcopy -riBM /etc/apt/sources.list.d
src=$FAI/distro-install-common/shadow
src=$FAI/distro-install-common/shadow
@@
-49,6
+54,10
@@
tmpfile1=$(mktemp)
# this can fail if we need an apt update
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||:
fcopy -riBM /etc/apt
# this can fail if we need an apt update
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||:
fcopy -riBM /etc/apt
+
+# get ubuntu key, for running from fai wrapper.
+apt-key add $FAI/package_config/UBUNTU.asc
+
tmpfile2=$(mktemp)
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2
if ! diff -q $tmpfile1 $tmpfile2; then
tmpfile2=$(mktemp)
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2
if ! diff -q $tmpfile1 $tmpfile2; then
@@
-215,7
+224,7
@@
EOF
fi
# use networkmanager if this host has wireless.
fi
# use networkmanager if this host has wireless.
-if type -p iw &>/dev/null && [[ $(iw dev) ]]; then
+if
[[ $HOSTNAME == bo ]] ||
type -p iw &>/dev/null && [[ $(iw dev) ]]; then
chroot $FAI_ROOT bash <<EOF
apt-get -y install network-manager
EOF
chroot $FAI_ROOT bash <<EOF
apt-get -y install network-manager
EOF