diff --git a/README.md b/README.md index 45e4645..412d296 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ is prepared, it must be templatized and provisioned as described in the steps. - Encrypts the boot partition with a well-known passphrase -- Patches the system to automatically mount the encyrpted boot parition +- Patches the system to automatically mount the encyrpted boot partition - Installs LSVMLOAD on the EFI System Partition (ESP) - TPM-seals the passphrases and stores them on the ESP - Copies the SHIM and GRUB2 to the encrypted boot partition diff --git a/doc/howto/bootcrypt.txt b/doc/howto/bootcrypt.txt index 003b45e..5a23101 100644 --- a/doc/howto/bootcrypt.txt +++ b/doc/howto/bootcrypt.txt @@ -3,10 +3,10 @@ Encrypting the boot drive on Ubuntu: These steps (followed carefully) encrypt the boot drive and install the Linux Shielded Virtual Machine (LSVM) components. After completing them, -you should be able to reboot into a system with an encrypted boot parition. +you should be able to reboot into a system with an encrypted boot partition. (1) Use the 'bootcrypt' script to convert the /boot partition to an - encrypted parition. Instructions on how to update /etc/crypttab and + encrypted partition. Instructions on how to update /etc/crypttab and /etc/fstab are printed to standard output. (2) Build and install LSVM: diff --git a/doc/lsvm/lsvm.texi b/doc/lsvm/lsvm.texi index db56820..b0f7718 100644 --- a/doc/lsvm/lsvm.texi +++ b/doc/lsvm/lsvm.texi @@ -62,7 +62,7 @@ directly modifying the virtual disk file. @item Replacing the secondary boot loader (e.g., GRUB2) @item Replacing the Linux kernel @item Modifying the intial ramdisk -@item Modifying the root parition +@item Modifying the root partition @end itemize This document explains how LSVM utilizes the capabilities above to provide a diff --git a/lsvmload/bootbio.c b/lsvmload/bootbio.c index c53192e..c1a0a45 100644 --- a/lsvmload/bootbio.c +++ b/lsvmload/bootbio.c @@ -169,7 +169,7 @@ EFI_STATUS WrapBootBIO( goto done; } - /* Copy over media from LUKS parition */ + /* Copy over media from LUKS partition */ Memcpy( &_block_io.media, globals.bootbio->blockIO->Media, @@ -224,7 +224,7 @@ EFI_STATUS WrapBootBIO( } #endif - /* Allocate device path for this new parition */ + /* Allocate device path for this new partition */ if (!(dp = DevPathCreatePseudoPartition( _block_io.media.LastBlock, &guid, @@ -272,7 +272,7 @@ EFI_STATUS WrapBootBIO( } } - /* Add this new parition to the GPT */ + /* Add this new partition to the GPT */ if (AddPartition(L"BOOTFS", &guid, firstLBA, lastLBA) != 0) { LOGE(L"WrapBootBIO(): AddPartition() failed"); diff --git a/lsvmload/devpath.c b/lsvmload/devpath.c index afa5b44..bcb858e 100644 --- a/lsvmload/devpath.c +++ b/lsvmload/devpath.c @@ -215,7 +215,7 @@ EFI_DEVICE_PATH* DevPathCreatePseudoPartition( Memcpy(&hd, &tmp, sizeof(hd)); } - /* Save the highest parition number found so far */ + /* Save the highest partition number found so far */ if (tmp.partitionNumber > hd.partitionNumber) hd.partitionNumber = tmp.partitionNumber; @@ -232,7 +232,7 @@ EFI_DEVICE_PATH* DevPathCreatePseudoPartition( if (!result) goto done; - /* Assign the next available parition number */ + /* Assign the next available partition number */ hd.partitionNumber++; /* Assign sector start and size */ diff --git a/lsvmload/efivfat.c b/lsvmload/efivfat.c index cce570d..cc957ee 100644 --- a/lsvmload/efivfat.c +++ b/lsvmload/efivfat.c @@ -223,7 +223,7 @@ int MapEFIVFAT( /* Apply patches to grub.cfg */ GrubcfgPatch(globals.grubcfgData, globals.grubcfgSize); - /* Create "/EFI//GRUB.CFG" file in embedded-VFAT parition */ + /* Create "/EFI//GRUB.CFG" file in embedded-VFAT partition */ { /* Create a memory block device to be used by VFAT */ if (!(memdev = BlkdevFromMemory((void*)efivfat, efivfat_size))) diff --git a/lsvmload/globals.h b/lsvmload/globals.h index d0c10dd..16e2ccf 100644 --- a/lsvmload/globals.h +++ b/lsvmload/globals.h @@ -69,10 +69,10 @@ typedef struct _Globals /* UUID of the root device */ char rootDevice[GUID_STRING_SIZE]; - /* BIO for LUKS boot parition */ + /* BIO for LUKS boot partition */ EFI_BIO* bootbio; - /* LUKS block device for boot parition */ + /* LUKS block device for boot partition */ Blkdev* bootdev; /* Cache device that bootdev uses */ diff --git a/lsvmload/main.c b/lsvmload/main.c index bfd6a0f..429860a 100644 --- a/lsvmload/main.c +++ b/lsvmload/main.c @@ -214,7 +214,7 @@ EFI_STATUS efi_main(EFI_HANDLE imageHandle, EFI_SYSTEM_TABLE *systemTable) PutProgress(L"Checking boot partition"); - /* Try to unlock the boot parition with the unsealed bootkey */ + /* Try to unlock the boot partition with the unsealed bootkey */ while (globals.bootkeyData) { /* Open the boot file system */ @@ -224,7 +224,7 @@ EFI_STATUS efi_main(EFI_HANDLE imageHandle, EFI_SYSTEM_TABLE *systemTable) globals.bootkeyData, globals.bootkeySize)) != EFI_SUCCESS) { - LOGE(L"failed to open the boot parition"); + LOGE(L"failed to open the boot partition"); Free(globals.bootkeyData); globals.bootkeyData = NULL; globals.bootkeySize = 0; diff --git a/lsvmload/measure.c b/lsvmload/measure.c index e05544a..0528bf0 100644 --- a/lsvmload/measure.c +++ b/lsvmload/measure.c @@ -599,7 +599,7 @@ EFI_STATUS LoadPrefixedFile( /* Check for "boot:" prefix */ if (StrnCmp(path, L"boot:", 5) == 0) { - /* Try to open the BIO for the LUKS parition */ + /* Try to open the BIO for the LUKS partition */ if (!bootfs) { LOGE(L"boot partition unavailable"); diff --git a/lsvmtool/lsvmtoolmain.c b/lsvmtool/lsvmtoolmain.c index 8471cf4..f34de6a 100644 --- a/lsvmtool/lsvmtoolmain.c +++ b/lsvmtool/lsvmtoolmain.c @@ -3669,7 +3669,7 @@ static int _partuuid_command( } else { - fprintf(stderr, "%s: unable to resolve parition UUID\n", argv[0]); + fprintf(stderr, "%s: unable to resolve partition UUID\n", argv[0]); goto done; } @@ -4966,7 +4966,7 @@ static Command _commands[] = }, { "partuuid", - "Find the UUID for this parition", + "Find the UUID for this partition", _partuuid_command, }, { diff --git a/lsvmtool/vfatmain.c b/lsvmtool/vfatmain.c index cb7142b..7bf07ac 100644 --- a/lsvmtool/vfatmain.c +++ b/lsvmtool/vfatmain.c @@ -491,7 +491,7 @@ int vfat_main( if (offset == 0) { - fprintf(stderr, "%s: failed to resolve parition\n", argv[0]); + fprintf(stderr, "%s: failed to resolve partition\n", argv[0]); return 1; } } diff --git a/lsvmutils/luks.c b/lsvmutils/luks.c index 3171036..12b059b 100644 --- a/lsvmutils/luks.c +++ b/lsvmutils/luks.c @@ -788,7 +788,7 @@ BOOLEAN LUKSMatchHeader( /* Fix the byte order of the hader */ LUKSFixByteOrder(&u.header); - /* If unsealed key is the wrong size it is from wrong parition */ + /* If unsealed key is the wrong size it is from wrong partition */ if (masterkeySize != u.header.key_bytes) goto done; @@ -837,7 +837,7 @@ int LUKSFindBootDevice( if (LoadGPT(path, &gpt) != 0) goto done; - /* Try each parition */ + /* Try each partition */ for (i = 0; i < GPT_MAX_ENTRIES && gpt.entries[i].typeGUID1; i++) { char devname[32]; diff --git a/scripts/encryptboot b/scripts/encryptboot index 9af4ec5..8026a36 100755 --- a/scripts/encryptboot +++ b/scripts/encryptboot @@ -35,7 +35,7 @@ patch_crypttab() ### Fail is this is not a LUKS device: cryptsetup isLuks $luksdev if [ "$?" != "0" ]; then - echo "$0: $FUNCNAME(): not a LUKS parition: $luksdev" + echo "$0: $FUNCNAME(): not a LUKS partition: $luksdev" exit 1 fi @@ -182,7 +182,7 @@ backup_boot_directory() ## ## luks_format(bootdev) ## -## Reformat the boot parition as a LUKS partition. +## Reformat the boot partition as a LUKS partition. ## ##============================================================================== @@ -255,14 +255,14 @@ if [ "$?" != "0" ]; then exit 1 fi -### Mount new EXT2 parition: +### Mount new EXT2 partition: mount /dev/mapper/boot /boot if [ "$?" != "0" ]; then echo "$0: failed to mount /dev/mapper/boot" exit 1 fi -### Copy files to new parition: +### Copy files to new partition: ( cd /boot.backup; tar cf - boot ) | (cd /; tar xf - ) ### Remount the ESP: