TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix older settings files referring to tdm as kdm

Browse Source
pull/3/head
Timothy Pearson 12 years ago
parent 69960f4e0f
commit 1bc800c7b0
7 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

16
ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdmdistrc
Unescape View File

@ -121,9 +121,9 @@ Enable=false
#Port=177 #Port=177
# File with the private keys of X-terminals. Required for XDM authentication. # File with the private keys of X-terminals. Required for XDM authentication.
# Default is "" # Default is ""
#KeyFile=/etc/trinity/kdm/kdmkeys #KeyFile=/etc/trinity/tdm/kdmkeys
# XDMCP access control file in the usual XDM-Xaccess format. # XDMCP access control file in the usual XDM-Xaccess format.
# Default is "/etc/trinity/kdm/Xaccess" # Default is "/etc/trinity/tdm/Xaccess"
#Xaccess= #Xaccess=
# Number of seconds to wait for display to respond after the user has # Number of seconds to wait for display to respond after the user has
# selected a host from the chooser. # selected a host from the chooser.
@ -141,7 +141,7 @@ Enable=false
# DirectQuery or BroadcastQuery requests. # DirectQuery or BroadcastQuery requests.
# If empty, no program is invoked and "Willing to manage" is sent. # If empty, no program is invoked and "Willing to manage" is sent.
# Default is "" # Default is ""
Willing=/etc/trinity/kdm/Xwilling Willing=/etc/trinity/tdm/Xwilling
[Shutdown] [Shutdown]
# The command (subject to word splitting) to run to halt the system. # 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 # 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. # xconsole or an alternative background generator. Subject to word splitting.
# Default is "" # 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. # A program to run before a user session starts. Subject to word splitting.
# Default is "" # 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. # A program to run after a user session exits. Subject to word splitting.
# Default is "" # 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 # 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 # interpret the session argument (see SessionsDirs) and start an appropriate
# session according to it. Subject to word splitting. # session according to it. Subject to word splitting.
# Default is "/usr/bin/xterm -ls -T" # Default is "/usr/bin/xterm -ls -T"
Session=/etc/trinity/kdm/Xsession Session=/etc/trinity/tdm/Xsession
# The program to run if Session fails. # The program to run if Session fails.
# Default is "/usr/bin/xterm" # Default is "/usr/bin/xterm"
#FailsafeClient= #FailsafeClient=
@ -420,7 +420,7 @@ MaxShowUID=29999
# Default is true # Default is true
#UseBackground=false #UseBackground=false
# The configuration file to be used by krootimage. # The configuration file to be used by krootimage.
# Default is "/etc/trinity/kdm/backgroundrc" # Default is "/etc/trinity/tdm/backgroundrc"
#BackgroundCfg= #BackgroundCfg=
# Hold the X-server grabbed the whole time the greeter is visible. This # 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 # may be more secure, but it will disable any background and other

16
ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc
Unescape View File

@ -121,9 +121,9 @@ Enable=false
#Port=177 #Port=177
# File with the private keys of X-terminals. Required for XDM authentication. # File with the private keys of X-terminals. Required for XDM authentication.
# Default is "" # Default is ""
#KeyFile=/etc/trinity/kdm/kdmkeys #KeyFile=/etc/trinity/tdm/kdmkeys
# XDMCP access control file in the usual XDM-Xaccess format. # XDMCP access control file in the usual XDM-Xaccess format.
# Default is "/etc/trinity/kdm/Xaccess" # Default is "/etc/trinity/tdm/Xaccess"
#Xaccess= #Xaccess=
# Number of seconds to wait for display to respond after the user has # Number of seconds to wait for display to respond after the user has
# selected a host from the chooser. # selected a host from the chooser.
@ -141,7 +141,7 @@ Enable=false
# DirectQuery or BroadcastQuery requests. # DirectQuery or BroadcastQuery requests.
# If empty, no program is invoked and "Willing to manage" is sent. # If empty, no program is invoked and "Willing to manage" is sent.
# Default is "" # Default is ""
Willing=/etc/trinity/kdm/Xwilling Willing=/etc/trinity/tdm/Xwilling
[Shutdown] [Shutdown]
# The command (subject to word splitting) to run to halt the system. # 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 # 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. # xconsole or an alternative background generator. Subject to word splitting.
# Default is "" # 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. # A program to run before a user session starts. Subject to word splitting.
# Default is "" # 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. # A program to run after a user session exits. Subject to word splitting.
# Default is "" # 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 # 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 # interpret the session argument (see SessionsDirs) and start an appropriate
# session according to it. Subject to word splitting. # session according to it. Subject to word splitting.
# Default is "/usr/bin/xterm -ls -T" # Default is "/usr/bin/xterm -ls -T"
Session=/etc/trinity/kdm/Xsession Session=/etc/trinity/tdm/Xsession
# The program to run if Session fails. # The program to run if Session fails.
# Default is "/usr/bin/xterm" # Default is "/usr/bin/xterm"
#FailsafeClient= #FailsafeClient=
@ -420,7 +420,7 @@ MaxShowUID=29999
# Default is true # Default is true
#UseBackground=false #UseBackground=false
# The configuration file to be used by krootimage. # The configuration file to be used by krootimage.
# Default is "/etc/trinity/kdm/backgroundrc" # Default is "/etc/trinity/tdm/backgroundrc"
#BackgroundCfg= #BackgroundCfg=
# Hold the X-server grabbed the whole time the greeter is visible. This # 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 # may be more secure, but it will disable any background and other

