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
mostly fixes, one new partition option
[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 fc51d591cde799eaab50565a9c5ac44cc6f2e1d8..deab6797c5e5ca4c225d35f2438a426dc01083d8 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/11-iank
+++ b/
fai/config/scripts/GRUB_PC/11-iank
@@
-24,10
+24,10
@@
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 -riB
M
/root
+fcopy -riB
M
/usr/local/bin
src=$FAI/distro-install-common/shadow
src=$FAI/distro-install-common/shadow
@@
-49,6
+49,14
@@
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
+
+# vps that didnt start with fai need the key
+case $HOSTNAME in
+ je|bk|li)
+ apt-key add /a/bin/fai/fai/config/package_config/UBUNTU.asc
+ ;;
+esac
+
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