Re: [2.5.1] more tidbits

Jean-Francois,

Could you try these two patch?

Jean-Louis

Jean-Francois Malouin wrote:

Irix-6.5.x amanda-2.5.1p1.

o- amcleanup exits with an error:

# su amanda -c "amcleanup config"
amcleanup: no unprocessed logfile to clean up.
amcleanupdisk: Usage: amcleanupdisk <confdir>
amcleanup: amcleanupdisk exited with status: 1

Not sure what is amcleanupdisk suppose to perform...
cleaning the holdding disk?

o- when labeling tapes with amlabel the barcode files is not properly
updated (I'm using chg-zd-mtx with a tape changer and a barcode
reader). That means that after labeling the tapes I have to 'amlabel
update' which is quite a lenghty process. I don't remember having to
do this under 2.4.5.

regards
jf

diff -u -r --show-c-function --exclude-from=amanda.diff 
amanda-2.5.2alpha.orig/server-src/amcleanupdisk.c 
amanda-2.5.2alpha.TAPE_DEVICE/server-src/amcleanupdisk.c
--- amanda-2.5.2alpha.orig/server-src/amcleanupdisk.c   2006-09-11 
11:30:09.000000000 -0400
+++ amanda-2.5.2alpha.TAPE_DEVICE/server-src/amcleanupdisk.c    2006-10-02 
16:40:23.000000000 -0400
@@ -66,8 +66,8 @@ main(
     /* Don't die when child closes pipe */
     signal(SIGPIPE, SIG_IGN);
 
-    if(main_argc != 2) {
-       error("Usage: amcleanupdisk%s <confdir>", versionsuffix());
+    if(main_argc < 2) {
+       error("Usage: amcleanupdisk%s <config>", versionsuffix());
        /*NOTREACHED*/
     }

diff -u -r --show-c-function --exclude-from=amanda.diff 
amanda-2.5.2alpha.new/server-src/amlabel.c 
amanda-2.5.2alpha.amlabel/server-src/amlabel.c
--- amanda-2.5.2alpha.new/server-src/amlabel.c  2006-10-03 07:32:36.000000000 
-0400
+++ amanda-2.5.2alpha.amlabel/server-src/amlabel.c      2006-10-03 
09:44:49.000000000 -0400
@@ -452,6 +452,12 @@ main(
                error("couldn't write tapelist: %s", strerror(errno));
                /*NOTREACHED*/
            }
+
+           if (have_changer) {
+               /* Now we try to inform the changer, about the new label */
+               changer_label(outslot, label);
+           }
+
            amfree(conf_tapelist_old);
 
            /* XXX add cur_tape number to tape list structure */