moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-07 11:58:02 -05:00
Code Issues Releases Wiki Activity

Ensure we have a root partition when checking space

Browse Source 
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>
This commit is contained in:
Dan McGee 2011-03-17 05:14:06 -05:00
parent 308aa38a40
commit e47fc2d7c6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libalpm/diskspace.c
View File

@ -61,7 +61,7 @@ static int mount_point_cmp(const void *p1, const void *p2)
static alpm_list_t *mount_point_list(void) 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; alpm_mountpoint_t *mp;
#if defined HAVE_GETMNTENT #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_points = alpm_list_msort(mount_points, alpm_list_count(mount_points),
mount_point_cmp); 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); return(mount_points);
} }
@ -256,6 +260,7 @@ cleanup:
int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
{ {
alpm_list_t *mount_points, *i; alpm_list_t *mount_points, *i;
alpm_mountpoint_t *root_mp;
size_t replaces = 0, current = 0, numtargs; size_t replaces = 0, current = 0, numtargs;
int abort = 0; int abort = 0;
alpm_list_t *targ; 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); numtargs = alpm_list_count(trans->add);
mount_points = mount_point_list(); mount_points = mount_point_list();
if(mount_points == NULL) { 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); return(-1);
} }