{
test -z "$ROOTDIR" || return 0
- for item in "\"$CONFDIR/.defaults/vdirbase\" 1" "/vservers"; do
+ for item in "\"$CONFDIR/.defaults/vdirbase\" 1" "$DEFAULT_VSERVERDIR"; do
eval set -- "$item"
ROOTDIR=$1
ROOTDIR_REL=$2
{
test -z "$PKGCFGBASE" || return 0
- for item in "\"$CONFDIR/.defaults/apps/pkgmgmt/base\" 1" "$ROOTDIR/.pkg"; do
+ for item in "\"$CONFDIR/.defaults/apps/pkgmgmt/base\" 1" "$ROOTDIR/.pkg" "$DEFAULT_VSERVERPKGDIR"; do
eval set -- "$item"
PKGCFGBASE=$1
PKGCFGBASE_REL=$2
local suffix=.~$(date +'%s')~
local i
- for i in "$VDIR" "$SETUP_CONFDIR"; do
+ for i in "$VDIR" "$SETUP_CONFDIR" "$PKGCFGDIR"; do
test ! -e "$i" || {
mv "$i" "$i$suffix"
say "Renamed '$i' to '$i$suffix'"
while read spec; do
makeDevEntry "$VDIR"/dev $spec
done <$_DEV_FILE
+
+ findAndCopy "$VDIR"/etc/hosts "$CONFDIR"/.defaults/files/hosts "$CONFDIR/.distributions/$DISTRIBUTION"/files/hosts \
+ "$DISTRIBDIR/$DISTRIBUTION"/files/hosts "$DISTRIBDIR"/defaults/files/hosts ""
+
+ for i in nsswitch.conf krb5.conf krb.conf krb.realms ldap.conf localtime resolv.conf; do
+ findAndCopy "$VDIR"/etc/$i "$CONFDIR/.defaults/files/$i" "$CONFDIR/.distributions/$DISTRIBUTION/files/$i" ""
+ done
}
function initVariables