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
upstream 00f2ea2b8 as of 2018-09-02
[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 8ae015c082ee24a5ded245b23a24958e6e82de39..a85fd141805b07ca101b405602593b75719d823d 100755
(executable)
--- a/
fai/config/scripts/LAST/50-misc
+++ b/
fai/config/scripts/LAST/50-misc
@@
-58,7
+58,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() {
@@
-87,13
+87,17
@@
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
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 [trusted=yes] http://fai-project.org/download $release koeln
EOF
EOF
+ # if the package fai-server was installed, enable the project's repository
+ if [ -f $target/var/lib/dpkg/info/fai-server.list ]; 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