X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-setup;h=9b16d78cb31273fc387c36765ea9df24f1652c26;hb=71af306c68c2733bd478d40d949e1cb49bf5eac4;hp=188a1867a2d41e34fef2d1fd61f173ebf99a722d;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 188a1867a..9b16d78cb 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -32,9 +32,7 @@ my($dbdef_file) = "%%%FREESIDE_CONF%%%/dbdef.". datasrc;
 
 ###
 
-#print "\nEnter the maximum username length: ";
-#my($username_len)=&getvalue;
-my $username_len = 32; #usernamemax config file
+my $username_len = 32;
 
 #print "\n\n", <<END, ":";
 #Freeside tracks the RADIUS User-Name, check attribute Password and
@@ -81,7 +79,7 @@ my $username_len = 32; #usernamemax config file
 # create a dbdef object from the old data structure
 ###
 
-my $dbdef = dbdef_dist;
+my $dbdef = dbdef_dist(datasrc);
 
 #important
 $dbdef->save($dbdef_file);
@@ -100,7 +98,6 @@ $FS::UID::callback_hack = 0;
 $|=1;
 
 foreach my $statement ( $dbdef->sql($dbh) ) {
-  warn $statement if $statement =~ /TABLE cdr/;
   $dbh->do( $statement )
     or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
 }
@@ -125,7 +122,7 @@ $FS::UID::callback_hack = 0;
 if (!scalar(qsearch('conf', {}))) {
   my $error = FS::Conf::init_config($config_dir);
   if ($error) {
-    dbh->rollback or die dbh->errstr;
+    $dbh->rollback or die $dbh->errstr;
     die $error;
   }
 }