If you look in kickstart.py, you will notice that the getEncryptedDevices function gets skipped when we are not in upgrade. So we would have to add a condition to that if. That is, if we really want to avoid executing this function twice. (Is there anything wrong with executing this two times?)
As I said before, It would just be better to execute this no matter what. And it should be in some function that just does not get skipped.
Review apprecitated. Hopefull the last one.
-----------------
diff --git a/partitions.py b/partitions.py
index baf8faf..6e48b9d 100644
--- a/partitions.py
+++ b/partitions.py
@@ -369,6 +369,8 @@ class Partitions:
"""Clear the delete list and set self.requests to reflect disk."""
self.deletes = []
self.requests = []
+ if diskset.anaconda.isKickstart and not diskset.anaconda.id.upgrade:
+ self.getEncryptedDevices(diskset)
labels = diskset.getInfo()
drives = diskset.disks.keys()
drives.sort()
----- "Joel Granados" <jgranado@xxxxxxxxxx> wrote:
> After thinking about this on my way home I concluded that we really
> need a step in the installer that recollects all information, puts it
> in one place where it does not get changed for the rest of the install
> ( I don't care if you insert a usb in the middle of the install. we
> are an installer not an operating system). After, any place in the
> installer can go to this data structure and ask for whatever
> information it needs. (without changing it!!!!)
>
> I'll test the patch and push it once I'm reassured that it fixes the
> original problem.
>
> Regards.
> ----- "Joel Granados" <jgranado@xxxxxxxxxx> wrote:
>
> > Don't have a quick answer to this one. At first glance it *does*
> look
> > better than my original idea. I hadn't noticed that the dispatcher
> > changed with the findRootParts function. I'll revisit it tomorrow.
> if
> > in need of commit before that, I would go ahead with dlehmans
> pathc.
> >
> > Regards.
> > ----- "Dave Lehman" <dlehman@xxxxxxxxxx> wrote:
> >
> > > > Looked at this a little closer and found out that we are
> ignoring
> > > the call of the function that checks for root if the ks file
> > contains
> > > install.
> > > > the patch is attached.
> > > > review appreciated.
> > > >
> > >
> > > I worry what consequences this approach will have. For one thing,
> > > findRootParts will alter the dispatcher's step list. A simple fix
> > > might
> > > be to add the call back into setFromDisk, but only if we're doing
> > > kickstart:
> > >
> > > diff --git a/partitions.py b/partitions.py
> > > index baf8faf..d266605 100644
> > > --- a/partitions.py
> > > +++ b/partitions.py
> > > @@ -369,6 +369,8 @@ class Partitions:
> > > """Clear the delete list and set self.requests to
> reflect
> > > disk."""
> > > self.deletes = []
> > > self.requests = []
> > > + if diskset.anaconda.isKickstart:
> > > + self.getEncryptedDevices(diskset)
> > > labels = diskset.getInfo()
> > > drives = diskset.disks.keys()
> > > drives.sort()
> > >
> > >
> > > This is untested, so it might cause problems as well.
> > >
> > > Dave
> > >
> > > _______________________________________________
> > > Anaconda-devel-list mailing list
> > > Anaconda-devel-list@xxxxxxxxxx
> > > https://www.redhat.com/mailman/listinfo/anaconda-devel-list
> >
> > --
> > Joel Andres Granados
> > Red Hat / Brno Czech Republic
> >
> > _______________________________________________
> > Anaconda-devel-list mailing list
> > Anaconda-devel-list@xxxxxxxxxx
> > https://www.redhat.com/mailman/listinfo/anaconda-devel-list
>
> --
> Joel Andres Granados
> Red Hat / Brno Czech Republic
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list
--
Joel Andres Granados
Red Hat / Brno Czech Republic
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
