Magellan Linux

Diff of /trunk/installer-simple/bin/installer.sh.in

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

revision 2416 by niro, Tue Jan 7 13:37:49 2014 UTC revision 2417 by niro, Tue Jan 7 13:42:08 2014 UTC
# Line 146  dialog_setup_system_menu() Line 146  dialog_setup_system_menu()
146    
147  dialog_hardware_detection()  dialog_hardware_detection()
148  {  {
149   local i   local message
  local hwtmp  
   
  if [ -x $(type -P mktemp) ]  
  then  
  hwtmp="$(mktemp)"  
  else  
  hwtmp="/tmp/hwtmp.sh"  
  fi  
150    
151   run_hardware_detection_disks   run_hardware_detection_disks
152    
153   echo "dialog \\"  > ${hwtmp}   message+=$"Harddrives:\n"
  echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}  
  echo "--ok-label \"Weiter\" \\" >> ${hwtmp}  
  echo "--stdout \\" >> ${hwtmp}  
  echo "--colors \\" >> ${hwtmp}  
  echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}  
  echo " Festplatten:\n \\" >> ${hwtmp}  
154    
155   if [[ ! -z ${ALL_DISKS} ]]   if [[ ! -z ${ALL_DISKS} ]]
156   then   then
157   for i in ${ALL_DISKS}   for i in ${ALL_DISKS}
158   do   do
159   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}   message+="\Z3${i}\Zn "
160   done   done
161     message+="\n"
162   fi   fi
163    
164   if [[ ! -z ${ALL_CDROMS} ]]   if [[ ! -z ${ALL_CDROMS} ]]
165   then   then
166   echo " \n \\" >> ${hwtmp}   message+="\n"
167   echo " CDROM Laufwerke:\n \\" >> ${hwtmp}   message+=$"Optical disk drives:\n"
168   for i in ${ALL_CDROMS}   for i in ${ALL_CDROMS}
169   do   do
170   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}   message+="\Z3${i}\Zn"
171   done   done
172     message+="\n"
173   fi   fi
174    
175   # other devices   # other devices
176   run_hardware_detection   run_hardware_detection
177   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
178   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
179   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
180   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
181   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;   *) message+=$"\n \\ZnCommon device detected.\Zn" ;;
182   esac   esac
183   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
184   then   then
185   echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
186   fi   fi
187    
188   echo " \" 14 70" >> ${hwtmp}   messagebox -y 15 -h $"Detected hardware:" "${message}"
  chmod a+x ${hwtmp}  
  ${hwtmp}  
   
  # remove tmp file  
  if [[ -f ${hwtmp} ]]  
  then  
  rm ${hwtmp}  
  fi  
189  }  }
190    
191  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()

Legend:
Removed from v.2416  
changed lines
  Added in v.2417