From 784407f894d426f91f4f7abefe31232eb89897a8 Mon Sep 17 00:00:00 2001 From: Dennis Trinks Date: Thu, 14 Jun 2012 13:03:57 +0200 Subject: [PATCH] not yet tested --- CLIENT_DATA/ms-activation.vbs | 7 +++ CLIENT_DATA/setup32.ins | 101 +++++++++++++++++++++++++++++++++ OPSI/changelog.txt | 2 + OPSI/control | 23 ++++++++ OPSI/postinst | 9 +++ OPSI/preinst | 9 +++ builder-product.cfg | 57 ++++--------------- windows.activation.png.sha1sum | 1 + 8 files changed, 163 insertions(+), 46 deletions(-) create mode 100644 CLIENT_DATA/ms-activation.vbs create mode 100644 CLIENT_DATA/setup32.ins create mode 100644 OPSI/changelog.txt create mode 100644 OPSI/control create mode 100644 OPSI/postinst create mode 100644 OPSI/preinst create mode 100644 windows.activation.png.sha1sum diff --git a/CLIENT_DATA/ms-activation.vbs b/CLIENT_DATA/ms-activation.vbs new file mode 100644 index 0000000..464479b --- /dev/null +++ b/CLIENT_DATA/ms-activation.vbs @@ -0,0 +1,7 @@ +for each Obj in GetObject("winmgmts:{impersonationLevel=impersonate}").InstancesOf("win32_WindowsProductActivation") + if Obj.ActivationRequired <> 0 then + 'If necessary, save/set proxy + Obj.ActivateOnline() + 'If necessary, restore proxy + end if +next \ No newline at end of file diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins new file mode 100644 index 0000000..ff37aa7 --- /dev/null +++ b/CLIENT_DATA/setup32.ins @@ -0,0 +1,101 @@ +; Copyright (c) uib gmbh (www.uib.de) +; This sourcecode is owned by uib +; and published under the Terms of the General Public License. +; credits: http://www.opsi.org/credits/ + +[Actions] +requiredWinstVersion >= "4.10.8.6" + +DefVar $MsiId$ +DefVar $UninstallProgram$ +DefVar $LogDir$ +DefVar $ProductId$ +DefVar $MinimumSpace$ +DefVar $InstallDir$ +DefVar $ExitCode$ +DefVar $LicenseRequired$ +DefVar $LicenseKey$ +DefVar $LicensePool$ + +Set $LogDir$ = "%SystemDrive%\tmp" + +; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh +; and adds the following variables: +; from builder-product.cfg : all variables definded by attribute WINST[index] +; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE +; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL +; auto generated winst-variables +; $IconFile$: path to product picture +; +@@BUILDER_VARIABLES@@ + +; ---------------------------------------------------------------- +; - Please edit the following values - +; ---------------------------------------------------------------- +;$ProductId$ should be the name of the product in opsi +; therefore please: only lower letters, no umlauts, +; no white space use '-' as a seperator +Set $ProductId$ = "windows.activation" +Set $MinimumSpace$ = "1 MB" +; the path were we find the product after the installation +Set $InstallDir$ = "%ProgramFiles32Dir%\" +Set $LicenseRequired$ = "false" +Set $LicensePool$ = "p_" + $ProductId$ +; ---------------------------------------------------------------- + +if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) + LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ + isFatalError + ; Stop process and set installation status to failed +else +# comment "Show product picture" +# ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ + + if FileExists("%ScriptPath%\delsub32.ins") + comment "Start uninstall sub section" + Sub "%ScriptPath%\delsub32.ins" + endif + + Message "Installing " + $ProductId$ + " ..." + + if $LicenseRequired$ = "true" + comment "Licensing required, reserve license and get license key" + Sub_get_licensekey + endif + + + comment "Copy files" + Files_install + + comment "Start setup program" + Winbatch_install + Sub_check_exitcode + + comment "Reboot" + ExitWindows /Reboot + +endif + +[Files_install] +copy "%ScriptPath%\ms-activation.vbs" %System% + +[Winbatch_install] +; Choose one of the following examples as basis for your installation +; You can use $LicenseKey$ var to pass a license key to the installer +; +; === Nullsoft Scriptable Install System ================================================================ + +ms-activation.vbs + +[Sub_check_exitcode] +comment "Test for installation success via exit code" +set $ExitCode$ = getLastExitCode +; informations to exit codes see +; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx +; http://msdn.microsoft.com/en-us/library/aa368542.aspx +if ($ExitCode$ = "0") + comment "Looks good: setup program gives exitcode zero" +else + comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ + isFatalError +endif diff --git a/OPSI/changelog.txt b/OPSI/changelog.txt new file mode 100644 index 0000000..bc69317 --- /dev/null +++ b/OPSI/changelog.txt @@ -0,0 +1,2 @@ +Don't add cahngelog entries here! +It get autogenerated by the opsi-builder.sh \ No newline at end of file diff --git a/OPSI/control b/OPSI/control new file mode 100644 index 0000000..7759f62 --- /dev/null +++ b/OPSI/control @@ -0,0 +1,23 @@ +[Package] +version: RELEASE +depends: +incremental: False + +[Product] +type: localboot +id: windows.activation +name: windows.activation +description: Activating MS-OS (XP/2003) +advice: ADVICE +version: VERSION +priority: PRIORITY +licenseRequired: False +productClasses: +setupScript: setup32.ins +uninstallScript: uninstall32.ins +updateScript: +alwaysScript: +onceScript: +customScript: +userLoginScript: + diff --git a/OPSI/postinst b/OPSI/postinst new file mode 100644 index 0000000..a8e33fc --- /dev/null +++ b/OPSI/postinst @@ -0,0 +1,9 @@ +#! /bin/sh +# +# postinst script for softprod +# This script executes after unpacking files from that archive and registering the product at the server. +# +# The following environment variables can be used to obtain information about the current installation: +# PRODUCT_ID: id of the current product +# CLIENT_DATA_DIR: directory which contains the installed client data +# diff --git a/OPSI/preinst b/OPSI/preinst new file mode 100644 index 0000000..15a5320 --- /dev/null +++ b/OPSI/preinst @@ -0,0 +1,9 @@ +#! /bin/sh +# +# preinst script for softprod +# This script executes before that package will be unpacked from its archive file. +# +# The following environment variables can be used to obtain information about the current installation: +# PRODUCT_ID: id of the current product +# CLIENT_DATA_DIR: directory where client data will be installed +# diff --git a/builder-product.cfg b/builder-product.cfg index 7501b12..404f3f1 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -1,10 +1,10 @@ ############################ # Setup product information ############################ -VENDOR="itwatch.de" -PN="itwatch" -VERSION="4.10.19" -RELEASE="3" +VENDOR="microsoft.com" +PN="windows.activation" +VERSION="1" +RELEASE="1" PRIORITY="0" ADVICE="" @@ -12,6 +12,12 @@ ADVICE="" # Valid value: restricted | public TYPE="public" +DL_FILE[0]="windows.activation.png" +DL_SOURCE[0]="http://www.bitblokes.de/wp-content/uploads/2010/10/openvpn-logo-150x150.png" + +# File array index for the image showing while installing the program +ICON_DL_INDEX=0 + # EXTRACTWITH - defines the used programm for decompression # Valid values: 7zip | unzip # Default value: 7zip @@ -86,45 +92,4 @@ TYPE="public" # Defines the downloader to use to retrieve the SOURCE file # Optional parameter. Valid values: wget|plowdown. Default value: wget # - -DL_FILE[0]="itWatchLogo.jpg" -DL_SOURCE[0]="http://www.itwatch.de/logos/itWatchLogo.jpg" - -DL_FILE[1]="itWESS-Client_German.msi" -DL_SOURCE[1]="http://repos.dtnet.de/itwatch/itwatch/4.10.19/itWESS-Client_German.msi;http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.19/itWESS-Client_German.msi" -DL_ARCH[1]="X86" -DL_WINST_NAME[1]=itWESS - -DL_FILE[2]="itWESS-64bit_German.msi" -DL_SOURCE[2]="http://repos.dtnet.de/itwatch/itwatch/4.10.19/itWESS-64bit_German.msi;http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.19/itWESS-64bit_German.msi" -DL_ARCH[2]="X86_64" -DL_WINST_NAME[2]=itWESS64 - -DL_FILE[3]="AiO-Runtimes-x86-v1.7.1.7z" -DL_SOURCE[3]="http://ftp.computerbase.de/dl-758/weJMhoTGCTbFI5mzRnMlAg/1327825564/AiO-Runtimes-x86-v1.7.1.7z" -DL_ARCH[3]="X86" -DL_DOWNLOADER="wget" -DL_EXTRACT_FORMAT[3]="unzip" -DL_EXTACT_TO[3]="office" - -# File array index for the image showing while installing the program -ICON_DL_INDEX=0 - -######################### -# Setup additional, custom WINST variables -# which will be injected to the *.ins files (replaces token @@BUILDER_VARIABLES@@ ) -# -# The following tokens inside the WINST_VALUE will be replaced dynamically -# -# @DL_EXTRACT_WINST_PATH[]@ : contains the WINST location of the directory, the files from DL_FILE[] was extracted to. -# Sample: -# WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[]@\\svcpack\\aio-runtimes.exe" -# results in "%ScriptPath%\X86_64\svcpack\aio-runtimes.exe" -# -######################### -WINST_NAME[0]="InstallExe" -WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[2]@\\svcpack\\aio-runtimes.exe" - -WINST_NAME[1]="MyVar" -WINST_VALUE[1]="My content" - + \ No newline at end of file diff --git a/windows.activation.png.sha1sum b/windows.activation.png.sha1sum new file mode 100644 index 0000000..81dbb0a --- /dev/null +++ b/windows.activation.png.sha1sum @@ -0,0 +1 @@ +1e55e6d56fd54b044fedb5863e1693e812b776fe /home/dtrinks/.opsi-dist-cache/microsoft.com/windows.activation/1//windows.activation.png