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

Revert last rename kdm as tdm in casper-trinity and ubiquity-trinity on Ubuntu

Browse Source 
Scripts were designed to handle both - kdm/kdmrc as well as tdm/tdmrc
pull/3/head
Slávek Banko 12 years ago
parent 1bc800c7b0
commit 5d09b173f5
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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/tdm/kdmrc ]; then if [ -f /root/etc/trinity/kdm/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/tdm/kdmrc /root/etc/trinity/kdm/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/tdm/kdmrc ]; then if $chroot $ROOT [ -f /etc/trinity/kdm/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/tdm/kdmrc /etc/trinity/kdm/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/tdm/kdmrc ]; then if [ -f /root/etc/trinity/kdm/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/tdm/kdmrc /root/etc/trinity/kdm/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/tdm/kdmrc ]; then if $chroot $ROOT [ -f /etc/trinity/kdm/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/tdm/kdmrc /etc/trinity/kdm/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