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

db: try creating db if locking fails 

Otherwise creating rootfs from scratch with --initdb cannot be locked
due to the lock file path missing.
cute-signatures
Timo Teras 2009-01-19 21:19:36 +02:00
parent 93cdb993a1
commit aee61d0a0b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/database.c
View File

@ -648,6 +648,16 @@ int apk_db_open(struct apk_database *db, const char *root, unsigned int flags)
if (flags & APK_OPENF_WRITE) { if (flags & APK_OPENF_WRITE) {
db->lock_fd = open("var/lib/apk/lock", db->lock_fd = open("var/lib/apk/lock",
O_CREAT | O_WRONLY, 0400); O_CREAT | O_WRONLY, 0400);
if (db->lock_fd < 0 && errno == ENOENT &&
(flags & APK_OPENF_CREATE)) {
r = apk_db_create(db);
if (r != 0) {
msg = "Unable to create database";
goto ret_r;
}
db->lock_fd = open("var/lib/apk/lock",
O_CREAT | O_WRONLY, 0400);
}
if (db->lock_fd < 0 || if (db->lock_fd < 0 ||
flock(db->lock_fd, LOCK_EX | LOCK_NB) < 0) { flock(db->lock_fd, LOCK_EX | LOCK_NB) < 0) {
msg = "Unable to lock database"; msg = "Unable to lock database";