X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fpackages;h=77dcbf4656e313f33286dbef1afb231cab7bf803;hb=8701ed06737ebb5f3457a8768f01243865e3ed7a;hp=a3a112e78d111c6b1935397091e480a91e426a70;hpb=98461cd7062469a9676e4b5776d13431850504a0;p=bootstrapfs.git

diff --git a/plc.d/packages b/plc.d/packages
index a3a112e..77dcbf4 100755
--- a/plc.d/packages
+++ b/plc.d/packages
@@ -108,12 +108,21 @@ case "$1" in
 
 	mode=$1; shift
 
-	if [[ -z "$@" ]] ; then
-	    # use all subdirs in install-rpms by default
-	    repositories=/var/www/html/install-rpms/*
-	else
-	    # else use argv
+	# on PLC there is a need to select the repos as there are quite a few in there
+	# would contain names or patterns relative to install-rpms
+	explicit_list=/var/www/html/install-rpms/PACKAGES
+
+	# use argv if provided
+	if [[ -n "$@" ]] ; then
 	    repositories="$@"
+	elif [ -f $explicit_list ] ; then
+	    repositories=""
+	    for name in $(grep -v '#' $explicit_list); do 
+		repositories="$repositories /var/www/html/install-rpms/$name"
+	    done
+	else
+  	    # use all subdirs in install-rpms by default
+	    repositories=/var/www/html/install-rpms/*
 	fi
 
 	##########
@@ -121,7 +130,8 @@ case "$1" in
 	# symlink all instances of plain 'sliceimage-*rpm' in all repos
 	# and cleanup old links 
 	sirpms=$(find $repositories -name 'sliceimage*rpm' -a -type f)
-	silinks=$(find $repositories -name 'sliceimage*rpm' -a -type l)
+	# for nicer upgrades, also remove symlinks from 5.0
+	silinks=$(find $repositories '(' -name 'sliceimage*rpm' -o -name 'vserver*rpm' ')' -a -type l)
 
 	for silink in $silinks; do
 	    [ ! -e $silink ] && { echo removing old $silink; rm $silink; }