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

db: prevent umount /proc when it was mounted by someone else 

This fixes regression introduced by commit 72b878e655
cute-signatures
Natanael Copa 2017-03-13 12:54:39 +00:00
parent 17ba5dc11c
commit 93d6b2b529
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/database.c
View File

@ -1581,8 +1581,13 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
if (errno == ENOENT) mkdir(db->root_proc_dir, 0555); if (errno == ENOENT) mkdir(db->root_proc_dir, 0555);
stfs.f_type = 0; stfs.f_type = 0;
} }
if (stfs.f_type != PROC_SUPER_MAGIC) if (stfs.f_type != PROC_SUPER_MAGIC) {
mount("proc", db->root_proc_dir, "proc", 0, 0); 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");