# 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.init
-initFilesystem "$OPTION_FORCE"
-initFilesystemRPM
-initFilesystemApt
+pkgmgmt.initVariables
+rpm.initVariables
+apt.initVariables
+
+rpm.sanityCheck
+
+
+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" "$_VSERVER"
-importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- update
-installBasePackages "$SETUP_CONFDIR" "$PKGDIR"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y
-test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$_VSERVER"
+test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
+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