updated legacy paths
[util-vserver.git] / util-vserver / scripts / vserver-build.apt-rpm
index 772fec5..792c4b5 100644 (file)
@@ -23,11 +23,12 @@ eval set -- "$tmp"
 
 while true; do
     case "$1" in
-       -d)     DISTRIBUTION=$2; shift;;
-       --)     shift; break ;;
-       *)      echo "vserver-build.apt-rpm: internal error: unrecognized option '$1'"
-               exit 1
-               ;;
+       -d)             DISTRIBUTION=$2; shift;;
+       --debug)        set -x;;
+       --)             shift; break ;;
+       *)              echo "vserver-build.apt-rpm: internal error: unrecognized option '$1'"
+                       exit 1
+                       ;;
     esac
     shift
 done
@@ -45,9 +46,9 @@ initFilesystemApt
 setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
-test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$_VSERVER"
+test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
 importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
 "$_VAPT_GET" "$SETUP_CONFDIR" -- update
 installBasePackages "$SETUP_CONFDIR" "$PKGDIR"
 "$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y
-test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$_VSERVER"
+test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"