diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-01-28 16:35:40 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-01-28 16:35:40 +0100 |
| commit | 5d09b173f5053eb1561dd70c3503f29fe28b52b2 (patch) | |
| tree | 5ade767dcf07c73c4aa53640c1ba279fc0538d0e | |
| parent | 1bc800c7b07c58572859f385296cbe9c6bc19c20 (diff) | |
| download | tde-packaging-5d09b173f5053eb1561dd70c3503f29fe28b52b2.tar.gz tde-packaging-5d09b173f5053eb1561dd70c3503f29fe28b52b2.zip | |
Revert last rename kdm as tdm in casper-trinity and ubiquity-trinity on Ubuntu
Scripts were designed to handle both - kdm/kdmrc as well as tdm/tdmrc
4 files changed, 8 insertions, 8 deletions
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 1ce0d51e1..a018471b7 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/tdm/kdmrc ]; then +if [ -f /root/etc/trinity/kdm/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/tdm/kdmrc + /root/etc/trinity/kdm/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 e265c8a04..e31165c02 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/tdm/kdmrc ]; then + if $chroot $ROOT [ -f /etc/trinity/kdm/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/tdm/kdmrc + /etc/trinity/kdm/kdmrc fi if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then diff --git a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity index 1ce0d51e1..a018471b7 100755 --- a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity +++ b/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity @@ -20,13 +20,13 @@ esac log_begin_msg "$DESCRIPTION" -if [ -f /root/etc/trinity/tdm/kdmrc ]; then +if [ -f /root/etc/trinity/kdm/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/tdm/kdmrc + /root/etc/trinity/kdm/kdmrc fi if [ -f /root/etc/trinity/tdm/tdmrc ]; then diff --git a/ubuntu/precise/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/precise/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity index e265c8a04..e31165c02 100755 --- a/ubuntu/precise/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity +++ b/ubuntu/precise/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/tdm/kdmrc ]; then + if $chroot $ROOT [ -f /etc/trinity/kdm/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/tdm/kdmrc + /etc/trinity/kdm/kdmrc fi if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then |