# HG changeset patch # User mip@xxxxxxxxxxxxxxxxxxxxxx # Node ID 6d90c95b919b324b7d8e4c7a568040334c8862e9 # Parent f0e14b4e535c7d99c56c286384b0d512c5220884 Improve pygrub error reporting when opening ext2 fs is not possible As reported in the thread: http://lists.xensource.com/archives/html/xen-users/2006-03/msg00721.html, pygrub does not open ext2 file systems in partitioned images or sub partitions on e.g. CentOS/RHEL 4, because e2fsprogs ext2fs_open does not support an offset into the file to be opened. With this patch, the error is correctly reported instead of a generic "unable to open file" (and leaving the user searching in the dark). Signed-off-by: Michael Paesold diff -r f0e14b4e535c -r 6d90c95b919b tools/pygrub/src/fsys/ext2/ext2module.c --- a/tools/pygrub/src/fsys/ext2/ext2module.c Thu Mar 30 14:37:22 2006 +0100 +++ b/tools/pygrub/src/fsys/ext2/ext2module.c Fri Mar 31 09:27:23 2006 +0200 @@ -213,7 +213,9 @@ ext2_fs_open (Ext2Fs *fs, PyObject *args int flags = 0, superblock = 0, offset = 0, err; unsigned int block_size = 0; ext2_filsys efs; +#ifdef HAVE_EXT2FS_OPEN2 char offsetopt[30]; +#endif if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiii", kwlist, &name, &flags, &superblock, @@ -225,19 +227,24 @@ ext2_fs_open (Ext2Fs *fs, PyObject *args return NULL; } +#ifdef HAVE_EXT2FS_OPEN2 if (offset != 0) { snprintf(offsetopt, 29, "offset=%d", offset); } -#ifdef HAVE_EXT2FS_OPEN2 err = ext2fs_open2(name, offsetopt, flags, superblock, block_size, unix_io_manager, &efs); #else + if (offset != 0) { + PyErr_SetString(PyExc_ValueError, "offset argument not supported"); + return NULL; + } + err = ext2fs_open(name, flags, superblock, block_size, unix_io_manager, &efs); #endif if (err) { - PyErr_SetString(PyExc_ValueError, "unable to open file"); + PyErr_SetString(PyExc_ValueError, "unable to open filesystem"); return NULL; }