[PATCH] Put Xorg on tty6 in accordance with Ancient Anaconda Tradition (#980062)

Vratislav Podzimek vpodzime at redhat.com
Fri Jan 24 16:50:26 UTC 2014


On Fri, 2014-01-24 at 11:45 -0500, Will Woods wrote:
> Previously Xorg and logind were fighting over tty6. logind got there
> first, so it won the race and Xorg ended up on tty7. commit 0a302ce moved Xorg to vt7 so we could avoid the race.
> 
> More recently, lorax commit dff1542 reconfigures logind to reserve tty2
> instead of tty6. So now tty6 is free again.
> 
> So until we're ready to move Xorg to tty1 and start it up like a normal
> system does, we might as well leave it where it was before.
> 
> This reverts commit 0a302ce1d00929e0f835925454caa63f24c10288.
> 
> Conflicts:
>     anaconda
> ---
>  anaconda                      | 2 +-
>  pyanaconda/ui/gui/__init__.py | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/anaconda b/anaconda
> index 2d681e9..99782a4 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -596,7 +596,7 @@ def setupDisplay(anaconda, options, addons=None):
>          try:
>              subprocess.Popen(["Xorg", "-br",
>                                "-logfile", "/tmp/X.log",
> -                              ":1", "vt7", "-s", "1440", "-ac",
> +                              ":1", "vt6", "-s", "1440", "-ac",
>                                "-nolisten", "tcp", "-dpi", "96",
>                                "-noreset"],
>                                close_fds=True,
> diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
> index c022ee4..80d4afc 100644
> --- a/pyanaconda/ui/gui/__init__.py
> +++ b/pyanaconda/ui/gui/__init__.py
> @@ -258,7 +258,7 @@ class GraphicalUserInterface(UserInterface):
>  
>      @property
>      def tty_num(self):
> -        return 7
> +        return 6
>  
>      @property
>      def meh_interface(self):
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list