From 6ee9955d458ee254fa3235e206edd7cb6761a1f6 Mon Sep 17 00:00:00 2001 From: Dennis Trinks Date: Thu, 12 Apr 2012 20:37:44 +0200 Subject: [PATCH] added local admin pw property, translation comments/properties --- CLIENT_DATA/setup32.ins | 11 +++++++---- OPSI/control | 21 +++++++++++++++------ builder-product.cfg | 2 +- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 099a8a7..647f4ad 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -6,9 +6,10 @@ [Actions] requiredWinstVersion >= "4.10.8.6" -DefVar $namedomaene$ +DefVar $domainname$ DefVar $joinadmin$ DefVar $joinadminpw$ +DefVar $localadminpw$ DefVar $joinstr$ DefVar $MsiId$ DefVar $UninstallProgram$ @@ -22,10 +23,11 @@ DefVar $LicenseKey$ DefVar $LicensePool$ Set $LogDir$ = "%SystemDrive%\tmp" -Set $namedomaene$ = GetProductProperty ("namedomaene","values") +Set $domainname$ = GetProductProperty ("domainname","values") Set $joinadmin$ = GetProductProperty ("joinadmin","values") Set $joinadminpw$ = GetProductProperty ("joinadminpw","values") -Set $joinstr$ = "JOIN %PCName% /Domain:" + $namedomaene$ + " /UserD:" + $joinadmin$ + " /PasswordD:" + $joinadminpw$ +Set $joinstr$ = "JOIN %PCName% /Domain:" + $domainname$ + " /UserD:" + $joinadmin$ + " /PasswordD:" + $joinadminpw$ +Set $localadminpw$ = GetProductProperty ("localadminpw","values") ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; and adds the following variables: @@ -85,7 +87,7 @@ else endif [Files_install] -copy "%ScriptPath%\netdom.exe" %System% +copy "%ScriptPath%\custom\netdom.exe" %System% [Winbatch_install] ; Choose one of the following examples as basis for your installation @@ -93,5 +95,6 @@ copy "%ScriptPath%\netdom.exe" %System% ; ; === Nullsoft Scriptable Install System ================================================================ +net user Administrator $localadminpw$ netdom.exe $joinstr$ diff --git a/OPSI/control b/OPSI/control index cb1a639..06d3bfb 100644 --- a/OPSI/control +++ b/OPSI/control @@ -7,7 +7,7 @@ incremental: False type: localboot id: windows-domainjoin name: windows-domainjoin -description: Paket um PC in Domaene aufzunehmen +description: Package for domainjoin and setting local adminpassword advice: ADVICE version: VERSION priority: PRIORITY @@ -32,10 +32,10 @@ userLoginScript: [ProductProperty] type: unicode -name: namedomaene +name: domainname multivalue: False editable: True -description: Name der Domaene der PC beitreten soll +description: Domain PC joins values: [""] default: ["DomainName"] @@ -44,7 +44,7 @@ type: unicode name: joinadmin multivalue: False editable: True -description: Accountname mit Berechtigung PC in Domaene aufzunehmen +description: Accountname privileged for domainjoin values: [""] default: ["JoinAdmin"] @@ -53,6 +53,15 @@ type: unicode name: joinadminpw multivalue: False editable: True -description: Passwort Accountname mit Berechtigung PC in Domaene aufzunehmen +description: Password for privileged account values: [""] -default: ["JoinAdminPW"] \ No newline at end of file +default: ["JoinAdminPW"] + +[ProductProperty] +type: unicode +name: localadminpw +multivalue: False +editable: True +description: Local Administrator password +values: [""] +default: [""] \ No newline at end of file diff --git a/builder-product.cfg b/builder-product.cfg index e3e89f7..0ff2b31 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -6,7 +6,7 @@ PN="windows-domainjoin" VERSION="1" RELEASE="1" PRIORITY="0" -ADVICE="Pflichtfelder: Name Domaene / Join Admin / Join Admin PW" +ADVICE="Mandatory items: domainname / joinadmin / joinadminpw / localadminpw" # TYPE - defines, if the install files are public or restricted. # Valid value: restricted | public