jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

database: refactor mounting and unmounting /proc

cute-signatures
Ariadne Conill 2021-12-28 16:50:25 -06:00 committed by Timo Teräs
parent dfe2e141ca
commit 10b26851a4
1 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/database.c
View File

@ -1544,6 +1544,37 @@ static void remount_cache(struct apk_database *db)
db->cache_remount_dir = NULL; db->cache_remount_dir = NULL;
} }
} }
static int mount_proc(struct apk_database *db)
{
struct statfs stfs;
/* mount /proc */
if (asprintf(&db->root_proc_dir, "%s/proc", db->ctx->root) == -1)
return -1;
if (statfs(db->root_proc_dir, &stfs) != 0) {
if (errno == ENOENT) mkdir(db->root_proc_dir, 0555);
stfs.f_type = 0;
}
if (stfs.f_type != PROC_SUPER_MAGIC) {
mount("proc", db->root_proc_dir, "proc", 0, 0);
} else {
/* was already mounted. prevent umount on close */
free(db->root_proc_dir);
db->root_proc_dir = NULL;
}
return 0;
}
static void unmount_proc(struct apk_database *db)
{
if (db->root_proc_dir) {
umount2(db->root_proc_dir, MNT_DETACH|UMOUNT_NOFOLLOW);
free(db->root_proc_dir);
db->root_proc_dir = NULL;
}
}
#else #else
static int detect_tmpfs_root(struct apk_database *db) static int detect_tmpfs_root(struct apk_database *db)
{ {
@ -1560,6 +1591,17 @@ static void remount_cache(struct apk_database *db)
{ {
(void) db; (void) db;
} }
static int mount_proc(struct apk_database *db)
{
(void) db;
return 0;
}
static void unmount_proc(struct apk_database *db)
{
(void) db;
}
#endif #endif
void apk_db_init(struct apk_database *db) void apk_db_init(struct apk_database *db)
@ -1646,20 +1688,8 @@ int apk_db_open(struct apk_database *db, struct apk_ctx *ac)
sigaction(SIGALRM, &old_sa, NULL); sigaction(SIGALRM, &old_sa, NULL);
} }
/* mount /proc */ if (mount_proc(db) < 0)
if (asprintf(&db->root_proc_dir, "%s/proc", db->ctx->root) == -1)
goto ret_errno; goto ret_errno;
if (statfs(db->root_proc_dir, &stfs) != 0) {
if (errno == ENOENT) mkdir(db->root_proc_dir, 0555);
stfs.f_type = 0;
}
if (stfs.f_type != PROC_SUPER_MAGIC) {
mount("proc", db->root_proc_dir, "proc", 0, 0);
} else {
/* was already mounted. prevent umount on close */
free(db->root_proc_dir);
db->root_proc_dir = NULL;
}
} }
blob = APK_BLOB_STR("+etc\n" "@etc/init.d\n" "!etc/apk\n"); blob = APK_BLOB_STR("+etc\n" "@etc/init.d\n" "!etc/apk\n");
@ -1827,12 +1857,7 @@ void apk_db_close(struct apk_database *db)
apk_hash_free(&db->installed.dirs); apk_hash_free(&db->installed.dirs);
apk_atom_free(&db->atoms); apk_atom_free(&db->atoms);
if (db->root_proc_dir) { unmount_proc(db);
umount2(db->root_proc_dir, MNT_DETACH|UMOUNT_NOFOLLOW);
free(db->root_proc_dir);
db->root_proc_dir = NULL;
}
remount_cache(db); remount_cache(db);
if (db->cache_fd > 0) close(db->cache_fd); if (db->cache_fd > 0) close(db->cache_fd);