eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify sysfs helpers.

Browse Source
This commit is contained in:
Milan Broz
2013-06-30 09:04:00 +02:00
parent c3c65ee864
commit 99a2486b09
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tcrypt/tcrypt.c
View File

@@ -565,7 +565,7 @@ int TCRYPT_read_phdr(struct crypt_device *cd,
{
struct device *device = crypt_metadata_device(cd);
ssize_t hdr_size = sizeof(struct tcrypt_phdr);
int devfd = 0, r, bs, partition;
int devfd = 0, r, bs;
assert(sizeof(struct tcrypt_phdr) == 512);
@@ -587,9 +587,7 @@ int TCRYPT_read_phdr(struct crypt_device *cd,
if (lseek(devfd, TCRYPT_HDR_SYSTEM_OFFSET, SEEK_SET) >= 0 &&
read_blockwise(devfd, bs, hdr, hdr_size) == hdr_size) {
r = TCRYPT_init_hdr(cd, hdr, params);
if (r == -EPERM &&
crypt_sysfs_get_partition(device_path(device), &partition) &&
partition)
if (r == -EPERM && crypt_dev_is_partition(device_path(device)))
log_std(cd, _("WARNING: device %s is a partition, for TCRYPT "
"system encryption you usually need to use "
"whole block device path.\n"), device_path(device));