FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > EPEL Development

 
 
LinkBack Thread Tools
 
Old 12-10-2010, 07:39 PM
David Lehman
 
Default Add losetup to the install image, re-remove it from isys (#662183).

Ack.

On Fri, 2010-12-10 at 15:30 -0500, Chris Lumens wrote:
> Part of the removal never happened in the first place, and part of it got
> overwritten when I pushed the install image merging patch series.
> ---
> pyanaconda/isys/isys.c | 40 ----------------------------------------
> scripts/upd-instroot | 2 +-
> 2 files changed, 1 insertions(+), 41 deletions(-)
>
> diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c
> index f09d0b8..3df23da 100644
> --- a/pyanaconda/isys/isys.c
> +++ b/pyanaconda/isys/isys.c
> @@ -123,8 +123,6 @@ static PyMethodDef isysModuleMethods[] = {
> { "devSpaceFree", (PyCFunction) doDevSpaceFree, METH_VARARGS, NULL },
> { "wiperaidsb", (PyCFunction) doWipeRaidSuperblock, METH_VARARGS, NULL },
> { "getraidchunk", (PyCFunction) doGetRaidChunkSize, METH_VARARGS, NULL },
> - { "losetup", (PyCFunction) doLoSetup, METH_VARARGS, NULL },
> - { "unlosetup", (PyCFunction) doUnLoSetup, METH_VARARGS, NULL },
> { "mount", (PyCFunction) doMount, METH_VARARGS, NULL },
> { "umount", (PyCFunction) doUMount, METH_VARARGS, NULL },
> { "resetresolv", (PyCFunction) doResetResolv, METH_VARARGS, NULL },
> @@ -151,44 +149,6 @@ static PyMethodDef isysModuleMethods[] = {
> { NULL, NULL, 0, NULL }
> } ;
>
> -static PyObject * doUnLoSetup(PyObject * s, PyObject * args) {
> - int loopfd;
> -
> - if (!PyArg_ParseTuple(args, "i", &loopfd)) return NULL;
> - if (ioctl(loopfd, LOOP_CLR_FD, 0)) {
> - PyErr_SetFromErrno(PyExc_SystemError);
> - return NULL;
> - }
> -
> - Py_INCREF(Py_None);
> - return Py_None;
> -}
> -
> -static PyObject * doLoSetup(PyObject * s, PyObject * args) {
> - int loopfd;
> - int targfd;
> - struct loop_info loopInfo;
> - char * loopName;
> -
> - if (!PyArg_ParseTuple(args, "iis", &loopfd, &targfd, &loopName))
> - return NULL;
> - if (ioctl(loopfd, LOOP_SET_FD, targfd)) {
> - PyErr_SetFromErrno(PyExc_SystemError);
> - return NULL;
> - }
> -
> - memset(&loopInfo, 0, sizeof(loopInfo));
> - strncpy(loopInfo.lo_name, basename(loopName), 63);
> -
> - if (ioctl(loopfd, LOOP_SET_STATUS, &loopInfo)) {
> - PyErr_SetFromErrno(PyExc_SystemError);
> - return NULL;
> - }
> -
> - Py_INCREF(Py_None);
> - return Py_None;
> -}
> -
> static PyObject * doUMount(PyObject * s, PyObject * args) {
> char *err = NULL, *mntpoint = NULL;
> int rc;
> diff --git a/scripts/upd-instroot b/scripts/upd-instroot
> index d980033..14e7c2a 100755
> --- a/scripts/upd-instroot
> +++ b/scripts/upd-instroot
> @@ -529,6 +529,7 @@ sbin/killall5
> sbin/kpartx
> sbin/ldconfig
> sbin/load_policy
> +sbin/losetup
> sbin/lspci
> sbin/lvm*
> sbin/mdadm
> @@ -1054,7 +1055,6 @@ install -m 644 $DEST/usr/share/anaconda/loader.tr $DEST/etc/loader.tr
>
> cp $DEST/usr/share/anaconda/raidstart-stub $DEST/usr/bin/raidstart
> cp $DEST/usr/share/anaconda/raidstop-stub $DEST/usr/bin/raidstop
> -cp $DEST/usr/share/anaconda/losetup-stub $DEST/usr/bin/losetup
> cp $DEST/usr/share/anaconda/list-harddrives-stub $DEST/usr/bin/list-harddrives
> cp $DEST/usr/share/anaconda/loadkeys-stub $DEST/usr/bin/loadkeys
> cp $DEST/usr/share/anaconda/mknod-stub $DEST/usr/bin/mknod


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 10:59 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org