Skip to content

Revise tpm API, add sanity check for mount proc #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revise tpm API, add sanity check for mount proc #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions part2/stages/Functions/install-main
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ mk_xc_lvm()
{
local PARTITION_DEV="$1"

# Ensure /proc is mounted
if ! mountpoint -q /proc; then
mount -t proc proc /proc || return 1
fi

do_cmd vgchange -a n || return 1

do_cmd pvcreate -ff -y "${PARTITION_DEV}" || return 1
Expand Down
5 changes: 5 additions & 0 deletions part2/stages/Remove-partitions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
. ${DISK_CONF}
# ^^^ defines ${TARGET_DISK}

# Ensure /proc is mounted
if ! mountpoint -q /proc; then
mount -t proc proc /proc || return 1
fi

# Deactivate LVs in all VGs.
do_cmd vgchange -a n >&2

Expand Down
2 changes: 1 addition & 1 deletion part2/stages/TPM-Check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ log_tpm_attrs() {
tpm2=$?
if [ "${tpm2}" -eq 0 ];
then
tpm2_getcap --capability=properties-fixed >&2
tpm2_getcap properties-fixed >&2
else
tpm_version >&2
fi
Expand Down