> Otherwise, we lose arbitrary amounts of X server state, since we're not
> waiting for metacity before carrying on; and any driver bugs that cause
> crashes on regeneration will cause graphical install to fail entirely.
>
> This varies slightly from the usual policy of doing what the installed
> system would do, but I'm willing to turn a blind eye. The more correct
> fix would be waiting for one of the properties metacity creates to exist
> on the root window. This is harder than you think.
Is this for f14-branch? I already pushed it to master, so I must assume
so.
- Chris
>
> Signed-off-by: Adam Jackson <ajax@xxxxxxxxxx>
> ---
> anaconda | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/anaconda b/anaconda
> index 1db5d50..abaffef 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -539,7 +539,6 @@ if __name__ == "__main__":
> graphical_failed = 0
> vncS = vnc.VncServer() # The vnc Server object.
> vncS.anaconda = anaconda
> - xserver_pid = None
>
> (opts, args) = parseOptions()
> anaconda.opts = opts
> @@ -793,7 +792,8 @@ if __name__ == "__main__":
>
> proc = subprocess.Popen(["Xorg", "-br", "-logfile", "/tmp/X.log",
> ":1", "vt6", "-s", "1440", "-ac",
> - "-nolisten", "tcp", "-dpi", "96"],
> + "-nolisten", "tcp", "-dpi", "96",
> + "-noreset"],
> close_fds=True, stdout=xout, stderr=xout,
> preexec_fn=preexec_fn)
>
> @@ -801,7 +801,6 @@ if __name__ == "__main__":
>
> os.environ["DISPLAY"] = ":1"
> doStartupX11Actions()
> - xserver_pid = proc.pid
> except (OSError, RuntimeError) as e:
> stdoutLog.warning(" X startup failed, falling back to text mode")
> anaconda.displayMode = 't'
> --
> 1.7.1.1
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
