Commit 4a3216d2 authored by Kirk Webb's avatar Kirk Webb
Browse files

Switch to using custom Emulab ssh package.

Minor fixes to prepare script as well.
parent ebdfb297
......@@ -73,7 +73,7 @@ adduser root ;; %rootpass% ;; makeadmin
log Setting up the clock
addreg HKLM\SYSTEM\CurrentControlSet\Control\TimeZoneInformation ;; RealTimeIsUniversal ;; Dword ;; 1
runcmd w32tm.exe ;; /register
runcmd sc.exe ;; config w32time start= auto ;; 0
runcmd sc.exe ;; config w32time start= auto depend= tcpip ;; 0
runcmd net.exe ;; start w32time
runcmd w32tm.exe ;; /config /manualpeerlist:%ntpserver% /syncfromflags:manual /update
......
......@@ -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,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
defvar cyg_pkgs ;; boost-devel,bison,byacc,cygrunsrv,flex,gawk,gcc4,g++4,inetutils,make,emulab-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
......
......@@ -110,18 +110,18 @@ use Getopt::Std;
if (! getopts($optlist, \%options)) {
usage();
}
if (defined($options{'n'})) {
$noredef = 1;
}
if (defined($options{'p'})) {
$rootpwd = $options{'p'};
} else {
} elsif (!$noredef) {
$rootpwd = get_passwd("root");
}
if (defined($options{'u'})) {
$unattend = $options{'u'};
-f $unattend or die ("$unattend does not exist or is not a file.");
}
if (defined($options{'n'})) {
$noredef = 1;
}
if (defined($options{'s'})) {
$sysprep = 1;
}
......
Supports Markdown
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