Commit b7f7cd85 authored by Kirk Webb's avatar Kirk Webb

"Autoconfify" the Windows unattended setup file.

Also add a couple of missing Cygwin packages.
parent 28f86193
......@@ -3,7 +3,7 @@ VERSION export-subst
# that require them should be added to the list below.
clientside/sensors/slothd/idlemon.vbs -crlf
clientside/tmcc/cygwinseven/SetupComplete.cmd -crlf
clientside/tmcc/cygwinseven/unattend-x86.xml -crlf
clientside/tmcc/cygwinseven/unattend-x86.xml.in -crlf
clientside/tmcc/cygwinxp/cygwin-tcsh.bat -crlf
clientside/tmcc/cygwinxp/resolv.conf -crlf
clientside/tmcc/cygwinxp/site-lisp/cygwin-mount.el -crlf
......
......@@ -122,6 +122,14 @@ AC_SUBST(WINSUPPORT)
OUTERBOSS_NODENAME=""
WINSUPPORT=0
#
# Variables for Windows Unattended setup files.
#
AC_SUBST(WINDOWS_ORGNAME)
AC_SUBST(WINDOWS_OWNER)
AC_SUBST(WINDOWS_TIMEZONE)
AC_SUBST(WINDOWS_KEY_7PRO_X86)
#
# Allow tbdefs file that is supplied to full emulab build
#
......@@ -258,6 +266,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/freebsd9/GNUmakefile tmcc/freebsd9/netif-emulab \
tmcc/freebsd10/GNUmakefile tmcc/freebsd10/netif-emulab \
tmcc/cygwinxp/GNUmakefile tmcc/dp/GNUmakefile \
tmcc/cygwinseven/GNUmakefile tmcc/cygwinseven/unattend-x86.xml \
tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \
tmcc/plab/GNUmakefile tmcc/cygwinseven/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
......
......@@ -16,7 +16,7 @@ defvar pubsub_tarball ;; %pubsubsrc%.tar.gz
defvar elabsw ;; %swdir%\Emulab
# The list of Cygwin packages to install.
defvar cyg_pkgs ;; boost-devel,bison,byacc,cygrunsrv,flex,gawk,gcc4,g++4,inetutils,make,openssh,openssl-devel,perl,psmisc,python,shutdown,swig,sysvinit,tcsh,util-linux,w32api,bc,cvs,ed,emacs,file,gdb,git,nano,nc,patch,rcs,rpm,rsync,rxvt,vim,wget,unzip,zip
defvar cyg_pkgs ;; boost-devel,bison,byacc,cygrunsrv,flex,gawk,gcc4,g++4,inetutils,make,openssh,openssl-devel,perl,perl-libwin32,perl_vendor,psmisc,python,shutdown,swig,sysvinit,tcsh,util-linux,w32api,bc,cvs,ed,emacs,file,gdb,git,nano,nc,patch,rcs,rpm,rsync,rxvt,vim,wget,unzip,zip
# Get cygwin user password
readvar sshpass ;; Please supply a password for the Cygwin SSH user ;; secure
......
......@@ -9,14 +9,14 @@
<ProtectYourPC>3</ProtectYourPC>
</OOBE>
<ShowWindowsLive>false</ShowWindowsLive>
<TimeZone>Mountain Standard Time</TimeZone>
<RegisteredOrganization>University of Utah</RegisteredOrganization>
<RegisteredOwner>Flux Research Group</RegisteredOwner>
<TimeZone>@WINDOWS_TIMEZONE@</TimeZone>
<RegisteredOrganization>@WINDOWS_ORGNAME@</RegisteredOrganization>
<RegisteredOwner>@WINDOWS_OWNER@</RegisteredOwner>
<UserAccounts>
<LocalAccounts>
<LocalAccount wcm:action="add">
<Password>
<Value>TgBvAG4AZQAxADIAMwBQAGEAcwBzAHcAbwByAGQA</Value>
<Value>*</Value>
<PlainText>false</PlainText>
</Password>
<Description>Emulab Root Account</Description>
......@@ -37,11 +37,11 @@
</settings>
<settings pass="specialize">
<component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ProductKey>FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4</ProductKey>
<RegisteredOrganization>Emulab</RegisteredOrganization>
<RegisteredOwner></RegisteredOwner>
<ProductKey>@WINDOWS_KEY_7PRO_X86@</ProductKey>
<RegisteredOrganization>@WINDOWS_ORGNAME@</RegisteredOrganization>
<RegisteredOwner>@WINDOWS_OWNER@</RegisteredOwner>
<ShowWindowsLive>false</ShowWindowsLive>
<TimeZone>Mountain Standard Time</TimeZone>
<TimeZone>@WINDOWS_TIMEZONE@</TimeZone>
<ComputerName>*</ComputerName>
<CopyProfile>false</CopyProfile>
</component>
......
......@@ -262,6 +262,10 @@ AC_SUBST(PORTAL_ISPRIMARY)
AC_SUBST(LINUX_FSNODE)
AC_SUBST(VPUBADDR_BASE)
AC_SUBST(VPUBADDR_BITLEN)
AC_SUBST(WINDOWS_ORGNAME)
AC_SUBST(WINDOWS_OWNER)
AC_SUBST(WINDOWS_TIMEZONE)
AC_SUBST(WINDOWS_KEY_7PRO_X86)
#
# Offer both versions of the email addresses that have the @ escaped
......@@ -1279,6 +1283,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/cygwinxp/GNUmakefile clientside/tmcc/dp/GNUmakefile \
clientside/tmcc/openbsd/GNUmakefile clientside/tmcc/ron/GNUmakefile \
clientside/tmcc/plab/GNUmakefile clientside/tmcc/cygwinseven/GNUmakefile \
clientside/tmcc/cygwinseven/unattend-x86.xml \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile \
clientside/os/growdisk/GNUmakefile \
clientside/os/zapdisk/GNUmakefile \
......
......@@ -134,3 +134,14 @@ VPUBADDR_BITLEN=none
# Google Maps API key, for user map
#
GMAP_API_KEY="ABQIAAAAj7GKhM12sdEoFeBl3ZgrMBTW463SEj49ttdeZTAiVv7LYlJDWhST4OC0fd2b1cXRdcdJ35E9koEQSg"
#
# Windows variables
#
WINDOWS_ORGNAME="Some Organization"
WINDOWS_OWNER="Some Owner"
WINDOWS_TIMEZONE="Mountain Standard Time"
#
# Windows License Keys
#
WINDOWS_KEY_7PRO_X86=FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4
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