Index: trunk/ippScripts/scripts/dist_make_fileset.pl
===================================================================
--- trunk/ippScripts/scripts/dist_make_fileset.pl	(revision 25572)
+++ trunk/ippScripts/scripts/dist_make_fileset.pl	(revision 25672)
@@ -40,4 +40,5 @@
 # Parse the command-line arguments
 my ($dist_id, $dist_dir, $target_id, $stage, $stage_id, $dest_id, $product_name, $ds_dbhost, $ds_dbname);
+my ($label, $filter);
 my ($dbname, $save_temps, $verbose, $no_update, $logfile);
 
@@ -50,4 +51,6 @@
            'dest_id=s'      => \$dest_id,    # id for the product
            'product_name=s' => \$product_name,  # location of the data store directory for this product
+           'label=s'       => \$label,
+           'filter=s'      => \$filter,
            'ds_dbhost=s'    => \$ds_dbhost,  # database host for the datastore database
            'ds_dbname=s'    => \$ds_dbname,  # database name for the datastore database
@@ -60,5 +63,5 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --dist_id --dist_dir --target_id --stage --stage_id --dest_id --ds_dbhost --ds_dbname",
+pod2usage( -msg => "Required options: --dist_id --dist_dir --target_id --stage --stage_id --label --filter --dest_id --ds_dbhost --ds_dbname",
            -exitval => 3) unless
     defined $dist_id and
@@ -67,4 +70,6 @@
     defined $stage and
     defined $stage_id and
+    defined $label and
+    defined $filter and
     defined $dest_id and
     defined $product_name and
@@ -147,6 +152,5 @@
 
 {
-    # XXX: need to chose an appropriate file set type
-    my $command = "$dsreg --add $fileset_name --product $product_name --type notset --list $listFileName";
+    my $command = "$dsreg --add $fileset_name --product $product_name --type IPP-DIST --list $listFileName";
 
     # the data store will refer to the distribution bundle via symlinks back to distRun.outdir
@@ -157,6 +161,7 @@
 
     $command .= " --ps0 $target_id --ps1 $stage --ps2 $stage_id --ps3 $prod_col_3";
-
-    $command .= " --dbname $ds_dbname";    # XXX: notyet --dbhost $ds_dbhost
+    $command .= " --ps4 $label --ps5 $filter";
+
+    $command .= " --dbname $ds_dbname --dbhost $ds_dbhost";
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =