diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2016-05-20 16:08:24 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-05-20 15:08:24 +0200 |
| commit | f942504e4f74c6d30d7b73cb602517e055f02152 (patch) | |
| tree | 6c171ba5c84f0da2b73079c8ff7ab6061c3901a2 /src/basic | |
| parent | 188d3082037ddba12eae29188022d07216d4424e (diff) | |
basic: remove rm_rf_and_free, add rm_rf_physical_and_free, use rm_rf_physical_and_freep in tests (#3292)
Some distros don't mount /tmp as tmpfs.
For example:
https://lists.ubuntu.com/archives/ubuntu-cloud/2016-January/001009.html
Some tests:
* print 'Attempted to remove disk file system, and we can't allow that.'
* don't really cleanup /tmp
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/rm-rf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/rm-rf.h b/src/basic/rm-rf.h index 40b5b527d5..f693a5bb7c 100644 --- a/src/basic/rm-rf.h +++ b/src/basic/rm-rf.h @@ -32,10 +32,10 @@ int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev); int rm_rf(const char *path, RemoveFlags flags); /* Useful for usage with _cleanup_(), destroys a directory and frees the pointer */ -static inline void rm_rf_and_free(char *p) { +static inline void rm_rf_physical_and_free(char *p) { if (!p) return; - (void) rm_rf(p, REMOVE_ROOT); + (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL); free(p); } -DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rm_rf_and_free); +DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rm_rf_physical_and_free); |