File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed
Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -125,6 +125,7 @@ if [ "$CONFIG_LINUXBOOT" = "y" ]; then
125125fi
126126
127127# Set GPG_TTY before calling gpg in key-init
128+ # TODO: do better then this; on dual console gpg only interacts with main console (affects Talos-2 and all whiptail variants)
128129export GPG_TTY=/dev/console
129130
130131# Initialize gpnupg with distro/user keys and setup the keyrings
144145# changing the value for the rest of the scripts which source /tmp/config.
145146
146147# Only set CONFIG_TPM and CONFIG_TPM2_TOOLS if they are not already set in /etc/config.user
147- if ! grep -q ' CONFIG_TPM=' /etc/config.user; then
148+ if ! grep -q ' CONFIG_TPM=' /etc/config.user 2> /dev/null ; then
148149 echo " export CONFIG_TPM=\" $CONFIG_TPM \" " >> /etc/config.user
149150fi
150- if ! grep -q ' CONFIG_TPM2_TOOLS=' /etc/config.user; then
151+ if ! grep -q ' CONFIG_TPM2_TOOLS=' /etc/config.user 2> /dev/null ; then
151152 echo " export CONFIG_TPM2_TOOLS=\" $CONFIG_TPM2_TOOLS \" " >> /etc/config.user
152153fi
153154
You can’t perform that action at this time.
0 commit comments