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
/var/www/html/install-rpms/PACKAGES only relevant for cross-flavour
[nodeimage.git]
/
plc.d
/
packages
diff --git
a/plc.d/packages
b/plc.d/packages
index
77dcbf4
..
0108cde
100755
(executable)
--- a/
plc.d/packages
+++ b/
plc.d/packages
@@
-115,36
+115,39
@@
case "$1" in
# use argv if provided
if [[ -n "$@" ]] ; then
repositories="$@"
# use argv if provided
if [[ -n "$@" ]] ; then
repositories="$@"
+ cross_repositories="$@"
elif [ -f $explicit_list ] ; then
elif [ -f $explicit_list ] ; then
- repositories=""
+
cross_
repositories=""
for name in $(grep -v '#' $explicit_list); do
for name in $(grep -v '#' $explicit_list); do
-
repositories="$
repositories /var/www/html/install-rpms/$name"
+
cross_repositories="$cross_
repositories /var/www/html/install-rpms/$name"
done
done
+ repositories=/var/www/html/install-rpms/*
else
# use all subdirs in install-rpms by default
repositories=/var/www/html/install-rpms/*
else
# use all subdirs in install-rpms by default
repositories=/var/www/html/install-rpms/*
+ cross_repositories=/var/www/html/install-rpms/*
fi
##########
# deal with the sliceimage packages
# symlink all instances of plain 'sliceimage-*rpm' in all repos
# and cleanup old links
fi
##########
# deal with the sliceimage packages
# symlink all instances of plain 'sliceimage-*rpm' in all repos
# and cleanup old links
- sirpms=$(find $repositories -name 'sliceimage*rpm' -a -type f)
+ sirpms=$(find $
cross_
repositories -name 'sliceimage*rpm' -a -type f)
# for nicer upgrades, also remove symlinks from 5.0
# for nicer upgrades, also remove symlinks from 5.0
- silinks=$(find $repositories '(' -name 'sliceimage*rpm' -o -name 'vserver*rpm' ')' -a -type l)
+ silinks=$(find $
cross_
repositories '(' -name 'sliceimage*rpm' -o -name 'vserver*rpm' ')' -a -type l)
for silink in $silinks; do
[ ! -e $silink ] && { echo removing old $silink; rm $silink; }
done
for silink in $silinks; do
[ ! -e $silink ] && { echo removing old $silink; rm $silink; }
done
- for repo
in $
repositories; do
+ for repo
sitory in $cross_
repositories; do
for sirpm in $sirpms; do
for sirpm in $sirpms; do
- # if in the repo we're dealing with, ignore
- if [ "$(echo $sirpm | sed -e s,^$repo,,)" != $sirpm ] ; then
+ # if in the repo
sitory
we're dealing with, ignore
+ if [ "$(echo $sirpm | sed -e s,^$repo
sitory
,,)" != $sirpm ] ; then
continue
fi
b=$(basename $sirpm)
continue
fi
b=$(basename $sirpm)
- link=$repo/$b
+ link=$repo
sitory
/$b
if [ ! -e $link ] ; then
echo "creating symlink $link towards $sirpm"
ln -s $sirpm $link
if [ ! -e $link ] ; then
echo "creating symlink $link towards $sirpm"
ln -s $sirpm $link
@@
-154,7
+157,7
@@
case "$1" in
##########
# now that the symlinks are OK, we can tweak yumgroups
##########
# now that the symlinks are OK, we can tweak yumgroups
- for repository in $repositories; do
+ for repository in $
cross_
repositories; do
hack_yumgroups $repository
done
hack_yumgroups $repository
done