workdir=$dir
dst=$dir/debootstrap.deb
- findFile DEBOOTSTRAP_URI "$CONFDIR"/.defaults/debootstrap.uri "$PKGLIBDEFAULTDIR"/debootstrap.uri
+ findFile DEBOOTSTRAP_URI "$CONFDIR"/.defaults/apps/debootstrap/uri "$PKGLIBDEFAULTDIR"/debootstrap.uri
read tmp <$DEBOOTSTRAP_URI
case "$tmp" in
(/*) ln -s "$tmp" "$dst";;
- (http://*|ftp://*) $_WGET -q -O "$dst" "$tmp";;
+ (http://*|ftp://*) $_WGET -nv -O "$dst" "$tmp";;
(*) echo $"Unsupported URI scheme '$tmp'" >&2
exit 1;;
esac
test -x "$DEBOOTSTRAP" || { echo $"Can not find debootstrap at '$DEBOOTSTRAP'" >&2; exit 1; }
}
+function fixupDebian
+{
+ rm -rf "$1"/dev
+ mv "$1"/dev.X "$1"/dev
+}
+
### main starts here <---
-m) mirror=$2; shift;;
--debug) set -x;;
--) shift; break ;;
- *) echo "vserver-build.skeleton: internal error: unrecognized option '$1'"
+ *) echo "vserver-build.skeleton: internal error: unrecognized option '$1'" >&2
exit 1
;;
esac
test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
mv "$VDIR"/dev "$VDIR"/dev.X
-"$DEBOOTSTRAP" "$DISTRIBUTION" "$VDIR" "$mirror"
-rm -rf "$VDIR"/dev
-mv "$VDIR"/dev.X "$VDIR"/dev
+"$DEBOOTSTRAP" "$DISTRIBUTION" "$VDIR" "$mirror" || : ## HACK: ignore all errors...
+fixupDebian "$VDIR"
test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"