X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fmigrate-4-5.px;h=d3ff796d3ed7d1139edacfebd638746bb8062c5d;hb=f1ba2733d2c58fed90c13e9ae31cb7c1f3c5613e;hp=1e54683ae0333848b26dbd9269678a0387de0590;hpb=7947c0d3d8e4cae18dc55108465eb6fa3b88b5f0;p=collectd.git

diff --git a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
index 1e54683a..d3ff796d 100755
--- a/contrib/migrate-4-5.px
+++ b/contrib/migrate-4-5.px
@@ -32,7 +32,6 @@ use Data::Dumper ();
 use File::Basename ('dirname');
 
 our $InDir = '/var/lib/collectd';
-our $OutDir = '/tmp/collectd-5';
 our $RRDtool = 'rrdtool';
 
 our %TypesCounterToDerive = # {{{
@@ -46,7 +45,6 @@ our %TypesCounterToDerive = # {{{
   connections => ["value"],
   cpu => ["value"],
   current => ["value"],
-  df => ["used", "free"],
   disk_merged => ["read", "write"],
   disk_octets => ["read", "write"],
   disk_ops => ["read", "write"],
@@ -185,6 +183,7 @@ sub handle_file # {{{
     && (!$plugin_inst) && ($type_inst))
   {
     my $dir = join ('/', @path);
+    print "mkdir -p \"$dir/$plugin-$type_inst\"\n";
     print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
   }
 } # }}} sub handle_file
@@ -226,8 +225,6 @@ Valid options are:
 
   --indir <dir>      Source directory
                      Default: $InDir
-  --outdir <dir>     Destination directory
-                     Default: $OutDir
   --rrdtool <path>   Path to the RRDtool binary
                      Default: $RRDtool
 
@@ -236,7 +233,6 @@ EOF
 } # }}} sub exit_usage
 
 GetOptions ("indir|i=s" => \$InDir,
-	"outdir|o=s" => \$OutDir,
         "rrdtool=s" => \$RRDtool,
         "help|h" => \&exit_usage) or exit_usage ();