use $(LIBENSCVECTOR) instead of libensc_vector.a
[util-vserver.git] / util-vserver / scripts / vserver-build.apt-rpm
index bd05fd0..f44391c 100644 (file)
@@ -24,10 +24,10 @@ eval set -- "$tmp"
 
 while true; do
     case "$1" in
-       -d)             DISTRIBUTION=$2; shift;;
-       --debug)        set -x;;
-       --)             shift; break ;;
-       *)              echo "vserver-build.apt-rpm: internal error: unrecognized option '$1'"
+       (-d)            DISTRIBUTION=$2; shift;;
+       (--debug)       set -x;;
+       (--)            shift; break ;;
+       (*)             echo "vserver-build.apt-rpm: internal error: unrecognized option '$1'" >&2
                        exit 1
                        ;;
     esac
@@ -36,12 +36,12 @@ done
 
 getDistribution
 
-initVariables
+base.initVariables
 pkgmgmt.initVariables
 rpm.initVariables
 apt.initVariables
 
-initFilesystem         "$OPTION_FORCE"
+base.initFilesystem    "$OPTION_FORCE"
 pkgmgmt.initFilesystem "$OPTION_FORCE"
 rpm.initFilesystem
 apt.initFilesystem
@@ -50,8 +50,14 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- update
-apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y
+rpm.initDB           "$SETUP_CONFDIR"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" \
+    "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
+    "$__CONFDIR/.distributions/.common/pubkeys" \
+    "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
+
+$_VAPT_GET "$SETUP_CONFDIR" -- update
+apt.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
+$_VAPT_GET "$SETUP_CONFDIR" -- dist-upgrade -y
+$_VAPT_GET "$SETUP_CONFDIR" -- clean
 test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"