git://git.onelab.eu
/
nodeimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix links for vserver-* packages
[nodeimage.git]
/
plc.d
/
packages
diff --git
a/plc.d/packages
b/plc.d/packages
index
06083fd
..
f86bbf9
100755
(executable)
--- a/
plc.d/packages
+++ b/
plc.d/packages
@@
-44,20
+44,26
@@
case "$1" in
type -p createrepo > /dev/null && have_createrepo="true"
type -p createrepo > /dev/null && have_createrepo="true"
- ###
copy
vserver-PLDISTRO* and vserver-systemslices-PLDISTRO*
- ### pac
ak
ges to each repository to be able to create different
+ ###
symlink
vserver-PLDISTRO* and vserver-systemslices-PLDISTRO*
+ ### pac
ka
ges to each repository to be able to create different
### flavours of vservers on nodes
for repository1 in $repositories; do
### flavours of vservers on nodes
for repository1 in $repositories; do
+ DISTRO=${PLC_FLAVOUR_SLICE_PLDISTRO}
+ VSERVER_PKG=vserver-$(basename $repository1)
+ VSERVER_SYS_SLICES_PKG=vserver-systemslices-$(basename $repository1)
for repository2 in $repositories; do
for repository2 in $repositories; do
- if [[ $(basename $repository1) == ${
PLC_FLAVOUR_NODE_PL
DISTRO}* ]] \
- && [[ $(basename $repository2) == ${
PLC_FLAVOUR_NODE_PL
DISTRO}* ]] \
+ if [[ $(basename $repository1) == ${DISTRO}* ]] \
+ && [[ $(basename $repository2) == ${DISTRO}* ]] \
&& [[ $repository1 != $repository2 ]] ; then
&& [[ $repository1 != $repository2 ]] ; then
- cp -a $repository1/vserver{,-systemslices}-${PLC_FLAVOUR_NODE_PLDISTRO}* $repository2
+ rm -rf $repository2/${VSERVER_PKG}*
+ rm -rf $repository2/${VSERVER_SYS_SLICES_PKG}*
+
+ ln -s $repository1/${VSERVER_PKG}* $repository2
+ ln -s $repository1/${VSERVER_SYS_SLICES_PKG}* $repository2
fi
done
done
fi
done
done
-
for repository in $repositories ; do
# the rpms that need signing
new_rpms=
for repository in $repositories ; do
# the rpms that need signing
new_rpms=
@@
-65,7
+71,7
@@
case "$1" in
new_stamps=
# is there a need to refresh yum metadata
need_yum_arch=
new_stamps=
# is there a need to refresh yum metadata
need_yum_arch=
- need_createrepo=
+ need_createrepo=
true # always run createrepo as links may change for vserver packages
# right after installation, no package is present
# but we still need to create index
# right after installation, no package is present
# but we still need to create index