16
ubuntu/maverick/defaultsettings/redmond-default-settings/tdmdistrc
Unescape View File

@ -121,9 +121,9 @@ Enable=false
#Port=177 #Port=177
# File with the private keys of X-terminals. Required for XDM authentication. # File with the private keys of X-terminals. Required for XDM authentication.
# Default is "" # Default is ""
#KeyFile=/etc/trinity/kdm/kdmkeys #KeyFile=/etc/trinity/tdm/kdmkeys
# XDMCP access control file in the usual XDM-Xaccess format. # XDMCP access control file in the usual XDM-Xaccess format.
# Default is "/etc/trinity/kdm/Xaccess" # Default is "/etc/trinity/tdm/Xaccess"
#Xaccess= #Xaccess=
# Number of seconds to wait for display to respond after the user has # Number of seconds to wait for display to respond after the user has
# selected a host from the chooser. # selected a host from the chooser.
@ -141,7 +141,7 @@ Enable=false
# DirectQuery or BroadcastQuery requests. # DirectQuery or BroadcastQuery requests.
# If empty, no program is invoked and "Willing to manage" is sent. # If empty, no program is invoked and "Willing to manage" is sent.
# Default is "" # Default is ""
Willing=/etc/trinity/kdm/Xwilling Willing=/etc/trinity/tdm/Xwilling
[Shutdown] [Shutdown]
# The command (subject to word splitting) to run to halt the system. # 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 # 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. # xconsole or an alternative background generator. Subject to word splitting.
# Default is "" # 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. # A program to run before a user session starts. Subject to word splitting.
# Default is "" # 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. # A program to run after a user session exits. Subject to word splitting.
# Default is "" # 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 # 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 # interpret the session argument (see SessionsDirs) and start an appropriate
# session according to it. Subject to word splitting. # session according to it. Subject to word splitting.
# Default is "/usr/bin/xterm -ls -T" # Default is "/usr/bin/xterm -ls -T"
Session=/etc/trinity/kdm/Xsession Session=/etc/trinity/tdm/Xsession
# The program to run if Session fails. # The program to run if Session fails.
# Default is "/usr/bin/xterm" # Default is "/usr/bin/xterm"
#FailsafeClient= #FailsafeClient=
@ -420,7 +420,7 @@ MaxShowUID=29999
# Default is true # Default is true
#UseBackground=false #UseBackground=false
# The configuration file to be used by krootimage. # The configuration file to be used by krootimage.
# Default is "/etc/trinity/kdm/backgroundrc" # Default is "/etc/trinity/tdm/backgroundrc"
#BackgroundCfg= #BackgroundCfg=
# Hold the X-server grabbed the whole time the greeter is visible. This # 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 # may be more secure, but it will disable any background and other

4
ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
Unescape View File

@ -20,13 +20,13 @@ esac
log_begin_msg "$DESCRIPTION" log_begin_msg "$DESCRIPTION"
if [ -f /root/etc/trinity/kdm/kdmrc ]; then if [ -f /root/etc/trinity/tdm/kdmrc ]; then
# Configure KDM-Trinity autologin # Configure KDM-Trinity autologin
sed -i -r \ sed -i -r \
-e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
-e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
/root/etc/trinity/kdm/kdmrc /root/etc/trinity/tdm/kdmrc
fi fi
if [ -f /root/etc/trinity/tdm/tdmrc ]; then if [ -f /root/etc/trinity/tdm/tdmrc ]; then

4
ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
Unescape View File

@ -13,13 +13,13 @@ db_get passwd/username
USER="$RET" USER="$RET"
db_get passwd/auto-login db_get passwd/auto-login
if [ -n "$USER" ] && [ "$RET" = true ]; then 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 # Configure KDM autologin
$log $chroot $ROOT sed -i$BACKUP -r \ $log $chroot $ROOT sed -i$BACKUP -r \
-e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \
-e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
/etc/trinity/kdm/kdmrc /etc/trinity/tdm/kdmrc
fi fi
if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then

4
ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
Unescape View File

@ -20,13 +20,13 @@ esac
log_begin_msg "$DESCRIPTION" log_begin_msg "$DESCRIPTION"
if [ -f /root/etc/trinity/kdm/kdmrc ]; then if [ -f /root/etc/trinity/tdm/kdmrc ]; then
# Configure KDM-Trinity autologin # Configure KDM-Trinity autologin
sed -i -r \ sed -i -r \
-e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
-e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
/root/etc/trinity/kdm/kdmrc /root/etc/trinity/tdm/kdmrc
fi fi
if [ -f /root/etc/trinity/tdm/tdmrc ]; then if [ -f /root/etc/trinity/tdm/tdmrc ]; then

4
ubuntu/precise/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
Unescape View File

@ -13,13 +13,13 @@ db_get passwd/username
USER="$RET" USER="$RET"
db_get passwd/auto-login db_get passwd/auto-login
if [ -n "$USER" ] && [ "$RET" = true ]; then 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 # Configure KDM autologin
$log $chroot $ROOT sed -i$BACKUP -r \ $log $chroot $ROOT sed -i$BACKUP -r \
-e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \
-e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
/etc/trinity/kdm/kdmrc /etc/trinity/tdm/kdmrc
fi fi
if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then

Write Preview
Loading…
Cancel
Save