[INF]

- Properly set svn:eol-style. These files are text, so they shouldn't be marked as binary, and they need to have CRLF line endings since they go on the iso.

svn path=/trunk/; revision=75704

diff --git a/reactos/media/inf/defltws.inf b/reactos/media/inf/defltws.inf
index cccca5b..c3b6974 100644 (file)
--- a/reactos/media/inf/defltws.inf
+++ b/reactos/media/inf/defltws.inf
@@ -1,46 +1,46 @@
-; defltws.inf
-; Default security settings for ReactOS Workstation
-
-[Version]
-Signature = "$Windows NT$"
-
-[Privilege Rights]
-SeAssignPrimaryTokenPrivilege = *S-1-5-19, *S-1-5-20
-SeAuditPrivilege = *S-1-5-19, *S-1-5-20
-SeBackupPrivilege = *S-1-5-32-544
-SeBatchLogonRight = 
-SeChangeNotifyPrivilege = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545
-SeCreatePagefilePrivilege = *S-1-5-32-544
-SeCreateGlobalPrivilege = *S-1-5-4, *S-1-5-6, *S-1-5-32-544
-SeCreatePermanentPrivilege =
-SeCreateTokenPrivilege =
-SeDebugPrivilege = *S-1-5-32-544
-SeDenyBatchLogonRight =
-SeDenyInteractiveLogonRight =
-SeDenyNetworkLogonRight =
-SeDenyRemoteInteractiveLogonRight =
-SeDenyServiceLogonRight =
-SeEnableDelegationPrivilege =
-SeImpersonatePrivilege = *S-1-5-6, *S-1-5-32-544
-SeIncreaseBasePriorityPrivilege = *S-1-5-32-544
-SeIncreaseQuotaPrivilege = *S-1-5-19, *S-1-5-20, *S-1-5-32-544
-SeInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551
-SeLoadDriverPrivilege = *S-1-5-32-544
-SeLockMemoryPrivilege =
-SeMachineAccountPrivilege =
-SeManageVolumePrivilege = *S-1-5-32-544
-SeNetworkLogonRight =  *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551
-SeProfileSingleProcessPrivilege = *S-1-5-32-544
-SeRemoteInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-555
-SeRemoteShutdownPrivilege = *S-1-5-32-544
-SeRestorePrivilege = *S-1-5-32-544
-SeSecurityPrivilege = *S-1-5-32-544
-SeServiceLogonRight =
-SeShutdownPrivilege = *S-1-5-32-544, *S-1-5-32-545
-SeSyncAgentPrivilege =
-SeSystemEnvironmentPrivilege = *S-1-5-32-544
-SeSystemProfilePrivilege = *S-1-5-32-544
-SeSystemTimePrivilege = *S-1-5-32-544
-SeTakeOwnershipPrivilege = *S-1-5-32-544
-SeTcbPrivilege =
-SeUndockPrivilege = *S-1-5-32-544, *S-1-5-32-545
+; defltws.inf\r
+; Default security settings for ReactOS Workstation\r
+\r
+[Version]\r
+Signature = "$Windows NT$"\r
+\r
+[Privilege Rights]\r
+SeAssignPrimaryTokenPrivilege = *S-1-5-19, *S-1-5-20\r
+SeAuditPrivilege = *S-1-5-19, *S-1-5-20\r
+SeBackupPrivilege = *S-1-5-32-544\r
+SeBatchLogonRight = \r
+SeChangeNotifyPrivilege = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545\r
+SeCreatePagefilePrivilege = *S-1-5-32-544\r
+SeCreateGlobalPrivilege = *S-1-5-4, *S-1-5-6, *S-1-5-32-544\r
+SeCreatePermanentPrivilege =\r
+SeCreateTokenPrivilege =\r
+SeDebugPrivilege = *S-1-5-32-544\r
+SeDenyBatchLogonRight =\r
+SeDenyInteractiveLogonRight =\r
+SeDenyNetworkLogonRight =\r
+SeDenyRemoteInteractiveLogonRight =\r
+SeDenyServiceLogonRight =\r
+SeEnableDelegationPrivilege =\r
+SeImpersonatePrivilege = *S-1-5-6, *S-1-5-32-544\r
+SeIncreaseBasePriorityPrivilege = *S-1-5-32-544\r
+SeIncreaseQuotaPrivilege = *S-1-5-19, *S-1-5-20, *S-1-5-32-544\r
+SeInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551\r
+SeLoadDriverPrivilege = *S-1-5-32-544\r
+SeLockMemoryPrivilege =\r
+SeMachineAccountPrivilege =\r
+SeManageVolumePrivilege = *S-1-5-32-544\r
+SeNetworkLogonRight =  *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551\r
+SeProfileSingleProcessPrivilege = *S-1-5-32-544\r
+SeRemoteInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-555\r
+SeRemoteShutdownPrivilege = *S-1-5-32-544\r
+SeRestorePrivilege = *S-1-5-32-544\r
+SeSecurityPrivilege = *S-1-5-32-544\r
+SeServiceLogonRight =\r
+SeShutdownPrivilege = *S-1-5-32-544, *S-1-5-32-545\r
+SeSyncAgentPrivilege =\r
+SeSystemEnvironmentPrivilege = *S-1-5-32-544\r
+SeSystemProfilePrivilege = *S-1-5-32-544\r
+SeSystemTimePrivilege = *S-1-5-32-544\r
+SeTakeOwnershipPrivilege = *S-1-5-32-544\r
+SeTcbPrivilege =\r
+SeUndockPrivilege = *S-1-5-32-544, *S-1-5-32-545\r

diff --git a/reactos/media/inf/syssetup.inf.tpl b/reactos/media/inf/syssetup.inf.tpl
index 16ee81c..610d313 100644 (file)
--- a/reactos/media/inf/syssetup.inf.tpl
+++ b/reactos/media/inf/syssetup.inf.tpl
@@ -14,7 +14,7 @@ ClassGUID={00000000-0000-0000-0000-000000000000}
 [DeviceInfsToInstall]\r
 ; MS uses netnovel.inf as class-installer INF for NICs\r
 ; we use a separate one to keep things clean\r
-battery.inf
+battery.inf\r
 bth.inf\r
 cdrom.inf\r
 cpu.inf\r