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
Merge branch 'upstream'
[automated-distro-installer]
/
fai
/
config
/
hooks
/
instsoft.DEBIAN
diff --git
a/fai/config/hooks/instsoft.DEBIAN
b/fai/config/hooks/instsoft.DEBIAN
index 13c517a991ee6d73fa7edb7eed7c3ce6609a9739..34e6ebbfbc92764394109d684c6ffc27c3b2d0ed 100755
(executable)
--- a/
fai/config/hooks/instsoft.DEBIAN
+++ b/
fai/config/hooks/instsoft.DEBIAN
@@
-8,11
+8,9
@@
if [ $FAI_ACTION != "install" -a $FAI_ACTION != "dirinstall" ]; then
fi
fcopy -Bi /etc/apt/apt.conf.d/force_confdef
fi
fcopy -Bi /etc/apt/apt.conf.d/force_confdef
-ainsl -a /etc/ucf.conf "^conf_force_conffold=YES"
# in case the locales are already included inside the base file (Ubuntu)
if [ -f $target/usr/sbin/locale-gen ]; then
# in case the locales are already included inside the base file (Ubuntu)
if [ -f $target/usr/sbin/locale-gen ]; then
- $ROOTCMD dpkg-reconfigure -fnoninteractive locales
exit
fi
exit
fi