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
fixes and config changes
[automated-distro-installer]
/
fai
/
config
/
scripts
/
LAST
/
50-misc
diff --git
a/fai/config/scripts/LAST/50-misc
b/fai/config/scripts/LAST/50-misc
index 586c78720a7b5f6fd138b4d2b73533749def0801..831f15d6f288fdf380d23d30257c6101167fcec7 100755
(executable)
--- a/
fai/config/scripts/LAST/50-misc
+++ b/
fai/config/scripts/LAST/50-misc
@@
-48,8
+48,7
@@
fi
# Make sure everything is configured properly
if ifclass DEBIAN || ifclass UBUNTU; then
# Make sure everything is configured properly
if ifclass DEBIAN || ifclass UBUNTU; then
- echo "Running \"apt-get -f install\" for the last time."
- $ROOTCMD apt-get -f install
+ $ROOTCMD apt-get -f install -y
fi
if [ $FAI_ACTION = "install" ]; then
fi
if [ $FAI_ACTION = "install" ]; then
@@
-61,7
+60,7
@@
if [ $FAI_ACTION = "install" ]; then
fi
# copy sources.list
fi
# copy sources.list
-fcopy -iM /etc/apt/sources.list
+fcopy -i
S
M /etc/apt/sources.list
setrel() {
setrel() {
@@
-75,7
+74,7
@@
setrel() {
return
fi
return
fi
- dists="jessie stretch buster
xenial trusty
"
+ dists="jessie stretch buster
bullseye bookworm trixie jammy focal bionic xenial trusty aramo nabia etiona
"
for d in $dists; do
if grep -iq $d $target/etc/os-release; then
release=$d
for d in $dists; do
if grep -iq $d $target/etc/os-release; then
release=$d
@@
-89,14
+88,18
@@
setrel
if [ -f $target/etc/apt/sources.list -a -n "$release" ]; then
grep -q 'file generated by fai-cd' $target/etc/apt/sources.list && cat <<EOF > $target/etc/apt/sources.list
deb $apt_cdn/debian $release main contrib non-free
if [ -f $target/etc/apt/sources.list -a -n "$release" ]; then
grep -q 'file generated by fai-cd' $target/etc/apt/sources.list && cat <<EOF > $target/etc/apt/sources.list
deb $apt_cdn/debian $release main contrib non-free
-deb $
apt_cdn/debian-security $release/updates
main contrib non-free
-deb [trusted=yes] http://fai-project.org/download $release koeln
+deb $
security_cdn/debian-security ${secsuite}
main contrib non-free
+
#
deb [trusted=yes] http://fai-project.org/download $release koeln
EOF
EOF
+ # if the package fai-server was installed, enable the project's repository
+ if dpkg-query --admindir=$target/var/lib/dpkg -W fai-server >/dev/null 2>&1; then
+ sed -i -e '/fai-project.org/s/^#//' $target/etc/apt/sources.list
+ fi
fi
# for ARM architecture, we may need the kernel and initrd to boot or flash the device
if ifclass ARM64; then
fi
# for ARM architecture, we may need the kernel and initrd to boot or flash the device
if ifclass ARM64; then
- cp -pv $target/boot/vmlinuz* $target/boot/initrd* $
LOG
DIR
+ cp -pv $target/boot/vmlinuz* $target/boot/initrd* $
FAI_RUN
DIR
fi
exit $error
fi
exit $error