tape: tweaks

README.scsicrypto

@@ -1,5 +1,4 @@
-LTO4 and LTO5 drives and other modern tape drives
-support hardware encryption.
+Modern tape drives, e.g. LTO >= 4, support hardware encryption.
 
 There are several ways of using encryption with these drives
 The following three types of key management are available for
@@ -191,7 +190,7 @@ The initial setup of SCSI crypto looks something like this:
        If bareos-sd does not have the appropriate capabilities, all
        other tape operations may still work correctly, but you will
        get "Unable to perform SG_IO ioctl" errors.
-       
+
        On older kernels it can be you need CAP_SYS_ADMIN try
        CAP_SYS_RAWIO first and if that doesn't work try CAP_SYS_ADMIN
 

src/stored/backends/unix_tape_device.d/bareos-sd.d/autochanger/autochanger-0.conf.example

@@ -4,7 +4,7 @@
 # on Linux use "lsscsi --generic"
 # to get a list of your SCSI devices.
 # However, normaly you should access your devices by-id
-# (eg. /dev/tape/by-id/scsi-350011d00018a5f03-nst),
+# (eg. /dev/tape/by-id/scsi-SSTK_L700_XYZZY_A) or by-path,
 # because the short device names like /dev/sg7
 # might change on reboot.
 #

src/stored/backends/unix_tape_device.d/bareos-sd.d/device/tapedrive-0.conf.example

@@ -4,7 +4,9 @@
 # on Linux use "lsscsi --generic"
 # to get a list of your SCSI devices.
 # However, normaly you should access your devices by-id
-# (eg. /dev/tape/by-id/scsi-350011d00018a5f03-nst),
+# (eg. /dev/tape/by-id/scsi-350011d00018a5f03-nst)
+# or by-path
+# (eg. /dev/tape/by-path/pci-0000:0d:08.0-sas-phy4-0x500110a0015ec9e0-lun-0-nst),
 # because the short device names like /dev/nst1
 # might change on reboot.
 #

src/stored/block.c

@@ -441,6 +441,7 @@ bool DCR::write_block_to_dev()
       return true;
    }
    if (job_canceled(jcr)) {
+      Dmsg0(100, "return write_block_to_dev, job is canceled\n");
       return false;
    }
 

src/stored/btape.c

@@ -2981,12 +2981,15 @@ do_tape_cmds()
       Dsm_check(200);
       found = false;
       parse_args(cmd, args, &argc, argk, argv, MAX_CMD_ARGS);
-      for (i=0; i<comsize; i++)       /* search for command */
+      /* search for command */
+      for (i=0; i<comsize; i++) {
          if (argc > 0 && fstrsch(argk[0],  commands[i].key)) {
-            (*commands[i].func)();    /* go execute command */
+            /* execute command */
+            (*commands[i].func)();
             found = true;
             break;
          }
+      }
       if (*cmd && !found) {
          Pmsg1(0, _("\"%s\" is an invalid command\n"), cmd);
       }