Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[build] Rename iscsiboot => sanbootconf
Note that it is necessary to manually remove the old "iSCSI boot
parameter driver" if upgrading to a newer version of sanbootconf.
  • Loading branch information
Michael Brown committed Oct 22, 2009
1 parent ebb3695 commit f62eb19
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
Binary file not shown.
Binary file modified bin/amd64/setup.exe
Binary file not shown.
Binary file renamed bin/i386/iscsiboot.sys → bin/i386/sanbootconf.sys
Binary file not shown.
Binary file modified bin/i386/setup.exe
Binary file not shown.
24 changes: 12 additions & 12 deletions bin/iscsiboot.inf → bin/sanbootconf.inf
Expand Up @@ -3,17 +3,17 @@ Signature = "$Windows NT$"
Class = System
ClassGUID = {4d36e97d-e325-11ce-bfc1-08002be10318}
Provider = %fensys%
CatalogFile = iscsiboot.cat
DriverVer = 12/01/2008,0.1
CatalogFile = sanbootconf.cat
DriverVer = 22/10/2009,0.2

[Manufacturer]
%fensys% = FenSystems,ntx86,ntamd64

[FenSystems.ntx86]
%iscsiboot% = iscsiboot,ROOT\iscsiboot
%sanbootconf% = sanbootconf,ROOT\sanbootconf

[FenSystems.ntamd64]
%iscsiboot% = iscsiboot,ROOT\iscsiboot
%sanbootconf% = sanbootconf,ROOT\sanbootconf

[SourceDisksNames.x86]
1 = %srcdisk%,,,\i386
Expand All @@ -22,31 +22,31 @@ DriverVer = 12/01/2008,0.1
2 = %srcdisk%,,,\amd64

[SourceDisksFiles.x86]
iscsiboot.sys=1
sanbootconf.sys=1

[SourceDisksFiles.amd64]
iscsiboot.sys=2
sanbootconf.sys=2

[DestinationDirs]
Files.Driver = 12

[Files.Driver]
iscsiboot.sys
sanbootconf.sys

[iscsiboot]
[sanbootconf]
CopyFiles = Files.Driver

[iscsiboot.Services]
AddService = iscsiboot,0x00000002,Service
[sanbootconf.Services]
AddService = sanbootconf,0x00000002,Service

[Service]
ServiceType = 0x1
StartType = 0x0
LoadOrderGroup = Base
ErrorControl = 0x1
ServiceBinary = %12%\iscsiboot.sys
ServiceBinary = %12%\sanbootconf.sys

[Strings]
fensys = "Fen Systems Ltd."
iscsiboot = "iSCSI Boot Driver"
sanbootconf = "SAN Boot Configuration Driver"
srcdisk = "Installation media"
18 changes: 9 additions & 9 deletions driver/iscsiboot.c → driver/sanbootconf.c
Expand Up @@ -31,7 +31,7 @@
#include "ibft.h"

/** Tag to use for memory allocation */
#define ISCSIBOOT_POOL_TAG 'bcsi'
#define SANBOOTCONF_POOL_TAG 'fcbs'

