Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/modules/basic-system/system.client.class.in

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

mcore-src/trunk/mcore-tools/daemon/client/include/system.client.class revision 2090 by niro, Fri May 10 13:37:51 2013 UTC mcore-src/trunk/mcore-tools/src/modules/basic-system/system.client.class.in revision 2269 by niro, Tue Jan 14 10:34:57 2014 UTC
# Line 50  help_system_autologon() Line 50  help_system_autologon()
50    
51  set_system_console()  set_system_console()
52  {  {
53   local user="$1"   local user="${CLASS_ARGV[0]}"
54   [[ -z ${user} ]] && help_system_console && return 1   [[ -z ${user} ]] && help_system_console && return 1
55    
56   if [[ -n ${MROOT} ]] && [[ ${MROOT} != / ]]   if [[ -n ${MROOT} ]] && [[ ${MROOT} != / ]]
# Line 61  set_system_console() Line 61  set_system_console()
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' &" ;;
65   *)     help_system_console && return 1 ;;   *) help_system_console && return 1 ;;
66   esac   esac
67  }  }
68    
# Line 96  help_system_passwd() Line 96  help_system_passwd()
96    
97  set_system_passwd()  set_system_passwd()
98  {  {
99   local user="$1"   local user="${CLASS_ARGV[0]}"
100   local pass="$2"   local pass="${CLASS_ARGV[1]}"
101    
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!"
# Line 126  help_system_vt() Line 126  help_system_vt()
126    
127  set_system_vt()  set_system_vt()
128  {  {
129   local tty="$1"   local tty="${CLASS_ARGV[0]}"
130   [[ -z ${tty} ]] && help_system_vt && return 1   [[ -z ${tty} ]] && help_system_vt && return 1
131   case "${tty}" in   case "${tty}" in
132   [1-9])   [1-9])
# Line 147  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 ${MROOT}/etc/slim.conf | sed 's:auto_login.*\([yn].*\):\1:')   var=$(grep auto_login ${MROOT}@@SYSCONFDIR@@/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" ;;
154   *) eecho "unkown state" ;;   *) eecho "unknown state" ;;
155   esac   esac
156  }  }
157    
158  set_system_autologon()  set_system_autologon()
159  {  {
160   local action="$1"   local action="${CLASS_ARGV[0]}"
161   [[ -z ${action} ]] && help_system_autologon && return 1   [[ -z ${action} ]] && help_system_autologon && return 1
162    
163   ## splash X11 tty too?   ## splash X11 tty too?
164    
165   case "${action}" in   case "${action}" in
166   enable)   enable)
167   sed -i 's:^\(auto_login\).*:\1\tyes:' ${MROOT}/etc/slim.conf   sed -i 's:^\(auto_login\).*:\1\tyes:' ${MROOT}@@SYSCONFDIR@@/slim.conf
168   mecho "autologon enabled"   mecho "autologon enabled"
169   ;;   ;;
170   disable)   disable)
171   sed -i 's:^\(auto_login\).*:\1\tno:' ${MROOT}/etc/slim.conf   sed -i 's:^\(auto_login\).*:\1\tno:' ${MROOT}@@SYSCONFDIR@@/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.2090  
changed lines
  Added in v.2269