[build] Rename iscsiboot => sanbootconf
authorMichael Brown <mcb30@etherboot.org>
Thu, 22 Oct 2009 19:25:39 +0000 (20:25 +0100)
committerMichael Brown <mcb30@etherboot.org>
Thu, 22 Oct 2009 19:26:07 +0000 (20:26 +0100)
Note that it is necessary to manually remove the old "iSCSI boot
parameter driver" if upgrading to a newer version of sanbootconf.

bin/amd64/sanbootconf.sys [moved from bin/amd64/iscsiboot.sys with 85% similarity]
bin/amd64/setup.exe
bin/i386/sanbootconf.sys [moved from bin/i386/iscsiboot.sys with 95% similarity]
bin/i386/setup.exe
bin/sanbootconf.inf [moved from bin/iscsiboot.inf with 59% similarity]
driver/sanbootconf.c [moved from driver/iscsiboot.c with 98% similarity]
driver/sources
installer/setup.c

similarity index 85%
rename from bin/amd64/iscsiboot.sys
rename to bin/amd64/sanbootconf.sys
index 440d19c..ce5a1d0 100755 (executable)
Binary files a/bin/amd64/iscsiboot.sys and b/bin/amd64/sanbootconf.sys differ
index 49cf404..aa9e85c 100755 (executable)
Binary files a/bin/amd64/setup.exe and b/bin/amd64/setup.exe differ
similarity index 95%
rename from bin/i386/iscsiboot.sys
rename to bin/i386/sanbootconf.sys
index 104965a..1855c2e 100755 (executable)
Binary files a/bin/i386/iscsiboot.sys and b/bin/i386/sanbootconf.sys differ
index bf57866..ae7fb87 100755 (executable)
Binary files a/bin/i386/setup.exe and b/bin/i386/setup.exe differ
similarity index 59%
rename from bin/iscsiboot.inf
rename to bin/sanbootconf.inf
index 5d7dd8e..b3c3f6a 100644 (file)
@@ -3,17 +3,17 @@ Signature = "$Windows NT$"
 Class = System\r
 ClassGUID = {4d36e97d-e325-11ce-bfc1-08002be10318}\r
 Provider = %fensys%\r
-CatalogFile = iscsiboot.cat\r
-DriverVer = 12/01/2008,0.1\r
+CatalogFile = sanbootconf.cat\r
+DriverVer = 22/10/2009,0.2\r
 \r
 [Manufacturer]\r
 %fensys% = FenSystems,ntx86,ntamd64\r
 \r
 [FenSystems.ntx86]\r
-%iscsiboot% = iscsiboot,ROOT\iscsiboot\r
+%sanbootconf% = sanbootconf,ROOT\sanbootconf\r
 \r
 [FenSystems.ntamd64]\r
-%iscsiboot% = iscsiboot,ROOT\iscsiboot\r
+%sanbootconf% = sanbootconf,ROOT\sanbootconf\r
 \r
 [SourceDisksNames.x86]\r
 1 = %srcdisk%,,,\i386\r
@@ -22,31 +22,31 @@ DriverVer = 12/01/2008,0.1
 2 = %srcdisk%,,,\amd64\r
 \r
 [SourceDisksFiles.x86]\r
-iscsiboot.sys=1\r
+sanbootconf.sys=1\r
 \r
 [SourceDisksFiles.amd64]\r
-iscsiboot.sys=2\r
+sanbootconf.sys=2\r
 \r
 [DestinationDirs]\r
 Files.Driver = 12\r
 \r
 [Files.Driver]\r
-iscsiboot.sys\r
+sanbootconf.sys\r
 \r
-[iscsiboot]\r
+[sanbootconf]\r
 CopyFiles = Files.Driver\r
 \r
-[iscsiboot.Services]\r
-AddService = iscsiboot,0x00000002,Service\r
+[sanbootconf.Services]\r
+AddService = sanbootconf,0x00000002,Service\r
 \r
 [Service]\r
 ServiceType = 0x1\r
 StartType = 0x0\r
 LoadOrderGroup = Base\r
 ErrorControl = 0x1\r
-ServiceBinary = %12%\iscsiboot.sys\r
+ServiceBinary = %12%\sanbootconf.sys\r
 \r
 [Strings]\r
 fensys = "Fen Systems Ltd."\r
-iscsiboot = "iSCSI Boot Driver"\r
+sanbootconf = "SAN Boot Configuration Driver"\r
 srcdisk = "Installation media"\r
similarity index 98%
rename from driver/iscsiboot.c
rename to driver/sanbootconf.c
index fd74077..fdc28e2 100644 (file)
@@ -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
@@ -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 );
@@ -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 );
@@ -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 );
@@ -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;
@@ -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;
@@ -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;
@@ -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 );
@@ -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:
index bec6af3..cad091b 100644 (file)
@@ -1,4 +1,4 @@
-TARGETNAME = iscsiboot
+TARGETNAME = sanbootconf
 
 TARGETTYPE = DRIVER
 
@@ -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
index c61c6f8..9afbdf4 100644 (file)
@@ -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;
 
@@ -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 ) {
@@ -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 ) ) )
@@ -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 );