Author: janderwald Date: Mon Oct 30 15:41:17 2006 New Revision: 24661
URL: http://svn.reactos.org/svn/reactos?rev=24661&view=rev Log: - use ReactOS_Debug as a default os when DBG && unattended setup mode is defined - set timeout to zero in unattended mode && DBG defined
Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/usetup.h
Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.c... ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Mon Oct 30 15:41:17 2006 @@ -43,22 +43,48 @@ IniSection = IniCacheAppendSection(IniCache, L"FREELOADER");
- /* DefaultOS=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, +#ifdef DBG + if (IsUnattendedSetup) + { + /* DefaultOS=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"DefaultOS", + L"ReactOS_Debug"); + } + else +#endif + { + /* DefaultOS=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, INSERT_LAST, L"DefaultOS", L"ReactOS"); - - /* Timeout=0 or 10 */ - IniCacheInsertKey(IniSection, + } + +#ifdef DBG + if (IsUnattendedSetup) +#endif + { + /* Timeout=0 for unattended or non debug*/ + IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"TimeOut", -#ifndef DBG L"0"); -#else + } +#ifdef DBG + else + { + /* Timeout=0 or 10 */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"TimeOut", L"10"); + } #endif
/* Create "Display" section */
Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h?... ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Mon Oct 30 15:41:17 2006 @@ -75,6 +75,8 @@
extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; +extern BOOLEAN IsUnattendedSetup; +
#endif /* __USETUP_H__*/