X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-setup;h=ddff81ef9ce69bec38fcf68b5f6de6f5a1c05285;hb=f6ad19602096411e6248750d840f0a6e2e0ee036;hp=9b16d78cb31273fc387c36765ea9df24f1652c26;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup index 9b16d78cb..ddff81ef9 100755 --- a/FS/bin/freeside-setup +++ b/FS/bin/freeside-setup @@ -3,6 +3,11 @@ #to delay loading dbdef until we're ready BEGIN { $FS::Schema::setup_hack = 1; } +#to allow initial insert +use FS::part_pkg; +$FS::part_pkg::setup_hack = 1; +$FS::part_pkg::setup_hack = 1; + use strict; use vars qw($opt_u $opt_d $opt_v); use Getopt::Std; @@ -20,8 +25,8 @@ die "Not running uid freeside!" unless checkeuid(); # map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib; getopts("u:vd:"); -my $config_dir = shift || 'conf' ; -$config_dir =~ /^([\w.:=]+)$/ +my $config_dir = shift || '%%%DIST_CONF%%%' ; +$config_dir =~ /^([\w.:=\/]+)$/ or die "unacceptable configuration directory name"; $config_dir = $1;