vm/windows: Remove Samba from installMode.
This should trim down possible dependencies on the base installation and hereby reduce the need for reinstallation of the damn VM to only changes that affect the Windows installation and the base Cygwin + OpenSSH setup. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
fedf13e6cf
commit
a1d7974acd
@ -67,6 +67,19 @@ let
|
||||
|
||||
initScript = writeScript "init.sh" (''
|
||||
#!${stdenv.shell}
|
||||
${coreutils}/bin/cp -L "${sshKey}" /ssh.key
|
||||
${coreutils}/bin/chmod 600 /ssh.key
|
||||
'' + (if installMode then ''
|
||||
echo -n "Waiting for Windows installation to finish..."
|
||||
while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
|
||||
echo -n .
|
||||
# Print a dot every 10 seconds only to shorten line length.
|
||||
${coreutils}/bin/sleep 10
|
||||
done
|
||||
echo " success."
|
||||
# Loop forever, because this VM is going to be killed.
|
||||
${loopForever}
|
||||
'' else ''
|
||||
${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
|
||||
${coreutils}/bin/cat > /etc/samba/smb.conf <<CONFIG
|
||||
[global]
|
||||
@ -92,19 +105,6 @@ let
|
||||
|
||||
${samba}/sbin/nmbd -D
|
||||
${samba}/sbin/smbd -D
|
||||
${coreutils}/bin/cp -L "${sshKey}" /ssh.key
|
||||
${coreutils}/bin/chmod 600 /ssh.key
|
||||
'' + (if installMode then ''
|
||||
echo -n "Waiting for Windows installation to finish..."
|
||||
while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
|
||||
echo -n .
|
||||
# Print a dot every 10 seconds only to shorten line length.
|
||||
${coreutils}/bin/sleep 10
|
||||
done
|
||||
echo " success."
|
||||
# Loop forever, because this VM is going to be killed.
|
||||
${loopForever}
|
||||
'' else ''
|
||||
echo -n "Waiting for Windows VM to become available..."
|
||||
while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
|
||||
echo -n .
|
||||
|
Loading…
Reference in New Issue
Block a user