mirror of
https://github.com/dockur/windows.git
synced 2026-08-03 12:37:20 +01:00
fix: Do not set computername if not explictly provided (#1922)
This commit is contained in:
+3
-5
@@ -1338,10 +1338,7 @@ validateComputerName() {
|
||||
|
||||
local value="$1"
|
||||
|
||||
if [ -z "$value" ]; then
|
||||
value="$APP"
|
||||
HOST="$value"
|
||||
fi
|
||||
[ -z "$value" ] && return 0
|
||||
|
||||
if [ "${#value}" -gt 15 ]; then
|
||||
error "The HOST variable cannot contain more than 15 characters!"
|
||||
@@ -1764,13 +1761,14 @@ prepareInstall() {
|
||||
local username="${USERNAME:-Docker}"
|
||||
local password="${PASSWORD:-admin}"
|
||||
local workgroup="${WORKGROUP:-WORKGROUP}"
|
||||
|
||||
local sifHost sifUsername sifPassword sifOrganization sifWorkgroup
|
||||
local regUsername regPassword
|
||||
|
||||
validateLegacyUsername "$username" "$desc" || return 1
|
||||
validatePassword "$password" "$desc" || return 1
|
||||
|
||||
sifHost=$(escapeSIFValue "$HOST") || return 1
|
||||
sifHost=$(escapeSIFValue "${HOST:-*}") || return 1
|
||||
sifUsername=$(escapeSIFValue "$username") || return 1
|
||||
sifPassword=$(escapeSIFValue "$password") || return 1
|
||||
sifOrganization=$(escapeSIFValue "$APP for $ENGINE") || return 1
|
||||
|
||||
+7
-4
@@ -1184,9 +1184,9 @@ updateXML() {
|
||||
|
||||
local asset="$1"
|
||||
local language="$2"
|
||||
local app value culture region keyboard edition key
|
||||
local app value culture region keyboard edition
|
||||
local user user_xml auth_user admin pass pw
|
||||
local domain qualifier host workgroup
|
||||
local domain qualifier host workgroup key
|
||||
|
||||
[ -z "$WIDTH" ] && WIDTH="1280"
|
||||
[ -z "$HEIGHT" ] && HEIGHT="720"
|
||||
@@ -1199,10 +1199,8 @@ updateXML() {
|
||||
validatePassword "$PASSWORD" || return 1
|
||||
|
||||
app=$(escapeXMLSed "$APP for $ENGINE") || return 1
|
||||
host=$(escapeXMLSed "$HOST") || return 1
|
||||
|
||||
sed -i "s|>Windows for Docker<|>$app<|g" "$asset" || return 1
|
||||
sed -i -E "s|<ComputerName>[^<]*</ComputerName>|<ComputerName>$host</ComputerName>|g" "$asset" || return 1
|
||||
sed -i -E "s|<VerticalResolution>[^<]*</VerticalResolution>|<VerticalResolution>$HEIGHT</VerticalResolution>|g" "$asset" || return 1
|
||||
sed -i -E "s|<HorizontalResolution>[^<]*</HorizontalResolution>|<HorizontalResolution>$WIDTH</HorizontalResolution>|g" "$asset" || return 1
|
||||
|
||||
@@ -1231,6 +1229,11 @@ updateXML() {
|
||||
sed -i "s|<InputLocale>0409:00000409</InputLocale>|<InputLocale>$value</InputLocale>|g" "$asset" || return 1
|
||||
fi
|
||||
|
||||
if [ -n "$HOST" ]; then
|
||||
host=$(escapeXMLSed "$HOST") || return 1
|
||||
sed -i -E "s|<ComputerName>[^<]*</ComputerName>|<ComputerName>$host</ComputerName>|g" "$asset" || return 1
|
||||
fi
|
||||
|
||||
domain="$DOMAIN"
|
||||
workgroup="$WORKGROUP"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user