Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/daemon/client/include/system.client.class

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2086 by niro, Fri May 10 11:37:38 2013 UTC revision 2087 by niro, Fri May 10 13:17:18 2013 UTC
# Line 53  set_system_console() Line 53  set_system_console()
53   local user="$1"   local user="$1"
54   [[ -z ${user} ]] && help_system_console && return 1   [[ -z ${user} ]] && help_system_console && return 1
55    
56     if [[ -n ${MROOT} ]] && [[ ${MROOT} != / ]]
57     then
58     eecho "command not available while \$MROOT is set."
59     return 1
60     fi
61    
62   case "${user}" in   case "${user}" in
63   ${MCORE_UNPRIV_USER}) x11runas "rxvt &" ;;   ${MCORE_UNPRIV_USER}) x11runas "rxvt &" ;;
64   root)  x11runas "rxvt -T 'Login as root' -e /bin/bash -c 'echo \"Login as root\";exec /bin/login root' &" ;;   root)  x11runas "rxvt -T 'Login as root' -e /bin/bash -c 'echo \"Login as root\";exec /bin/login root' &" ;;
# Line 96  set_system_passwd() Line 102  set_system_passwd()
102   [[ -z ${user} ]] && help_system_passwd && return 1   [[ -z ${user} ]] && help_system_passwd && return 1
103   [[ -z ${pass} ]] && mecho "deleting password!"   [[ -z ${pass} ]] && mecho "deleting password!"
104    
105     local chrooted
106     if [[ -n ${MROOT} ]] && [[ ${MROOT} != / ]]
107     then
108     chrooted="system_chroot"
109     fi
110    
111   case "${user}" in   case "${user}" in
112   root|${MCORE_UNPRIV_USER}) (echo "${pass}"; sleep 0.1; echo "${pass}") | passwd "${user}" ;;   root|${MCORE_UNPRIV_USER}) (echo "${pass}"; sleep 0.1; echo "${pass}") | ${chrooted} passwd "${user}" ;;
113   *) help_system_passwd && return 1 ;;   *) help_system_passwd && return 1 ;;
114   esac   esac
115  }  }
# Line 135  get_system_vt() Line 147  get_system_vt()
147  get_system_autologon()  get_system_autologon()
148  {  {
149   local var   local var
150   var=$(grep auto_login /etc/slim.conf | sed 's:auto_login.*\([yn].*\):\1:')   var=$(grep auto_login ${MROOT}/etc/slim.conf | sed 's:auto_login.*\([yn].*\):\1:')
151   case "${var}" in   case "${var}" in
152   yes) mecho "autologon currently enabled"; rvecho "1" ;;   yes) mecho "autologon currently enabled"; rvecho "1" ;;
153   no) mecho "autologon currently disabled"; rvecho "0" ;;   no) mecho "autologon currently disabled"; rvecho "0" ;;
# Line 152  set_system_autologon() Line 164  set_system_autologon()
164    
165   case "${action}" in   case "${action}" in
166   enable)   enable)
167   sed -i 's:^\(auto_login\).*:\1\tyes:' /etc/slim.conf   sed -i 's:^\(auto_login\).*:\1\tyes:' ${MROOT}/etc/slim.conf
168   mecho "autologon enabled"   mecho "autologon enabled"
169   ;;   ;;
170   disable)   disable)
171   sed -i 's:^\(auto_login\).*:\1\tno:' /etc/slim.conf   sed -i 's:^\(auto_login\).*:\1\tno:' ${MROOT}/etc/slim.conf
172   mecho "autologon disabled"   mecho "autologon disabled"
173   ;;   ;;
174   *) help_system_autologon && return 1 ;;   *) help_system_autologon && return 1 ;;

Legend:
Removed from v.2086  
changed lines
  Added in v.2087