shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

homework: don't bother with BLKRRPART on images that aren't block devices

Browse Source 
We currently call this ioctl even if we are backed by a regular file,
which is actually the common case. While this doesn't really hurt, it
does result in very confusing logs.
This commit is contained in:
Lennart Poettering 2021-10-15 11:23:00 +02:00
parent 0a51337df1
commit 6a1301d8c9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/home/homework-luks.c
View File

@ -2881,7 +2881,7 @@ int home_resize_luks(
if (r > 0)
log_info("Growing of partition completed.");
if (ioctl(image_fd, BLKRRPART, 0) < 0)
if (S_ISBLK(st.st_mode) && ioctl(image_fd, BLKRRPART, 0) < 0)
log_debug_errno(errno, "BLKRRPART failed on block device, ignoring: %m");
/* Tell LUKS about the new bigger size too */
@ -2955,7 +2955,7 @@ int home_resize_luks(
if (r > 0)
log_info("Shrinking of partition completed.");
if (ioctl(image_fd, BLKRRPART, 0) < 0)
if (S_ISBLK(st.st_mode) && ioctl(image_fd, BLKRRPART, 0) < 0)
log_debug_errno(errno, "BLKRRPART failed on block device, ignoring: %m");
} else {
r = home_store_embedded_identity(new_home, setup->root_fd, h->uid, embedded_home);