Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP/RFE: Hint to users to use ostree/rpm-ostree if we get EROFS #320

Closed
wants to merge 2 commits into from
Closed

WIP/RFE: Hint to users to use ostree/rpm-ostree if we get EROFS #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1642908
lib/transaction: Don't SEGV in sync if a txn was failed
cgwalters Sep 7, 2017
4265db7
Hint to users to use ostree/rpm-ostree if we get EROFS
cgwalters Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions lib/rpmlock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ struct rpmlock_s {
char *path;
char *descr;
int fdrefs;
const char *managedby_instead;
};

static rpmlock rpmlock_new(const char *lock_path, const char *descr)
Expand All @@ -27,13 +28,26 @@ static rpmlock rpmlock_new(const char *lock_path, const char *descr)
if (lock != NULL) {
mode_t oldmask = umask(022);
lock->fd = open(lock_path, O_RDWR|O_CREAT, 0644);
int errsv = errno;
(void) umask(oldmask);

if (lock->fd == -1) {
/* Check if this is an ostree/rpm-ostree managed system */
lock->fdrefs = 1;
lock->managedby_instead = NULL;
if (lock->fd == -1 && errsv == EROFS) {
struct stat stbuf;
if (stat ("/run/ostree-booted", &stbuf) == 0) {
lock->managedby_instead = "ostree";
if (stat ("/usr/bin/rpm-ostree", &stbuf) == 0) {
lock->managedby_instead = "rpm-ostree";
}
}
lock->openmode = RPMLOCK_READ;
} else if (lock->fd == -1) {
lock->fd = open(lock_path, O_RDONLY);
if (lock->fd == -1) {
free(lock);
lock = NULL;
return NULL;
} else {
lock->openmode = RPMLOCK_READ;
}
Expand All @@ -43,7 +57,6 @@ static rpmlock rpmlock_new(const char *lock_path, const char *descr)
if (lock) {
lock->path = xstrdup(lock_path);
lock->descr = xstrdup(descr);
lock->fdrefs = 1;
}
}
return lock;
Expand All @@ -54,7 +67,8 @@ static void rpmlock_free(rpmlock lock)
if (--lock->fdrefs == 0) {
free(lock->path);
free(lock->descr);
(void) close(lock->fd);
if (lock->fd != -1)
(void) close(lock->fd);
free(lock);
}
}
Expand Down Expand Up @@ -117,6 +131,8 @@ rpmlock rpmlockNew(const char *lock_path, const char *descr)
if (!lock) {
rpmlog(RPMLOG_ERR, _("can't create %s lock on %s (%s)\n"),
descr, lock_path, strerror(errno));
} else if (lock->managedby_instead) {
rpmlog(RPMLOG_ERR, _("This system is managed by %s\n"), lock->managedby_instead);
}
return lock;
}
Expand Down
6 changes: 6 additions & 0 deletions lib/transaction.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,6 +1499,12 @@ static void rpmtsSync(rpmts ts)
{
if (rpmChrootDone())
return;
/* If the txn didn't get as far as calculating disk space,
* or disk space warnings are filtered out, assume we
* shouldn't sync.
*/
if (!ts->dsi)
return;

#if HAVE_SYNCFS
for (rpmDiskSpaceInfo dsi = ts->dsi; dsi->bsize; dsi++) {
Expand Down