From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Sep 2009 16:46:35 +0000 (+0200)
Subject: Remove obsolete truncate_on_purge settings
X-Git-Tag: Release-5.0.0~282^2~16^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ff10d6d1ef1bf4e78eedf2fae568d50d2a0cf92;p=bacula%2Fbacula

Remove obsolete truncate_on_purge settings
---

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 2e63db01c8..5969b49eef 100644
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -169,7 +169,6 @@ init_dev(JCR *jcr, DEVRES *device)
    dev->max_spool_size = device->max_spool_size;
    dev->drive_index = device->drive_index;
    dev->autoselect = device->autoselect;
-   dev->truncate_on_purge = device->truncate_on_purge;
    dev->dev_type = device->dev_type;
    dev->init_backend();
    if (dev->is_tape()) { /* No parts on tapes */
diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 50753a939e..f77c18f0d3 100644
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -237,7 +237,6 @@ public:
    int openmode;                      /* parameter passed to open_dev (useful to reopen the device) */
    int dev_type;                      /* device type */
    bool autoselect;                   /* Autoselect in autochanger */
-   bool truncate_on_purge;            /* Truncate this volume when it gets purged? */
    bool initiated;                    /* set when init_dev() called */
    int label_type;                    /* Bacula/ANSI/IBM label types */
    uint32_t drive_index;              /* Autochanger drive index (base 0) */
diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 16bc52f385..11939fb247 100644
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -372,9 +372,6 @@ static void send_device_status(DEVICE *dev, STATUS_PKT *sp)
    len = Mmsg(msg, _("Device parameters:\n"));
    sendit(msg, len, sp);
 
-   len = Mmsg(msg, _("truncate on purge: %d\n"), dev->device->truncate_on_purge);
-   sendit(msg, len, sp);
-
    len = Mmsg(msg, _("Archive name: %s Device name: %s\n"), dev->archive_name(),
       dev->name());
    sendit(msg, len, sp);
diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index 3ea6361f54..813a94c151 100644
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -142,7 +142,6 @@ static RES_ITEM dev_items[] = {
    {"offlineonunmount",      store_bit,  ITEM(res_dev.cap_bits), CAP_OFFLINEUNMOUNT, ITEM_DEFAULT, 0},
    {"blockchecksum",         store_bit,  ITEM(res_dev.cap_bits), CAP_BLOCKCHECKSUM, ITEM_DEFAULT, 1},
    {"autoselect",            store_bool, ITEM(res_dev.autoselect), 1, ITEM_DEFAULT, 1},
-   {"truncateonpurge",       store_bool, ITEM(res_dev.truncate_on_purge), 1, ITEM_DEFAULT, 0},
    {"changerdevice",         store_strname,ITEM(res_dev.changer_name), 0, 0, 0},
    {"changercommand",        store_strname,ITEM(res_dev.changer_command), 0, 0, 0},
    {"alertcommand",          store_strname,ITEM(res_dev.alert_command), 0, 0, 0},
diff --git a/bacula/src/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index 47c7ea6b64..7972f80c68 100644
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -127,7 +127,6 @@ public:
    uint32_t dev_type;                 /* device type */
    uint32_t label_type;               /* label type */
    bool autoselect;                   /* Automatically select from AutoChanger */
-   bool truncate_on_purge;            /* Truncate this volume when it gets purged? */
    uint32_t drive_index;              /* Autochanger drive index */
    uint32_t cap_bits;                 /* Capabilities of this device */
    utime_t max_changer_wait;          /* Changer timeout */