[PATCH 6/9] Remove the iscsi and noiscsi options

Martin Kolman mkolman at redhat.com
Tue Jun 10 09:56:35 UTC 2014


On Mon, 2014-06-09 at 11:40 -0500, David Lehman wrote:
> On 06/09/2014 11:26 AM, Martin Kolman wrote:
> > They only set the iscsi flag which is not used anywhere.
> 
> Blivet picks up the flag and uses it. The same is true for ibft and dmraid.
I've found only one place where Anaconda flags are used in Blivet:

blivet/__init__.py:173:    from pyanaconda.flags import flags as
anaconda_flags
blivet/__init__.py:174:
flags.update_from_anaconda_flags(anaconda_flags)
blivet/flags.py:86:    def update_from_anaconda_flags(self,
anaconda_flags): 

def update_from_anaconda_flags(self, anaconda_flags):
    self.installer_mode = True
    self.testing = anaconda_flags.testing
    self.automated_install = anaconda_flags.automatedInstall
    self.live_install = anaconda_flags.livecdInstall
    self.image_install = anaconda_flags.imageInstall

    self.selinux = anaconda_flags.selinux

    self.gfs2 = "gfs2" in self.boot_cmdline
    self.jfs = "jfs" in self.boot_cmdline
    self.reiserfs = "reiserfs" in self.boot_cmdline

    self.arm_platform = anaconda_flags.armPlatform
    self.gpt = anaconda_flags.gpt

    self.multipath_friendly_names = anaconda_flags.mpathFriendlyNames

It looks like they should be used, but aren't.
So I guess I'll drop the patches removing iscsi, ibft and dmraid and
write patches that make Blivet use them ?


> 
> David
> 
> >
> > Signed-off-by: Martin Kolman <mkolman at redhat.com>
> > ---
> >   anaconda            | 5 -----
> >   pyanaconda/flags.py | 1 -
> >   2 files changed, 6 deletions(-)
> >
> > diff --git a/anaconda b/anaconda
> > index 0e43e96..b1c9c79 100755
> > --- a/anaconda
> > +++ b/anaconda
> > @@ -314,8 +314,6 @@ def parseArguments(argv=None, boot_cmdline=None):
> >
> >       ap.add_argument("--noibft", dest="ibft", action="store_false", default=True)
> >       ap.add_argument("--ibft", action="store_true")
> > -    ap.add_argument("--noiscsi", dest="iscsi", action="store_false", default=False)
> > -    ap.add_argument("--iscsi", action="store_true")
> >
> >       # Geolocation
> >       ap.add_argument("--geoloc")
> > @@ -885,9 +883,6 @@ if __name__ == "__main__":
> >       if opts.ibft:
> >           flags.ibft = 1
> >
> > -    if opts.iscsi:
> > -        flags.iscsi = 1
> > -
> >       if opts.targetArch:
> >           flags.targetarch = opts.targetArch
> >
> > diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
> > index 1fe5ad8..90ea8db 100644
> > --- a/pyanaconda/flags.py
> > +++ b/pyanaconda/flags.py
> > @@ -46,7 +46,6 @@ class Flags(object):
> >           self.__dict__['_in_init'] = True
> >           self.livecdInstall = 0
> >           self.ibft = 1
> > -        self.iscsi = 0
> >           self.usevnc = 0
> >           self.vncquestion = True
> >           self.mpath = 1
> >
> 
> _______________________________________________
> anaconda-patches mailing list
> anaconda-patches at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches




More information about the anaconda-patches mailing list