if test -e /etc/fedora-release; then
set -- $(cat /etc/fedora-release)
DISTRIBUTION=fdr$4
+ elif test -e /etc/mandrake-release; then
+ set -- $(cat /etc/mandrake-release)
+ DISTRIBUTION=mdv$4
elif test -e /etc/redhat-release; then
set -- $(cat /etc/redhat-release)
DISTRIBUTION=rh$5
function base.initFilesystem
{
test -z "$1" || _renameVserverCfg
- { isDirectoryEmpty "$VDIR" && test ! -e "$SETUP_CONFDIR"; } || colpanic $"\
+ if test -n "$OPTION_SEMIFORCE"; then
+ { { test -n "$OPTION_SEMIFORCE" || isDirectoryEmpty "$VDIR" 1 } && test ! -e "$SETUP_CONFDIR"; } || colpanic $"\
vserver-topdirectory '$VDIR' and/or configuration at '$SETUP_CONFDIR'
exist already; please try to use '--force', or remove them manually."
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
+ for i in nsswitch.conf krb5.conf krb.conf krb.realms ldap.conf localtime; do
findAndCopy "$VDIR"/etc/$i "$__CONFDIR/.defaults/files/$i" "$__CONFDIR/.distributions/$DISTRIBUTION/files/$i" ""
done
+ findAndCopy "$VDIR"/etc/resolv.conf "$__CONFDIR/.defaults/files/resolv.conf" \
+ "$__CONFDIR/.distributions/$DISTRIBUTION/files/resolv.conf" /etc/resolv.conf ""
}
function base._initVariables