Commit 45a6d71d authored by Kirk Webb's avatar Kirk Webb

Merge branch 'win7devel' of git-public:/flux/git/users/kwebb/emulab-devel into win7devel

Conflicts:
	clientside/tmcc/cygwinseven/hookservices
	clientside/tmcc/cygwinseven/prepare
parents 70d646a6 b918ba12
......@@ -127,7 +127,6 @@ if (os_accounts_sync() != 0) {
exit 1;
}
# Set the root password to make sure it matches. We also set this to be
# the Administrator password, to match the sysprep.inf file entry below.
print "\nSetting root password.\n";
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......
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