X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.apt-rpm;h=a377dfe2b1ca208049c898d4d88bf9bf6ce8f976;hb=4b6ef9c6e443d89137d0780895a265faaefcee71;hp=4c07a3a65a3d6c797125cf7fbd18da582eec4475;hpb=8a97fac7807c482d0bcac1a4d8e75874d163d1e1;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index 4c07a3a..a377dfe 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 @@ -50,8 +50,10 @@ 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 +rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" +rpm.initDB "$SETUP_CONFDIR" +$_VAPT_GET "$SETUP_CONFDIR" -- update apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR" -"$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y +$_VAPT_GET "$SETUP_CONFDIR" -- dist-upgrade -y +$_VAPT_GET "$SETUP_CONFDIR" -- clean test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"