[ros-diffs] [khornicek] 55876: [BOOTDATA] Include unattend.inf by default (as it was almost done in r28835). No need to have it "disabled" twice.

Author: khornicek
Date: Sun Feb 26 15:05:59 2012
New Revision: 55876

URL: http://svn.reactos.org/svn/reactos?rev=55876&view=rev
Log:
[BOOTDATA]
Include unattend.inf by default (as it was almost done in r28835). No need to have it
"disabled" twice.

Removed:
    trunk/reactos/boot/bootdata/unattend.inf
Modified:
    trunk/reactos/boot/bootdata/CMakeLists.txt
    trunk/reactos/boot/bootdata/bootcd/unattend.inf
    trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf

Modified: trunk/reactos/boot/bootdata/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t…
==============================================================================
--- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun Feb 26 15:05:59 2012
@@ -51,8 +51,7 @@
 
 #unattend
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION
reactos NO_CAB FOR regtest)
-#uncomment this for unattend bootcd
-#add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos
NO_CAB FOR bootcd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos
NO_CAB FOR bootcd)
 
 #LiveCD shortcuts
 macro(add_livecd_shortcut name app dest)

Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatt…
==============================================================================
--- trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Sun Feb 26 15:05:59 2012
@@ -1,6 +1,4 @@
-; In order to get unattended setup working:
-; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed
-; 2. Uncomment the line in bootdata.rbuild to include it into bootcd
+; Set UnattendSetupEnabled to yes in order to get unattended setup working
 
 [Unattend]
 Signature = "$ReactOS$"
@@ -49,7 +47,7 @@
 ; set this option to automatically
 ; specify language in 2nd mode setup
 ; see hivesys.inf for available languages
-; LocaleID = 407 
+LocaleID = 409
 
 
 ; enable this section to automatically launch programs

Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes…
==============================================================================
--- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Sun Feb 26
15:05:59 2012
@@ -1,6 +1,4 @@
-; In order to get unattended setup working:
-; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed
-; 2. Uncomment the line in bootdata.rbuild to include it into bootcd
+; Set UnattendSetupEnabled to yes in order to get unattended setup working
 
 [Unattend]
 Signature = "$ReactOS$"

Removed: trunk/reactos/boot/bootdata/unattend.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf…
==============================================================================
--- trunk/reactos/boot/bootdata/unattend.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/unattend.inf (removed)
@@ -1,60 +1,0 @@
-; In order to get unattended setup working:
-; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed
-; 2. Uncomment the line in bootdata.rbuild to include it into bootcd
-
-[Unattend]
-Signature = "$ReactOS$"
-
-; yes - unattend setup enabled
-; no - unattend setup disabled
-UnattendSetupEnabled = no
-
-; Install to \Device\Harddisk0\Partition1\ReactOS
-DestinationDiskNumber = 0
-DestinationPartitionNumber = 1
-InstallationDirectory=ReactOS
-
-; MBRInstallType=0  skips MBR installation
-; MBRInstallType=1  install MBR on floppy  
-; MBRInstallType=2  install MBR on hdd
-MBRInstallType=2 
-
-FullName="MyName"
-;OrgName="MyOrg"
-ComputerName="MYCOMPUTERNAME";
-AdminPassword="MyPassword"
-
-; TimeZone is set GMT as default
-TimeZoneIndex=85
-
-; enable this setting to disable daylight saving changes
-; DisableAutoDaylightTimeSet = 1
-
-; enable this setting to format the selected partition
-; 1 - format enabled
-; 0 - format disabled
-FormatPartition=1
-
-; enable this setting to automatically create a partition
-; during installation
-; 1 - enabled
-; 0 - disabled
-AutoPartition = 1
-
-; enable this setting to disable vmware driver install
-; yes - disabled
-; no  - enabled
-DisableVmwInst = yes
-
-; set this option to automatically
-; specify language in 2nd mode setup
-; see hivesys.inf for available languages
-; LocaleID = 407 
-
-
-; enable this section to automatically launch programs
-; after 3rd boot
-;
-; [GuiRunOnce]
-; %SystemRoot%\system32\cmd.exe
-