X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.apt-rpm;h=3e79bca011d29cad5abfb7c531cee269d6ebb336;hb=090a340dad3e79a3ccfa6954c779f5abf71f0f60;hp=bd05fd024bd2db25cc2462ea98d9ce8caf1f4a1a;hpb=16eafb4fda7a2946dbcc9ca52f4cf7f68383e873;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index bd05fd0..3e79bca 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,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,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 -apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR" -"$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y +rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" +rpm.initDB "$SETUP_CONFDIR" +$_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"