Changeset 1035

Timestamp:

Jul 12, 2012, 5:43:24 PM (12 years ago)

Author:

joergs

Message:

some Windows 7 system not as expected and return errorcode 0 instead of -1, therefore use registry RebootCounter to cound number of reboots

File:

• opsi/products/bitlocker/CLIENT_DATA/setup.ins (modified) (9 diffs)

opsi/products/bitlocker/CLIENT_DATA/setup.ins

@@ -17 +17 @@
 DefVar $LicenseKey$
 DefVar $LicensePool$
+
+DefVar $RegKeyRebootCounter$
+DefVar $RebootCounter$
+Set    $RegKeyRebootCounter$ = "[HKLM\SOFTWARE\opsi.org\custom\bitlocker]"
+
 
 DefVar $TpmPassword$
@@ -49 +54 @@
         ;       Sub "%ScriptPath%\delsub.ins"
         ;endif
+
+    sub_get_rebootcounter
+    comment "rebootcounter = $RebootCounter$"
+
         
-        Message "Installing " + $ProductId$ + " ..."
+        Message "Installing " + $ProductId$ + ", Counter: " + $RebootCounter$
         
         comment "Start setup program"
@@ -59 +68 @@
         ShellInAnIcon_status winst /sysnative
 
-        winbatch_tpm_activate
-        sub_check_exitcode_tpm_activate
-
-        winbatch_tpm_TakeOwnerShip
-        sub_check_exitcode_tpm_TakeOwnerShip
-
-        winbatch_bitlocker_activate
-        sub_check_exitcode_bitlocker_activate
-
-        ShellInAnIcon_status winst /sysnative
+    if (( $RebootCounter$ = "" ) or ( $RebootCounter$ = "0" ))
+        #winbatch_tpm_activate
+        #sub_check_exitcode_tpm_activate
+        ShellInAnIcon_tpm_activate winst /sysnative
+        set $RebootCounter$ = "1"
+        sub_do_reboot
+    endif
+
+    #winbatch_tpm_TakeOwnerShip
+    #sub_check_exitcode_tpm_TakeOwnerShip
+    ShellInAnIcon_tpm_TakeOwnerShip winst /sysnative
+
+    #winbatch_bitlocker_activate
+    #sub_check_exitcode_bitlocker_activate
+    ShellInAnIcon_tpm_bitlocker_activate winst /sysnative
+    ExitWindows /Reboot
+
+    ShellInAnIcon_status winst /sysnative
 endif
 
@@ -75 +92 @@
 manage-bde -protectors c: -get
 
+[ShellInAnIcon_tpm_activate]
+manage-bde -tpm -TurnOn
+
 [winbatch_tpm_activate]
 manage-bde -tpm -TurnOn
@@ -80 +100 @@
 [sub_check_exitcode_tpm_activate]
 comment "Test exit code"
+# WARNING: 
+#   There are systems, that return 0, even if the TPM is already activated.
+#   This results in an endless loop
+#
 set $ExitCode$ = getLastExitCode
 if ($ExitCode$ = "0")
@@ -94 +118 @@
 
 
+
+[ShellInAnIcon_tpm_TakeOwnerShip]
+manage-bde -tpm -TakeOwnerShip $TpmPassword$
+
 [winbatch_tpm_TakeOwnerShip]
 manage-bde -tpm -TakeOwnerShip $TpmPassword$
@@ -101 +129 @@
 set $ExitCode$ = getLastExitCode
 if ($ExitCode$ = "0")
-        comment "Looks good: setup program gives exitcode zero"
+    comment "Looks good: setup program gives exitcode zero"
 else 
         if ($ExitCode$ = "-1")
                 comment "TPM has an owner. ignored"
         else
-                logError "Fatal: unknown error code ("+$ExitCode$+"), giving up"
-                isFatalError
+        logError "Fatal: unknown error code ("+$ExitCode$+"), giving up"
+        isFatalError
         endif
 endif
+
+[ShellInAnIcon_bitlocker_activate]
+manage-bde -on c: -RecoveryPassword $RecoveryPassword$
 
 [winbatch_bitlocker_activate]
@@ -118 +149 @@
 set $ExitCode$ = getLastExitCode
 if ($ExitCode$ = "0")
-        comment "Looks good: setup program gives exitcode zero"
-        ExitWindows /Reboot
+    comment "Looks good: setup program gives exitcode zero"
+    ExitWindows /Reboot
 else 
-                logError "Fatal: unknown error code ("+$ExitCode$+"), giving up"
-                isFatalError
+    logError "Fatal: unknown error code ("+$ExitCode$+"), giving up"
+    isFatalError
 endif
 
@@ -155 +186 @@
 endif
 
+[sub_get_rebootcounter]
+    Set $RebootCounter$ = GetRegistryStringValue( $RegKeyRebootCounter$ + "RebootCounter")
+    if ( $RebootCounter$ = "" )
+        set $RebootCounter$ = "0"
+    endif
+
+[sub_set_rebootcounter]
+    if ( $RebootCounter$ = "" )
+        set $RebootCounter$ = "0"
+    endif
+    registry_rebootcounter
+
+[sub_do_reboot]
+    sub_set_rebootcounter
+    ExitWindows /ImmediateReboot
+
+[registry_rebootcounter]
+openkey $RegKeyRebootCounter$
+set "RebootCounter" = "$Rebootcounter$"