diff options
Diffstat (limited to 'ubuntu/maverick')
5 files changed, 28 insertions, 28 deletions
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdmdistrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdmdistrc index f75d31e5c..df53c8a16 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdmdistrc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdmdistrc @@ -121,9 +121,9 @@ Enable=false #Port=177 # File with the private keys of X-terminals. Required for XDM authentication. # Default is "" -#KeyFile=/etc/trinity/kdm/kdmkeys +#KeyFile=/etc/trinity/tdm/kdmkeys # XDMCP access control file in the usual XDM-Xaccess format. -# Default is "/etc/trinity/kdm/Xaccess" +# Default is "/etc/trinity/tdm/Xaccess" #Xaccess= # Number of seconds to wait for display to respond after the user has # selected a host from the chooser. @@ -141,7 +141,7 @@ Enable=false # DirectQuery or BroadcastQuery requests. # If empty, no program is invoked and "Willing to manage" is sent. # Default is "" -Willing=/etc/trinity/kdm/Xwilling +Willing=/etc/trinity/tdm/Xwilling [Shutdown] # The command (subject to word splitting) to run to halt the system. @@ -214,18 +214,18 @@ Willing=/etc/trinity/kdm/Xwilling # A program to run before the greeter is shown. Can be used to start an # xconsole or an alternative background generator. Subject to word splitting. # Default is "" -Setup=/etc/trinity/kdm/Xsetup +Setup=/etc/trinity/tdm/Xsetup # A program to run before a user session starts. Subject to word splitting. # Default is "" -Startup=/etc/trinity/kdm/Xstartup +Startup=/etc/trinity/tdm/Xstartup # A program to run after a user session exits. Subject to word splitting. # Default is "" -Reset=/etc/trinity/kdm/Xreset +Reset=/etc/trinity/tdm/Xreset # The program which is run as the user which logs in. It is supposed to # interpret the session argument (see SessionsDirs) and start an appropriate # session according to it. Subject to word splitting. # Default is "/usr/bin/xterm -ls -T" -Session=/etc/trinity/kdm/Xsession +Session=/etc/trinity/tdm/Xsession # The program to run if Session fails. # Default is "/usr/bin/xterm" #FailsafeClient= @@ -420,7 +420,7 @@ MaxShowUID=29999 # Default is true #UseBackground=false # The configuration file to be used by krootimage. -# Default is "/etc/trinity/kdm/backgroundrc" +# Default is "/etc/trinity/tdm/backgroundrc" #BackgroundCfg= # Hold the X-server grabbed the whole time the greeter is visible. This # may be more secure, but it will disable any background and other diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc index d8578e154..9535bca9c 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc @@ -121,9 +121,9 @@ Enable=false #Port=177 # File with the private keys of X-terminals. Required for XDM authentication. # Default is "" -#KeyFile=/etc/trinity/kdm/kdmkeys +#KeyFile=/etc/trinity/tdm/kdmkeys # XDMCP access control file in the usual XDM-Xaccess format. -# Default is "/etc/trinity/kdm/Xaccess" +# Default is "/etc/trinity/tdm/Xaccess" #Xaccess= # Number of seconds to wait for display to respond after the user has # selected a host from the chooser. @@ -141,7 +141,7 @@ Enable=false # DirectQuery or BroadcastQuery requests. # If empty, no program is invoked and "Willing to manage" is sent. # Default is "" -Willing=/etc/trinity/kdm/Xwilling +Willing=/etc/trinity/tdm/Xwilling [Shutdown] # The command (subject to word splitting) to run to halt the system. @@ -214,18 +214,18 @@ Willing=/etc/trinity/kdm/Xwilling # A program to run before the greeter is shown. Can be used to start an # xconsole or an alternative background generator. Subject to word splitting. # Default is "" -Setup=/etc/trinity/kdm/Xsetup +Setup=/etc/trinity/tdm/Xsetup # A program to run before a user session starts. Subject to word splitting. # Default is "" -Startup=/etc/trinity/kdm/Xstartup +Startup=/etc/trinity/tdm/Xstartup # A program to run after a user session exits. Subject to word splitting. # Default is "" -Reset=/etc/trinity/kdm/Xreset +Reset=/etc/trinity/tdm/Xreset # The program which is run as the user which logs in. It is supposed to # interpret the session argument (see SessionsDirs) and start an appropriate # session according to it. Subject to word splitting. # Default is "/usr/bin/xterm -ls -T" -Session=/etc/trinity/kdm/Xsession +Session=/etc/trinity/tdm/Xsession # The program to run if Session fails. # Default is "/usr/bin/xterm" #FailsafeClient= @@ -420,7 +420,7 @@ MaxShowUID=29999 # Default is true #UseBackground=false # The configuration file to be used by krootimage. -# Default is "/etc/trinity/kdm/backgroundrc" +# Default is "/etc/trinity/tdm/backgroundrc" #BackgroundCfg= # Hold the X-server grabbed the whole time the greeter is visible. This # may be more secure, but it will disable any background and other diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/tdmdistrc index 9fa828bbd..72678a3e7 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/tdmdistrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/tdmdistrc @@ -121,9 +121,9 @@ Enable=false #Port=177 # File with the private keys of X-terminals. Required for XDM authentication. # Default is "" -#KeyFile=/etc/trinity/kdm/kdmkeys +#KeyFile=/etc/trinity/tdm/kdmkeys # XDMCP access control file in the usual XDM-Xaccess format. -# Default is "/etc/trinity/kdm/Xaccess" +# Default is "/etc/trinity/tdm/Xaccess" #Xaccess= # Number of seconds to wait for display to respond after the user has # selected a host from the chooser. @@ -141,7 +141,7 @@ Enable=false # DirectQuery or BroadcastQuery requests. # If empty, no program is invoked and "Willing to manage" is sent. # Default is "" -Willing=/etc/trinity/kdm/Xwilling +Willing=/etc/trinity/tdm/Xwilling [Shutdown] # The command (subject to word splitting) to run to halt the system. @@ -214,18 +214,18 @@ Willing=/etc/trinity/kdm/Xwilling # A program to run before the greeter is shown. Can be used to start an # xconsole or an alternative background generator. Subject to word splitting. # Default is "" -Setup=/etc/trinity/kdm/Xsetup +Setup=/etc/trinity/tdm/Xsetup # A program to run before a user session starts. Subject to word splitting. # Default is "" -Startup=/etc/trinity/kdm/Xstartup +Startup=/etc/trinity/tdm/Xstartup # A program to run after a user session exits. Subject to word splitting. # Default is "" -Reset=/etc/trinity/kdm/Xreset +Reset=/etc/trinity/tdm/Xreset # The program which is run as the user which logs in. It is supposed to # interpret the session argument (see SessionsDirs) and start an appropriate # session according to it. Subject to word splitting. # Default is "/usr/bin/xterm -ls -T" -Session=/etc/trinity/kdm/Xsession +Session=/etc/trinity/tdm/Xsession # The program to run if Session fails. # Default is "/usr/bin/xterm" #FailsafeClient= @@ -420,7 +420,7 @@ MaxShowUID=29999 # Default is true #UseBackground=false # The configuration file to be used by krootimage. -# Default is "/etc/trinity/kdm/backgroundrc" +# Default is "/etc/trinity/tdm/backgroundrc" #BackgroundCfg= # Hold the X-server grabbed the whole time the greeter is visible. This # may be more secure, but it will disable any background and other diff --git a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity index a018471b7..1ce0d51e1 100755 --- a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity +++ b/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity @@ -20,13 +20,13 @@ esac log_begin_msg "$DESCRIPTION" -if [ -f /root/etc/trinity/kdm/kdmrc ]; then +if [ -f /root/etc/trinity/tdm/kdmrc ]; then # Configure KDM-Trinity autologin sed -i -r \ -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \ -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ - /root/etc/trinity/kdm/kdmrc + /root/etc/trinity/tdm/kdmrc fi if [ -f /root/etc/trinity/tdm/tdmrc ]; then diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity index e31165c02..e265c8a04 100755 --- a/ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity +++ b/ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity @@ -13,13 +13,13 @@ db_get passwd/username USER="$RET" db_get passwd/auto-login if [ -n "$USER" ] && [ "$RET" = true ]; then - if $chroot $ROOT [ -f /etc/trinity/kdm/kdmrc ]; then + if $chroot $ROOT [ -f /etc/trinity/tdm/kdmrc ]; then # Configure KDM autologin $log $chroot $ROOT sed -i$BACKUP -r \ -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \ -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ - /etc/trinity/kdm/kdmrc + /etc/trinity/tdm/kdmrc fi if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then |