Skip to content

Commit

Permalink
Merge pull request #491 from tlaurion/gpg2_dynamic_tty
Browse files Browse the repository at this point in the history
Set GPG_TTY before calling gpg in key-init
  • Loading branch information
tlaurion authored Jan 26, 2019
2 parents 478af24 + 186d211 commit 5eeb78b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions initrd/init
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ echo "hello world" > /dev/ttyprintk
# Setup our path
export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin

#export GPG_TTY STATICALLY (NEED TO FIX)
export GPG_TTY=/dev/console

# This is the very first script invoked by the Linux kernel and is
# running out of the ram disk. There are no fileysstems mounted.
# It is important to have a way to invoke a recovery shell in case
Expand Down Expand Up @@ -60,6 +57,10 @@ fi
if [ "$CONFIG_LINUXBOOT" = "y" ]; then
/bin/uefi-init
fi

# Set GPG_TTY before calling gpg in key-init
export GPG_TTY=$(tty)

/bin/key-init

# Setup recovery serial shell
Expand Down

0 comments on commit 5eeb78b

Please sign in to comment.