git://git.onelab.eu
/
sliceimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Requires to the correct package.
[sliceimage.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
dad616b
..
400dc5b
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-56,24
+56,25
@@
vrefname=default
vref=${vrefdir}/${vrefname}
install -d -m 755 ${vref}
vref=${vrefdir}/${vrefname}
install -d -m 755 ${vref}
-# "Parse" out the packages and groups for mkfedora
-lst="${pldistro}-vserver.lst"
-options="$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst) $(pl_getGroupsOptions2 ${pl_DISTRO_NAME} $lst)"
+# locate the packages and groups file
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
-# Populate a minimal /dev in the reference image
-pl_makedevs ${vref}
+# Some of the PlanetLab RPMs attempt to (re)start themselves in %post,
+# unless the installation is running inside the BootCD environment. We
+# would like to pretend that we are.
+export PL_BOOTCD=1
# Populate image with vserver-reference packages
# Populate image with vserver-reference packages
-pl_
setup_chroot ${vref} ${options} -k
+pl_
root_setup_chroot ${vref} -k -f $pkgsfile
-for systemvserver in
${pldistro}-vservers/*.lst
; do
- NAME=$(basename $systemvserver .
lst
)
+for systemvserver in
../build/config.${pldistro}/vserver-*.pkgs
; do
+ NAME=$(basename $systemvserver .
pkgs | sed -e s,vserver-,,
)
echo "--------START BUILDING system vserver ${NAME}: $(date)"
# "Parse" out the packages and groups for yum
echo "--------START BUILDING system vserver ${NAME}: $(date)"
# "Parse" out the packages and groups for yum
- systempackages=$(pl_getPackages
2
${pl_DISTRO_NAME} $systemvserver)
- systemgroups=$(pl_getGroups
2
${pl_DISTRO_NAME} $systemvserver)
+ systempackages=$(pl_getPackages ${pl_DISTRO_NAME} $systemvserver)
+ systemgroups=$(pl_getGroups ${pl_DISTRO_NAME} $systemvserver)
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*