/** Start of region to scan in base memory */
#define BASEMEM_START 0x80000
Expand Down Expand Up @@ -164,7 +164,7 @@ static NTSTATUS fetch_reg_kvi ( HANDLE reg_key, LPCWSTR value_name,

/* Allocate value buffer */
*kvi = ExAllocatePoolWithTag ( NonPagedPool, kvi_len,
ISCSIBOOT_POOL_TAG );
SANBOOTCONF_POOL_TAG );
if ( ! *kvi ) {
DbgPrint ( "Could not allocate KVI for \"%S\": %x\n",
value_name, status );
Expand Down Expand Up @@ -214,7 +214,7 @@ static NTSTATUS fetch_reg_sz ( HANDLE reg_key, LPCWSTR value_name,
/* Allocate and populate string */
value_len = ( kvi->DataLength + sizeof ( value[0] ) );
*value = ExAllocatePoolWithTag ( NonPagedPool, value_len,
ISCSIBOOT_POOL_TAG );
SANBOOTCONF_POOL_TAG );
if ( ! *value ) {
DbgPrint ( "Could not allocate value for \"%S\"\n",
value_name );
Expand Down Expand Up @@ -269,7 +269,7 @@ static NTSTATUS fetch_reg_multi_sz ( HANDLE reg_key, LPCWSTR value_name,
values_len = ( ( ( num_strings + 1 ) * sizeof ( values[0] ) ) +
kvi->DataLength + sizeof ( values[0][0] ) );
*values = ExAllocatePoolWithTag ( NonPagedPool, values_len,
ISCSIBOOT_POOL_TAG );
SANBOOTCONF_POOL_TAG );
if ( ! *values ) {
DbgPrint ( "Could not allocate value array for \"%S\"\n",
value_name );
Expand Down Expand Up @@ -351,7 +351,7 @@ static NTSTATUS reg_store_multi_sz ( HANDLE reg_key, LPCWSTR value_name,

/* Allocate buffer */
values = ExAllocatePoolWithTag ( NonPagedPool, values_len,
ISCSIBOOT_POOL_TAG );
SANBOOTCONF_POOL_TAG );
if ( ! values ) {
DbgPrint ( "Could not allocate value buffer for \"%S\"\n" );
status = STATUS_UNSUCCESSFUL;
Expand Down Expand Up @@ -454,7 +454,7 @@ static NTSTATUS find_ibft ( PIBFT_TABLE *ibft_copy ) {
/* Create copy of iBFT */
*ibft_copy = ExAllocatePoolWithTag ( NonPagedPool,
ibft->acpi.length,
ISCSIBOOT_POOL_TAG );
SANBOOTCONF_POOL_TAG );
if ( ! *ibft_copy ) {
DbgPrint ( "Could not allocate iBFT copy\n" );
status = STATUS_NO_MEMORY;
Expand Down Expand Up @@ -764,7 +764,7 @@ static NTSTATUS store_tcpip_parameters ( PIBFT_NIC nic,
wcslen ( netcfginstanceid ) + 1 ) *
sizeof ( key_name[0] ) );
key_name = ExAllocatePoolWithTag ( NonPagedPool, key_name_len,
ISCSIBOOT_POOL_TAG );
SANBOOTCONF_POOL_TAG );
if ( ! key_name ) {
DbgPrint ( "Could not allocate TCP/IP key name\n" );
status = STATUS_UNSUCCESSFUL;
Expand Down Expand Up @@ -1149,7 +1149,7 @@ NTSTATUS DriverEntry ( IN PDRIVER_OBJECT DriverObject,
PIBFT_TABLE ibft;
NTSTATUS status;

DbgPrint ( "iSCSI Boot Parameter Driver initialising\n" );
DbgPrint ( "SAN Boot Configuration Driver initialising\n" );

/* Scan for iBFT */
status = find_ibft ( &ibft );
Expand All @@ -1175,7 +1175,7 @@ NTSTATUS DriverEntry ( IN PDRIVER_OBJECT DriverObject,
if ( ! NT_SUCCESS ( status ) )
goto err_create_iscsiboot_device;

DbgPrint ( "iSCSI Boot Parameter Driver initialisation complete\n" );
DbgPrint ( "SAN Boot Configuration Driver initialisation complete\n" );

err_create_iscsiboot_device:
err_no_ibft:
Expand Down
4 changes: 2 additions & 2 deletions driver/sources
@@ -1,4 +1,4 @@
TARGETNAME = iscsiboot
TARGETNAME = sanbootconf

TARGETTYPE = DRIVER

Expand All @@ -8,4 +8,4 @@ TARGETLIBS = $(DDK_LIB_PATH)\ndis.lib $(DDK_LIB_PATH)\ntstrsafe.lib $(DDK_LIB_PA

MSC_WARNING_LEVEL = /W4 /Wp64 /WX

SOURCES = iscsiboot.c
SOURCES = sanbootconf.c
12 changes: 6 additions & 6 deletions installer/setup.c
Expand Up @@ -90,7 +90,7 @@ static LONG fix_service_group_order ( void ) {
WCHAR sgo_key_name[] =
L"SYSTEM\\CurrentControlSet\\Control\\ServiceGroupOrder";
WCHAR sgo_value_name[] = L"List";
WCHAR sgo_backup_value_name[] = L"List.pre-iscsiboot";
WCHAR sgo_backup_value_name[] = L"List.pre-sanbootconf";
LPWSTR *sgo;
LONG err;

Expand Down Expand Up @@ -402,12 +402,12 @@ int __cdecl main ( int argc, char **argv ) {
CHAR inf_path[MAX_PATH];
CHAR *file_part;
WCHAR inf_path_w[MAX_PATH];
WCHAR hw_id[] = L"ROOT\\iscsiboot";
WCHAR hw_id[] = L"ROOT\\sanbootconf";
DWORD len;
CHAR key;

printf ( "iSCSI Boot Driver Installation\n" );
printf ( "==============================\n\n" );
printf ( "SAN Boot Configuration Driver Installation\n" );
printf ( "==========================================\n\n" );

/* Check for iSCSI initiator existence */
if ( service_exists ( L"iScsiPrt" ) != 0 ) {
Expand All @@ -428,7 +428,7 @@ int __cdecl main ( int argc, char **argv ) {
if ( file_part )
*file_part = 0;
_snprintf ( inf_rel_path, sizeof ( inf_rel_path ),
"%s\\..\\iscsiboot.inf", bin_path );
"%s\\..\\sanbootconf.inf", bin_path );
len = GetFullPathName ( inf_rel_path, array_size ( inf_path ),
inf_path, NULL );
if ( ( len == 0 ) || ( len >= array_size ( inf_path ) ) )
Expand All @@ -441,7 +441,7 @@ int __cdecl main ( int argc, char **argv ) {
goto fail;

/* Success */
printf ( "iSCSI Boot Driver installed successfully\n" );
printf ( "SAN Boot Configuration Driver installed successfully\n" );

( VOID ) argc;
exit ( EXIT_SUCCESS );
Expand Down

0 comments on commit f62eb19

Please sign in to comment.