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
update to upstream 5.3.4
[automated-distro-installer]
/
fai
/
config
/
scripts
/
FAISERVER
/
10-conffiles
diff --git
a/fai/config/scripts/FAISERVER/10-conffiles
b/fai/config/scripts/FAISERVER/10-conffiles
index 4bf2ed235583756b013a1fdd6aabb675281efe85..de17f53c407d7345494a4a53064402fa0e0b2752 100755
(executable)
--- a/
fai/config/scripts/FAISERVER/10-conffiles
+++ b/
fai/config/scripts/FAISERVER/10-conffiles
@@
-2,9
+2,8
@@
fcopy -Bvr /etc/fai
fcopy -Bv /etc/fai/apt/sources.list /etc/dhcp/dhcpd.conf
fcopy -Bvr /etc/fai
fcopy -Bv /etc/fai/apt/sources.list /etc/dhcp/dhcpd.conf
-fcopy -v /etc/rc.local
-if [ $FAI_ACTION = "install"
]
; then
+if [ $FAI_ACTION = "install"
-o $FAI_ACTION = "dirinstall" ]
; then
# use the same sources.list for the server itself and the clients
cp -a $target/etc/fai/apt $target/etc/
# use the same sources.list for the server itself and the clients
cp -a $target/etc/fai/apt $target/etc/
@@
-30,7
+29,9
@@
if [ $FAI_ACTION = "install" ]; then
ainsl -v /etc/apt-cacher-ng/acng.conf "ReuseConnections: 0"
# copy base file for faster building of nfsroot
ainsl -v /etc/apt-cacher-ng/acng.conf "ReuseConnections: 0"
# copy base file for faster building of nfsroot
- cp -p /var/tmp/base.tar.xz $target/var/tmp
+ if [ -f /var/tmp/base.tar.xz ]; then
+ cp -p /var/tmp/base.tar.xz $target/var/tmp
+ fi
if [ -d /media/mirror/pool ]; then
mkdir $target/var/cache/apt-cacher-ng/_import
if [ -d /media/mirror/pool ]; then
mkdir $target/var/cache/apt-cacher-ng/_import
@@
-41,6
+42,6
@@
if [ $FAI_ACTION = "install" ]; then
# copy basefiles from CD to config space
if [ -d $FAI/basefiles ]; then
mkdir -p $target/srv/fai/config/basefiles
# copy basefiles from CD to config space
if [ -d $FAI/basefiles ]; then
mkdir -p $target/srv/fai/config/basefiles
- cp -vp $FAI/basefiles/*.tar.* $target/srv/fai/config/basefiles 2>/dev/null
+ cp -vp $FAI/basefiles/*.tar.* $target/srv/fai/config/basefiles 2>/dev/null
|| true
fi
fi
fi
fi