local i
for i in "$VDIR" "$SETUP_CONFDIR"; do
- test ! -e "$i" || {
+ test ! -e "$i" || isDirectoryEmpty "$i" || {
mv "$i" "$i$suffix"
say "Renamed '$i' to '$i$suffix'"
}
elif test -e /etc/gentoo-release; then
set -- $(cat /etc/gentoo-release)
DISTRIBUTION=gentoo$5
- elif test -e /etc/slackware-release; then
- set -- $(cat /etc/slackware-release)
+ elif test -e /etc/slackware-version; then
+ set -- $(cat /etc/slackware-version)
DISTRIBUTION=slackware$2
elif test -n "$1"; then
DISTRIBUTION=$1
function base.initFilesystem
{
test -z "$1" || _renameVserverCfg
- test isDirectoryEmpty "$VDIR" -a ! -e "$SETUP_CONFDIR" || {
- echo \
-"vserver-topdirectory '$VDIR' and/or configuration at '$SETUP_CONFDIR'
-exist already; please try to use '--force', or remove them manually"
->&2
- exit 1
- } >&2
+ { isDirectoryEmpty "$VDIR" && 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."
mkdir -p -m755 "$VDIR"
chattr -t "$VDIR"