X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.apt-rpm;h=6f54552fe7524e7183db93809eb2f4d26cfad5b7;hb=bbda8c655efb11b84c25b854aaa2cb4d42ebf122;hp=59769c3c7ef15b3de3f114826deb19722e4a67ec;hpb=c93d7a1a2f2f2e1f4075e558fa44f82f07dc429b;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index 59769c3..6f54552 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -15,39 +15,44 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -tmp=$(getopt -o +d: -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o +d: --long debug -n "$0" -- "$@") || exit 1 eval set -- "$tmp" . "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM" . "$_LIB_VSERVER_BUILD_FUNCTIONS_APT" +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" 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'" >&2 + exit 1 + ;; esac shift done getDistribution -initVariables -initVariablesRPM -initVariablesApt +base.initVariables +pkgmgmt.initVariables +rpm.initVariables +apt.initVariables -initFilesystem "$OPTION_FORCE" -initFilesystemRPM -initFilesystemApt +base.initFilesystem "$OPTION_FORCE" +pkgmgmt.initFilesystem "$OPTION_FORCE" +rpm.initFilesystem +apt.initFilesystem setup_writeOption "$VSERVER_NAME" setup_writeInitialFstab test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" -importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" +rpm.importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" +rpm.initDB "$VSERVER_NAME" "$_VAPT_GET" "$SETUP_CONFDIR" -- update -installBasePackages "$SETUP_CONFDIR" "$PKGDIR" +apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR" "$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"