X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.apt-rpm;h=b40f9bfc92962d4336009f88eb37b2ad2e50bf18;hb=5b39edfee423f5f3cbe8fa223dcfdc9e8d66e286;hp=ec6c3c568cff0d187f70e074afc2ad4fe3fdaf8a;hpb=f1781f314a7d6fc3a249535bbf90a118037c8ab6;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index ec6c3c5..b40f9bf 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -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,11 +36,15 @@ done getDistribution -base.initVariables +base.init + pkgmgmt.initVariables rpm.initVariables apt.initVariables +rpm.sanityCheck + + base.initFilesystem "$OPTION_FORCE" pkgmgmt.initFilesystem "$OPTION_FORCE" rpm.initFilesystem @@ -50,9 +54,16 @@ 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" -rpm.initDB "$VSERVER_NAME" -"$_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" + +base.setSuccess