Merge branch 'upstream'

diff --combined fai/config/class/FAIBASE.var
index 324084eeea1a3d5c75c980a9ee25552b604617c0,31120399bc94cb7a4c92e596bf5ca1b7825973c8..dc507c77faa2b23e133ab46443036ffd11a6bddc
--- 1/fai/config/class/FAIBASE.var
--- 2/fai/config/class/FAIBASE.var
+++ b/fai/config/class/FAIBASE.var
@@@ -1,5 -1,3 +1,5 @@@
 +#### from upstream example config, except where noted
 +
  # default values for installation. You can override them in your *.var files
  
  # allow installation of packages from unsigned repositories
@@@ -7,11 -5,18 +7,11 @@@ FAI_ALLOW_UNSIGNED=
  
  # Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not.
  UTC=yes
 -TIMEZONE=Europe/Berlin
 -
 -# the hash of the root password for the new installed linux system
 -# pw is "fai"
 -ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 +## changed from upstream. found in /usr/share/zoneinfo/, via fai-guide
 +TIMEZONE=US/Eastern
  
  # errors in tasks greater than this value will cause the installation to stop
  STOP_ON_ERROR=700
  
- # set parameter for install_packges(8)
+ # set parameter for install_packages(8)
  MAXPACKAGES=800
 -
 -# a user account will be created
 -username=demo
 -USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'

diff --combined fai/config/scripts/DEBIAN/40-misc
index 8608333b0f3ff87e0724ac27ade18c7e82ddb10d,58a292027ab127b9072d990e8a369edaf20e3ed1..052bfc6a3b076460736367f6ccf12b8261c1604c
--- 1/fai/config/scripts/DEBIAN/40-misc
--- 2/fai/config/scripts/DEBIAN/40-misc
+++ b/fai/config/scripts/DEBIAN/40-misc
@@@ -3,22 -3,6 +3,22 @@@
  # (c) Thomas Lange, 2001-2016, lange@debian.org
  # (c) Michael Goetze, 2010-2011, mgoetze@mgoetze.net
  
 +
 +# on ubuntu 16.04 which didn't run this script, some things which didn't
 +# apply:
 +# /etc/dpkg/dpkg.cfg.d/fai didn't exist,
 +# machine-id was already setup.
 +
 +# on that system and a debian stretch system, after reboot,
 +# some things done here don't seem to persist:
 +# some thin/etc/mtab is symlink somewhere else,
 +# and mailname is $HOSTNAME.lan
 +
 +# the adjtime thing is to support changing the system clock
 +# from representing UTC (the default) to localtime (windows default).
 +
 +# afaik, the only useful thing here for me is setting /etc/hostname
 +
  error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
  
  # a list of modules which are loaded at boot time
@@@ -58,8 -42,9 +58,9 @@@ ln -fs /proc/mounts $target/etc/mta
  rm -f $target/etc/dpkg/dpkg.cfg.d/fai $target/etc/dpkg/dpkg.cfg.d/unsafe-io
  
  if [ -d /etc/fai ]; then
-     ainsl -a /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
-     fcopy -Miv /etc/fai/fai.conf
+     if ! fcopy -Mv /etc/fai/fai.conf; then
+       ainsl -a /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
+     fi
  fi
  fcopy -iv /etc/rc.local