Set default block size for CD to expected 2048 bytes.

diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index 12474ea782a7e93d53581379806e7e349cddc63b..4813ae0e49034b88f2522a6e8063e3b0b8114c37 100644 (file)
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -1661,7 +1661,10 @@ conf_verify_lun(struct lun *lun)
                }
        }
        if (lun->l_blocksize == 0) {
-               lun_set_blocksize(lun, DEFAULT_BLOCKSIZE);
+               if (lun->l_device_type == 5)
+                       lun_set_blocksize(lun, DEFAULT_CD_BLOCKSIZE);
+               else
+                       lun_set_blocksize(lun, DEFAULT_BLOCKSIZE);
        } else if (lun->l_blocksize < 0) {
                log_warnx("invalid blocksize for lun \"%s\"; "
                    "must be larger than 0", lun->l_name);

diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h
index 6eb878cad7b781bf4680ea9f38329a24357a362a..51775d76a4a12b2650822567217531f5db1113f3 100644 (file)
--- a/usr.sbin/ctld/ctld.h
+++ b/usr.sbin/ctld/ctld.h
@@ -43,6 +43,7 @@
 #define        DEFAULT_CONFIG_PATH             "/etc/ctl.conf"
 #define        DEFAULT_PIDFILE                 "/var/run/ctld.pid"
 #define        DEFAULT_BLOCKSIZE               512
+#define        DEFAULT_CD_BLOCKSIZE            2048
 
 #define        MAX_LUNS                        1024
 #define        MAX_NAME_LEN                    223