summaryrefslogtreecommitdiffstats
path: root/repoman
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2015-04-20 10:56:54 +0000
committerramon <ramongomez@us.es>2015-04-20 10:56:54 +0000
commit1a2fa9d82bafd3ef8e0d703bf715fe3e58853d0d (patch)
tree1e008f200ff4b413d0807eee03df75ef42f39fab /repoman
parentc916af9faafcd8fa120aeaf9092c0847aa09183a (diff)
#673: Actualizar código incluido en OepnGnSys 1.0.6 sobre la rama {{{version1.1}}} para desarrollar la nueva versión.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4609 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'repoman')
-rwxr-xr-xrepoman/bin/deleteimage7
-rwxr-xr-xrepoman/bin/deletepreimage2
2 files changed, 5 insertions, 4 deletions
diff --git a/repoman/bin/deleteimage b/repoman/bin/deleteimage
index 6a9445cc..f208fb9b 100755
--- a/repoman/bin/deleteimage
+++ b/repoman/bin/deleteimage
@@ -53,13 +53,13 @@ fi
IMGPATH="$OGIMG/$1.$IMGEXT"
if [ -f $IMGPATH ]; then
echo "Borrando fichero $PATHDIR"
- rm -f $IMGPATH && rm -f $IMGPATH.{sum,torrent}
+ rm -f $IMGPATH && rm -f $IMGPATH.{sum,full.sum,torrent}
else
# Eliminar ficheros de imagen sincronizada diferencial.
IMGPATH="$OGIMG/$1.$IMGEXT.$DIFFEXT"
if [ -f $IMGPATH ]; then
echo "Borrando fichero $PATHDIR"
- rm -f $IMGPATH && rm -f $IMGPATH.{sum,torrent}
+ rm -f $IMGPATH && rm -f $IMGPATH.{sum,full.sum,torrent}
else
# Eliminar directorio de imagen sincronizada.
IMGPATH="$OGIMG/$1"
@@ -75,12 +75,13 @@ if [ -n "$RECOVERBACKUP" ]; then
[ -e $IMGPATH.$BAKEXT ] && echo "Recuperando copia $IMGPATH.$BAKEXT"
mv -f $IMGPATH.$BAKEXT $IMGPATH && \
(mv -f $IMGPATH.sum.$BAKEXT $IMGPATH.sum 2>/dev/null
+ mv -f $IMGPATH.full.sum.$BAKEXT $IMGPATH.full.sum 2>/dev/null
mv -f $IMGPATH.torrent.$BAKEXT $IMGPATH.torrent 2>/dev/null)
fi
# Borrar copia de seguridad de la imagen.
if [ -n "$DELETEBACKUP" ]; then
[ -e $IMGPATH ] && echo "Eliminando copia $IMGPATH.$BAKEXT"
- rm -f $IMGPATH.$BAKEXT && rm -f $IMGPATH.{sum,torrent}.$BAKEXT
+ rm -f $IMGPATH.$BAKEXT && rm -f $IMGPATH.{sum,full.sum,torrent}.$BAKEXT
fi
diff --git a/repoman/bin/deletepreimage b/repoman/bin/deletepreimage
index 85883aea..39077483 100755
--- a/repoman/bin/deletepreimage
+++ b/repoman/bin/deletepreimage
@@ -44,7 +44,7 @@ for IMG in `ls /opt/opengnsys/images/*.delete`; do
## se llama al escript de borrado de imagen.
## Si es un Directorio Borramos
if [[ $DELETEdir == "delete" ]]; then
- /opt/opengnsys/bin/deleteimage -d $DELETEIMAGE
+ /opt/opengnsys/bin/deleteimage $DELETEIMAGE
# Si es un Imagen Backup Borramos
elif [[ $DELETEant == "ant" ]]; then