proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 14:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3322 from brauner/2020-03-24/fixes

Browse Source 
utils: allow removal of immutable files
This commit is contained in:
Stéphane Graber 2020-03-23 11:32:09 -04:00 committed by GitHub
commit e4e80aa9e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lxc/utils.c
View File

@ -19,6 +19,8 @@
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/mount.h> #include <sys/mount.h>
/* Needs to be after sys/mount.h header */
#include <linux/fs.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -129,12 +131,31 @@ static int _recursive_rmdir(const char *dirname, dev_t pdev,
if (_recursive_rmdir(pathname, pdev, exclude, level + 1, onedev) < 0) if (_recursive_rmdir(pathname, pdev, exclude, level + 1, onedev) < 0)
failed = 1; failed = 1;
} else { } else {
if (unlink(pathname) < 0) { ret = unlink(pathname);
if (ret < 0) {
__do_close int fd = -EBADF;
fd = open(pathname, O_RDONLY | O_CLOEXEC | O_NONBLOCK);
if (fd >= 0) {
/* The file might be marked immutable. */
int attr = 0;
ret = ioctl(fd, FS_IOC_GETFLAGS, &attr);
if (ret < 0)
SYSERROR("Failed to retrieve file flags");
attr &= ~FS_IMMUTABLE_FL;
ret = ioctl(fd, FS_IOC_SETFLAGS, &attr);
if (ret < 0)
SYSERROR("Failed to set file flags");
}
ret = unlink(pathname);
if (ret < 0) {
SYSERROR("Failed to delete \"%s\"", pathname); SYSERROR("Failed to delete \"%s\"", pathname);
failed = 1; failed = 1;
} }
} }
} }
}
if (rmdir(dirname) < 0 && !btrfs_try_remove_subvol(dirname) && !hadexclude) { if (rmdir(dirname) < 0 && !btrfs_try_remove_subvol(dirname) && !hadexclude) {
SYSERROR("Failed to delete \"%s\"", dirname); SYSERROR("Failed to delete \"%s\"", dirname);