diff --git a/Makefile.am b/Makefile.am
index 3cb062409ae882449cb47fc2067f5981789960d0..12ac03f741c814952b63e66e5fb7454ffadffdd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = auxdir src testsuite doc
EXTRA_DIST = \
Make-rpm.mk \
+ etc/bluegene.conf.example \
etc/slurm.conf.example \
etc/init.d.slurm \
etc/ptrace.patch \
diff --git a/etc/bluegene.conf.example b/etc/bluegene.conf.example
new file mode 100644
index 0000000000000000000000000000000000000000..a07b554518ce5200c06483c05511f1885e8e2695
--- /dev/null
+++ b/etc/bluegene.conf.example
@@ -0,0 +1,60 @@
+#
+# Global specifications for BlueGene system
+#
+# BlrtsImage: BlrtsImage used for creation of all bglblocks.
+# LinuxImage: LinuxImage used for creation of all bglblocks.
+# MloaderImage: MloaderImage used for creation of all bglblocks.
+# RamDiskImage: RamDiskImage used for creation of all bglblocks.
+# ChangeNumpsets: Script to reset a created bglblock's Numpsets value.
+# Will be removed when an API is available for this.
+# Default value uses half of available I/O nodes.
+# NOTE: The bgl_serial value is set at configuration time using the
+# "--with-bgl-serial=" option. Its default value is "BGL".
+#
+BlrtsImage=/bgl/BlueLight/ppcfloor/bglsys/bin/rts_hw.rts
+LinuxImage=/bgl/BlueLight/ppcfloor/bglsys/bin/zImage.elf
+MloaderImage=/bgl/BlueLight/ppcfloor/bglsys/bin/mmcs-mloader.rts
+RamDiskImage=/bgl/BlueLight/ppcfloor/bglsys/bin/ramdisk.elf
+#ChangeNumpsets=/etc/slurm/change_numpsets
+
+#
+# Define the static partitions (bglblocks)
+#
+# Nodes: The base partitions (midplanes) in the bglblock using XYZ coordinates
+# Type: Connection type "mesh" or "torus", default is "torus"
+# Use: Node use "virtual" or "coprocessor", by default both are created
+#
+# NOTE: A bglblock is implicitly created containing all resources on the system
+
+# volume = 1x1x1 = 1
+Nodes=bgl[000x000]
+Nodes=bgl[001x001]
+Nodes=bgl[010x010]
+Nodes=bgl[011x011]
+
+# volume = 1x1x2 = 2
+Nodes=bgl[020x021]
+Nodes=bgl[030x031]
+Nodes=bgl[002x003]
+Nodes=bgl[012x013]
+Nodes=bgl[022x023]
+Nodes=bgl[032x033]
+
+# volume 1x2x2 = 4
+Nodes=bgl[100x111]
+Nodes=bgl[120x131]
+Nodes=bgl[102x113]
+Nodes=bgl[122x133]
+
+# volume = 2x2x2 = 8
+Nodes=bgl[200x311]
+Nodes=bgl[220x331]
+Nodes=bgl[220x331]
+Nodes=bgl[202x313]
+Nodes=bgl[222x333]
+
+# volume = 4x4x4 = 64
+Nodes=bgl[400x733]
+
+# volume = 8x4x4 = 128
+# Nodes=bgl[000x733] Implicitly created
diff --git a/slurm.spec.in b/slurm.spec.in
index 20b1da0314d1cbb64642ad84ff87a1c1049087bf..e4770e94eda3b80677b7a68a655c8fb13e0eaaf4 100644
--- a/slurm.spec.in
+++ b/slurm.spec.in
@@ -136,6 +136,7 @@ DESTDIR="$RPM_BUILD_ROOT" make install
install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT/etc/init.d/slurm
install -D -m644 etc/slurm.conf.example $RPM_BUILD_ROOT/etc/slurm/slurm.conf
+install -D -m644 etc/bluegene.conf.example $RPM_BUILD_ROOT/etc/slurm/bluegene.conf
# Delete unpackaged files:
rm -f $RPM_BUILD_ROOT/%{_libdir}/slurm/*.{a,la}
@@ -213,7 +214,9 @@ rm -rf $RPM_BUILD_ROOT
%files bluegene
%defattr(-,root,root)
+%doc etc/bluegene.conf.example
%{_libdir}/slurm/select_bluegene.so
+%config(noreplace) /etc/slurm/bluegene.conf
#############################################################################
%files sched-wiki
@@ -262,8 +265,10 @@ fi
%changelog
+* Thu Feb 24 2005 Morris Jette <jette1@llnl.gov>
+- added bluegene.conf.example to distribution
* Thu Feb 10 2005 Morris Jette <jette1@llnl.gov>
-- disable rpm build termination if unpackaged files found (rpm bug)
+- disable rpm build termination if unpackaged files found (suse rpm bug)
* Wed Jan 02 2005 Morris Jette <jette1@llnl.gov>
- added smap package
* Tue Nov 16 2004 Morris Jette <jette1@llnl.gov>
diff --git a/src/plugins/select/bluegene/README b/src/plugins/select/bluegene/README
deleted file mode 100644
index 5eaed4d3da6d668be2999a9349804bcfdb35c887..0000000000000000000000000000000000000000
--- a/src/plugins/select/bluegene/README
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION
------------
-
-This directory contains the select plugin specific for the Bluegene/L
-(BGL) machine. The task of this plugin is to select the appropriate
-nodes (base partitions) required for running jobs.
-
-CONFIGURATION
--------------
-
-You may specify the type of bgl partitions that were specified in the
-slurm partition file in a bluegene.conf file. Otherwise, the default
-behavior is to sort in decreasing order and try to fit the largest
-size partitions as tori.
-
-Each entry in the configuration file is a set of nodes and their
-desired type. The set of nodes must match a set of nodes specified
-for a BGL partition from within the SLURM partition. E.g. for a SLURM
-partition entry in slurm.conf:
-
- PartitionName=batch222 Nodes=bgl[200x311] MinNodes=8 MaxNodes=8
- PartitionName=batch222 Nodes=bgl[220x331] # Add more nodes
- PartitionName=batch222 Nodes=bgl[202x313] # Add more nodes
- PartitionName=batch222 Nodes=bgl[222x333] # Add more nodes
-
-There may be a corresponding BGL partition specification in the
-bluegene.conf file:
-
- Nodes=bgl[200x311] Type=Mesh
- Nodes=bgl[220x331] Type=Torus
- Nodes=bgl[202x313] Type=Torus
- Nodes=bgl[222x333] Type=Mesh
-
-Note that the node names must be identical in both places.
-String comparison is used and "bgl[000x001]" will not match
-"bgl[000,001]".
-
-The system serial number used in rm_set_serial() may also be
-defined in bluegene.conf using the "Serial=" specification.
-The default value is equivalent to "Serial=BGL".
-
-Note that the configuration specified in this file may not be
-physically possible due to the wiring contraints of the BGL system. A
-tool will be provided that allows an admin to determine what
-configurations are feasible.
-
-
-PROBLEMS --------
-
-If you experience problems compiling, installing, or running this
-plugin please send email to either Dan Phung <phung4@llnl.gov> or
-Morris Jette <jette1@llnl.gov>.
-
-$Id$
diff --git a/src/plugins/select/bluegene/README.dev b/src/plugins/select/bluegene/README.dev
deleted file mode 100644
index e0839bb91ea35fe3e08d702de7d2d81f350c9bc0..0000000000000000000000000000000000000000
--- a/src/plugins/select/bluegene/README.dev
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION
------------
-
-This file contains some (hopefully) helpful information when modifying
-the bluegene select plugin.
-
-Here's the flow of the plugin
-
-init
- doesn't do anything (now, Mon Sep 13 09:54:57 PDT 2004)
-
-select_p_part_init
- reads in bluegene.conf and creates the BGL partitions.
-
-select_p_state_save
- FIXME - saves bluegene state
-
-select_p_state_restore
- FIXME - restores former bluegene state
-
-select_p_node_init
- NO-OP
-
-select_p_job_test
- tests if a partition can satisfy the required resources and assigns
- them accordingly.
-
-select_p_job_init
-select_p_job_fini
- calls CMCS API to initialize/remove job related structures, as
- appropriate.
-
-FIXME - DAN, put more info about what's happening in bluegene.c and
-partition_sys here.
-
-
-PROBLEMS --------
-
-If you experience problems compiling, installing, or running this
-plugin please send email to either Dan Phung <phung4@llnl.gov> or
-Morris Jette <jette@llnl.gov>.
-
-$Id$
diff --git a/src/plugins/select/bluegene/bluegene.conf b/src/plugins/select/bluegene/bluegene.conf
deleted file mode 100644
index df5feb669cd7ca2dd309173cec57ed726b15083d..0000000000000000000000000000000000000000
--- a/src/plugins/select/bluegene/bluegene.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# Sample Bluegene/L plugin configuration file. See README for
-# description. The BGL parititon nodes must match preconfigured SLURM
-# partitions exactly (e.g. "bgl[000x001]" != "bgl[000,001]". Default
-# value for Type is Mesh.
-
-BlrtsImage=/bgl/edi/build/bglsys/bin/rts_hw.rts
-LinuxImage=/bgl/edi/build/bglsys/bin/zImage.elf
-MloaderImage=/bgl/edi/build/bglsys/bin/mmcs-mloader.rts
-RamDiskImage=/bgl/edi/build/bglsys/bin/ramdisk.elf
-Serial=BGL
-
-# volume = 1x1x1 = 1
-Nodes=bgl[000x000] Type=Mesh
-Nodes=bgl[001x001] Type=Mesh
-Nodes=bgl[010x010] Type=Mesh
-Nodes=bgl[011x011] Type=Mesh
-
-# volume = 1x1x2 = 2
-Nodes=bgl[020x021] Type=Mesh
-Nodes=bgl[030x031] Type=Mesh
-Nodes=bgl[002x003] Type=Mesh
-Nodes=bgl[012x013] Type=Mesh
-Nodes=bgl[022x023] Type=Mesh
-Nodes=bgl[032x033] Type=Mesh