- # install individual packages, then groups
- packages=$(pl_getPackages ${fcdistro} $pkgsfile)
- groups=$(pl_getGroups ${fcdistro} $pkgsfile)
+ ### install individual packages, then groups
+ # get target arch - use uname -i here (we want either x86_64 or i386)
+ vserver_arch=$($personality vserver $vserver exec uname -i)
+ # on debian systems we get arch through the 'arch' command
+ [ "$vserver_arch" = "unknown" ] && vserver_arch=$($personality vserver $vserver exec arch)
+
+ packages=$(pl_getPackages -a $vserver_arch $fcdistro $pldistro $pkgsfile)
+ groups=$(pl_getGroups -a $vserver_arch $fcdistro $pldistro $pkgsfile)
+
+ case "$pkg_method" in
+ yum)
+ [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
+ for group_plus in $groups; do
+ group=$(echo $group_plus | sed -e "s,+++, ,g")
+ $personality vserver $vserver exec yum -y groupinstall "$group"
+ done
+ # store current rpm list in /init-vserver.rpms in case we need to check the contents
+ $personality vserver $vserver exec rpm -aq > /vservers/$vserver/init-vserver.rpms
+ ;;
+ debootstrap)
+ $personality vserver $vserver exec apt-get update
+ for package in $packages ; do
+ $personality vserver $vserver exec apt-get install -y $package
+ done
+ ### xxx todo install groups with apt..
+ ;;
+ *)
+ echo "unknown pkg_method $pkg_method"
+ ;;
+ esac