Fixed a minor 'umask' that couldn't have worked.

tcsd.conf

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Trousers daemon, which talks to the TPM (or the TPM emulator).
 # Started directly from tpm-probe.
 
 # Note, this line is modified by chromeos-factoryinstall.ebuild
 # Please do not change without also changing this reference.
 stop on starting halt or starting reboot
 
 respawn
 expect fork
 
 pre-start script
   export TPM_DEVICE_PATH=/dev/tpm  # /dev/tpm0 may not be created yet
 
   # Temporary fix for BIOS bug.  Very Soon[tm] this fix will be in the BIOS.

[diandersAtChromium, 2011/04/04 23:50:15]

I have asked Luigi if this is still needed.

[diandersAtChromium, 2011/04/05 03:10:37]

FYI: this is fixed as <http://crosbug.com/13819>

On 2011/04/04 23:50:15, diandersAtChromium wrote:

   status=$(/usr/bin/tpm_init_temp_fix || true)
   /usr/bin/logger "tpm fix status: $status"
   # end of temporary fix
 
   # If we're booting in recovery mode, first do a sanity check of the TPM and
   # try to bring it to a sane state.  Then clear the TPM owner and lock the
   # TPM down.
   binf1=/sys/devices/platform/chromeos_acpi/BINF.1

[jrbarnette, 2011/04/05 00:52:38]

There should be a bug filed for this obsolete usage of chromeos_acpi;
the preferred idiom for this access is a new command called
cross_system.

[diandersAtChromium, 2011/04/05 03:10:37]

Done.  <http://crosbug.com/13833>.  Do you want to be the owner, or should I
leave it ownerless for now?

On 2011/04/05 00:52:38, jrbarnette wrote:

   if [ -e $binf1 -a "$(cat $binf1)" = "0" ]; then
     /usr/sbin/chromeos-tpm-recovery /var/log/tpm-recovery.log \
         || logger "tpm-recovery: status $?"
     tpmc clear  || logger "tpmc clear:  status $?"
     tpmc enable || logger "tpmc enable: status $?"
     tpmc act    || logger "tpmc act:    status $?"
     tpmc block  || logger "tpmc block:  status $?"
     tpmc pplock || logger "tpmc pplock: status $?"
   fi
 
@@ skipping 11 matching lines @@
          [ ! -s /var/lib/tpm/system.data ]; then
         if [ ! -e /var/lib/tpm ]; then
           mkdir -m 0700 -p /var/lib/tpm
         fi
         current_mask=$(umask)
         umask 0177
         cp --no-preserve=mode /etc/trousers/system.data.auth \
           /var/lib/tpm/system.data
         umask 0133
         touch /var/lib/.tpm_owned
-        umask $(current_mask)
+        umask ${current_mask}

[jrbarnette, 2011/04/05 00:52:38]

Yeesh.  Yes, it was broken.
The impact was more than a syntax error: the failure would
have been something along the lines of "command not found".
This script runs "set -e", so it would have terminated the script
with a non-zero status here, if it executed.

I'm surprised tcsd even starts.  I suspect it works because
upstart respawns the 'pre-start' script, and the broken code
path doesn't execute the second time...

As for the fix:  restoring umask here is pointless; umask is
private to the process, and the process dies when the script
terminates.  I'd recommend deleting this line, rather than
fixing it.

[diandersAtChromium, 2011/04/05 03:10:37]

Done.

       fi
     fi
   fi
 end script
 
 exec /usr/sbin/tcsd