Commit f051cd88 authored by Kirk Webb's avatar Kirk Webb

Disable power managment and system restore on win7

Also rearrange configure.in to produce unattended answer files based on
which Windows keys are present in the defs file.
parent 2059cc21
.merge-build .merge-build
clientside/tmcc/cygwinseven/unattend-7pro-x86.xml.in
...@@ -4892,6 +4892,15 @@ done ...@@ -4892,6 +4892,15 @@ done
# END Python detection. # END Python detection.
# Conditional files created for various versions of Windows
# based on which variables are defined.
# Win7 Pro x86
if test -n ${WINDOWS_KEY_7PRO_X86}; then
cp -f $srcdir/tmcc/cygwinseven/unattend-x86.xml.in.tmpl $srcdir/tmcc/cygwinseven/unattend-7pro-x86.xml.in
winfiles="$winfiles tmcc/cygwinseven/unattend-7pro-x86.xml"
fi
outfiles="Makeconf GNUmakefile setversion \ outfiles="Makeconf GNUmakefile setversion \
lib/GNUmakefile \ lib/GNUmakefile \
lib/libtb/GNUmakefile \ lib/libtb/GNUmakefile \
...@@ -4941,7 +4950,6 @@ outfiles="Makeconf GNUmakefile setversion \ ...@@ -4941,7 +4950,6 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/freebsd9/GNUmakefile tmcc/freebsd9/netif-emulab \ tmcc/freebsd9/GNUmakefile tmcc/freebsd9/netif-emulab \
tmcc/freebsd10/GNUmakefile tmcc/freebsd10/netif-emulab \ tmcc/freebsd10/GNUmakefile tmcc/freebsd10/netif-emulab \
tmcc/cygwinxp/GNUmakefile tmcc/dp/GNUmakefile \ tmcc/cygwinxp/GNUmakefile tmcc/dp/GNUmakefile \
tmcc/cygwinseven/GNUmakefile tmcc/cygwinseven/unattend-x86.xml \
tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \ tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \
tmcc/plab/GNUmakefile tmcc/cygwinseven/GNUmakefile \ tmcc/plab/GNUmakefile tmcc/cygwinseven/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \ os/GNUmakefile os/syncd/GNUmakefile \
......
...@@ -217,6 +217,15 @@ AC_CHECK_HEADERS([Python.h], ...@@ -217,6 +217,15 @@ AC_CHECK_HEADERS([Python.h],
AC_SUBST(PYTHON_INCLUDE) AC_SUBST(PYTHON_INCLUDE)
# END Python detection. # END Python detection.
# Conditional files created for various versions of Windows
# based on which variables are defined.
# Win7 Pro x86
if test -n ${WINDOWS_KEY_7PRO_X86}; then
cp -f $srcdir/tmcc/cygwinseven/unattend-x86.xml.in.tmpl $srcdir/tmcc/cygwinseven/unattend-7pro-x86.xml.in
winfiles="$winfiles tmcc/cygwinseven/unattend-7pro-x86.xml"
fi
outfiles="Makeconf GNUmakefile setversion \ outfiles="Makeconf GNUmakefile setversion \
lib/GNUmakefile \ lib/GNUmakefile \
lib/libtb/GNUmakefile \ lib/libtb/GNUmakefile \
...@@ -266,7 +275,6 @@ outfiles="Makeconf GNUmakefile setversion \ ...@@ -266,7 +275,6 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/freebsd9/GNUmakefile tmcc/freebsd9/netif-emulab \ tmcc/freebsd9/GNUmakefile tmcc/freebsd9/netif-emulab \
tmcc/freebsd10/GNUmakefile tmcc/freebsd10/netif-emulab \ tmcc/freebsd10/GNUmakefile tmcc/freebsd10/netif-emulab \
tmcc/cygwinxp/GNUmakefile tmcc/dp/GNUmakefile \ tmcc/cygwinxp/GNUmakefile tmcc/dp/GNUmakefile \
tmcc/cygwinseven/GNUmakefile tmcc/cygwinseven/unattend-x86.xml \
tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \ tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \
tmcc/plab/GNUmakefile tmcc/cygwinseven/GNUmakefile \ tmcc/plab/GNUmakefile tmcc/cygwinseven/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \ os/GNUmakefile os/syncd/GNUmakefile \
......
...@@ -80,11 +80,17 @@ addreg HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update ...@@ -80,11 +80,17 @@ addreg HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update
runcmd sc.exe ;; config wuauserv start= disabled ;; 0 runcmd sc.exe ;; config wuauserv start= disabled ;; 0
log Disabling hibernate log Disabling hibernate
runcmd powercfg.exe ;; /H off ;; 0 runcmd powercfg.exe ;; -hibernate off ;; 0
log Setting power scheme to "High Performance" (I.e., no power saving)
runcmd powercfg.exe ;; -setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c ;; 0
log Disabling scheduled defragmentation log Disabling scheduled defragmentation
runcmd schtasks.exe ;; /change /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /disable ;; 0 runcmd schtasks.exe ;; /change /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /disable ;; 0
log Disabling System Restore
addreg HKLM\Software\Policies\Microsoft\Windows NT\SystemRestore ;; DisableSR ;; Dword ;; 1
log Enabling Remote Desktop Protocol connections log Enabling Remote Desktop Protocol connections
addreg HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server ;; fDenyTSConnections ;; Dword ;; 0 addreg HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server ;; fDenyTSConnections ;; Dword ;; 0
......
...@@ -17,3 +17,4 @@ THISHOMEBASE=Kwebb.Emulab.Net ...@@ -17,3 +17,4 @@ THISHOMEBASE=Kwebb.Emulab.Net
ELVIN_COMPAT=0 ELVIN_COMPAT=0
PROTOGENI_SUPPORT=0 PROTOGENI_SUPPORT=0
WINDOWS_KEY_7PRO_X86=FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4 WINDOWS_KEY_7PRO_X86=FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4
WINSUPPORT=1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment