diff --git a/etc/bluegene.conf.example b/etc/bluegene.conf.example index f3f89c1ddc49d9ca74dd97a84c7bd58ffa3e706a..cc56c650e1055796c35589e71d4a964d644f03fc 100644 --- a/etc/bluegene.conf.example +++ b/etc/bluegene.conf.example @@ -1,20 +1,20 @@ ############################################################################### # Global specifications for BlueGene system # -# DefaultBlrtsImage: BlrtsImage used for creation of all bgblocks. -# DefaultLinuxImage: LinuxImage used for creation of all bgblocks. -# DefaultMloaderImage: MloaderImage used for creation of all bgblocks. -# DefaultRamDiskImage: RamDiskImage used for creation of all bgblocks. +# BlrtsImage: BlrtsImage used for creation of all bgblocks. +# LinuxImage: LinuxImage used for creation of all bgblocks. +# MloaderImage: MloaderImage used for creation of all bgblocks. +# RamDiskImage: RamDiskImage used for creation of all bgblocks. # # You may add extra images which a user can specify from the srun # command line (see man srun). When adding these images you may also add # a Groups= at the end of the image path to specify which groups can # use the image. # -# BlrtsImage: Alternative BlrtsImage(s). -# LinuxImage: Alternative LinuxImage(s). -# MloaderImage: Alternative MloaderImage(s). -# RamDiskImage: Alternative RamDiskImage(s). +# AltBlrtsImage: Alternative BlrtsImage(s). +# AltLinuxImage: Alternative LinuxImage(s). +# AltMloaderImage: Alternative MloaderImage(s). +# AltRamDiskImage: Alternative RamDiskImage(s). # # LayoutMode: Mode in which slurm will create blocks: # STATIC: Use defined non-overlapping bgblocks @@ -40,29 +40,29 @@ ############################################################################### # These are the default images with are used if the user doesn't specify # which image they want -DefaultBlrtsImage=/bgl/BlueLight/ppcfloor/bglsys/bin/rts_hw.rts -DefaultLinuxImage=/bgl/BlueLight/ppcfloor/bglsys/bin/zImage.elf -DefaultMloaderImage=/bgl/BlueLight/ppcfloor/bglsys/bin/mmcs-mloader.rts -DefaultRamDiskImage=/bgl/BlueLight/ppcfloor/bglsys/bin/ramdisk.elf +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 #Only group jette can use these images -BlrtsImage=/bgl/BlueLight/ppcfloor/bglsys/bin/rts_hw2.rts Groups=jette -LinuxImage=/bgl/BlueLight/ppcfloor/bglsys/bin/zImage2.elf Groups=jette -MloaderImage=/bgl/BlueLight/ppcfloor/bglsys/bin/mmcs-mloader2.rts Groups=jette -RamDiskImage=/bgl/BlueLight/ppcfloor/bglsys/bin/ramdisk2.elf Groups=jette +AltBlrtsImage=/bgl/BlueLight/ppcfloor/bglsys/bin/rts_hw2.rts Groups=jette +AltLinuxImage=/bgl/BlueLight/ppcfloor/bglsys/bin/zImage2.elf Groups=jette +AltMloaderImage=/bgl/BlueLight/ppcfloor/bglsys/bin/mmcs-mloader2.rts Groups=jette +AltRamDiskImage=/bgl/BlueLight/ppcfloor/bglsys/bin/ramdisk2.elf Groups=jette # Since no groups are specified here any user can use them -BlrtsImage=/bgl/BlueLight/ppcfloor/bglsys/bin/rts_hw3.rts -LinuxImage=/bgl/BlueLight/ppcfloor/bglsys/bin/zImage3.elf -MloaderImage=/bgl/BlueLight/ppcfloor/bglsys/bin/mmcs-mloader3.rts -RamDiskImage=/bgl/BlueLight/ppcfloor/bglsys/bin/ramdisk3.elf +AltBlrtsImage=/bgl/BlueLight/ppcfloor/bglsys/bin/rts_hw3.rts +AltLinuxImage=/bgl/BlueLight/ppcfloor/bglsys/bin/zImage3.elf +AltMloaderImage=/bgl/BlueLight/ppcfloor/bglsys/bin/mmcs-mloader3.rts +AltRamDiskImage=/bgl/BlueLight/ppcfloor/bglsys/bin/ramdisk3.elf # Another option for images would be a "You can use anything you like image" * # This allows the user to use any image entered with no security checking -BlrtsImage=* Groups=da:adamb -LinuxImage=* Groups=da:adamb -MloaderImage=* Groups=da:adamb -RamDiskImage=* Groups=da:adamb +AltBlrtsImage=* Groups=da:adamb +AltLinuxImage=* Groups=da:adamb +AltMloaderImage=* Groups=da:adamb +AltRamDiskImage=* Groups=da:adamb LayoutMode=STATIC BasePartitionNodeCnt=512 diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c index dc2e9d7145b4d2922cbc68803580e2fe96c12dc0..375513d66e51d052d252b777e8e69257c27fab6e 100644 --- a/src/plugins/select/bluegene/block_allocator/block_allocator.c +++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c @@ -74,10 +74,10 @@ int DIM_SIZE[BA_SYSTEM_DIMENSIONS] = {0}; #endif s_p_options_t bg_conf_file_options[] = { - {"DefaultBlrtsImage", S_P_STRING}, - {"DefaultLinuxImage", S_P_STRING}, - {"DefaultMloaderImage", S_P_STRING}, - {"DefaultRamDiskImage", S_P_STRING}, + {"BlrtsImage", S_P_STRING}, + {"LinuxImage", S_P_STRING}, + {"MloaderImage", S_P_STRING}, + {"RamDiskImage", S_P_STRING}, {"BridgeAPILogFile", S_P_STRING}, {"RamDiskImage", S_P_STRING}, {"LayoutMode", S_P_STRING}, @@ -88,10 +88,10 @@ s_p_options_t bg_conf_file_options[] = { {"BPs", S_P_ARRAY, parse_blockreq, destroy_blockreq}, /* these are just going to be put into a list that will be freed later don't free them after reading them */ - {"BlrtsImage", S_P_ARRAY, parse_image, NULL}, - {"LinuxImage", S_P_ARRAY, parse_image, NULL}, - {"MloaderImage", S_P_ARRAY, parse_image, NULL}, - {"RamDiskImage", S_P_ARRAY, parse_image, NULL}, + {"AltBlrtsImage", S_P_ARRAY, parse_image, NULL}, + {"AltLinuxImage", S_P_ARRAY, parse_image, NULL}, + {"AltMloaderImage", S_P_ARRAY, parse_image, NULL}, + {"AltRamDiskImage", S_P_ARRAY, parse_image, NULL}, {NULL} };