diff options
| author | Dan McGee <dan@archlinux.org> | 2011-03-17 05:14:06 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-03-17 09:33:04 -0500 |
| commit | e47fc2d7c6eb99a7b09393c6938ea47416cb88bc (patch) | |
| tree | 3d86a6463a1bf0bf20bbd3017d00e00c01407e36 | |
| parent | 308aa38a40fb26d535f0b874bb64fe987126d03f (diff) | |
Ensure we have a root partition when checking space
Partially addresses the "why doesn't CheckSpace work in a chroot" issue.
We can't make it work, but we can at least detect when it won't work by
checking for a partition for our given installation root. If we can't
determine the mountpoint for this, bail out with an error.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/diskspace.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 892b1aac..281173a2 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -61,7 +61,7 @@ static int mount_point_cmp(const void *p1, const void *p2) static alpm_list_t *mount_point_list(void) { - alpm_list_t *mount_points = NULL; + alpm_list_t *mount_points = NULL, *ptr; alpm_mountpoint_t *mp; #if defined HAVE_GETMNTENT @@ -124,6 +124,10 @@ static alpm_list_t *mount_point_list(void) mount_points = alpm_list_msort(mount_points, alpm_list_count(mount_points), mount_point_cmp); + for(ptr = mount_points; ptr != NULL; ptr = ptr->next) { + mp = ptr->data; + _alpm_log(PM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir); + } return(mount_points); } @@ -256,6 +260,7 @@ cleanup: int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) { alpm_list_t *mount_points, *i; + alpm_mountpoint_t *root_mp; size_t replaces = 0, current = 0, numtargs; int abort = 0; alpm_list_t *targ; @@ -263,7 +268,13 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) numtargs = alpm_list_count(trans->add); mount_points = mount_point_list(); if(mount_points == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points")); + _alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points\n")); + return(-1); + } + root_mp = match_mount_point(mount_points, handle->root); + if(root_mp == NULL) { + _alpm_log(PM_LOG_ERROR, _("could not determine root mount point %s\n"), + handle->root); return(-1); } |