Magellan Linux

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

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

revision 2421 by niro, Tue Jan 7 13:50:50 2014 UTC revision 2439 by niro, Tue Jan 7 14:37:35 2014 UTC
# Line 27  for inc in %SYSCONFDIR%/installer.conf \ Line 27  for inc in %SYSCONFDIR%/installer.conf \
27   ${INSTALLER_LIBDIR}/functions/common.sh \   ${INSTALLER_LIBDIR}/functions/common.sh \
28   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
29   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \
30     ${INSTALLER_LIBDIR}/functions/bootloader.sh \
31     ${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
32   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
33  do  do
34   if [ -e ${inc} ]   if [ -e ${inc} ]
# Line 191  dialog_hardware_detection() Line 193  dialog_hardware_detection()
193  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
194  {  {
195   local i   local i
196     local retval
197    
198   if [[ -z ${ALL_DISKS} ]]   if [[ -z ${ALL_DISKS} ]]
199   then   then
200   dialog_no_harddrive_found   dialog_no_harddrive_found
201   exit 1   exit 1
202   else   else
203     HDD=$(dialog_select_target_harddrive)
204   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
205   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
206   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   if [[ ${retval} -eq 0 ]]
  echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh  
  echo "--stdout \\" >> /tmp/hddtmp.sh  
  echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh  
   
  for i in ${ALL_DISKS}  
  do  
  echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
  done  
  echo -e "\n" >> /tmp/hddtmp.sh  
   
  chmod a+x /tmp/hddtmp.sh  
  HDD="$(/tmp/hddtmp.sh)"  
  RES=$?  
  [[ ${RES} -eq 1 ]] && return 1  
  if [[ ${RES} -eq 0 ]]  
207   then   then
208   dialog_setup_hdd_info   dialog_setup_hdd_info
209   setup_hdd_partitions_manual   setup_hdd_partitions_manual
# Line 226  dialog_setup_hdd_partitions_manual() Line 214  dialog_setup_hdd_partitions_manual()
214  dialog_setup_hdd_partitions_auto()  dialog_setup_hdd_partitions_auto()
215  {  {
216   local i   local i
217     local retval
218    
219   if [[ -z ${ALL_DISKS} ]]   if [[ -z ${ALL_DISKS} ]]
220   then   then
221   dialog_no_harddrive_found   dialog_no_harddrive_found
222   exit 1   exit 1
223   else   else
224     HDD=$(dialog_select_target_harddrive)
225   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
226   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
227   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   if [[ ${retval} -eq 0 ]]
  echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh  
  echo "--stdout \\" >> /tmp/hddtmp.sh  
  echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh  
   
  for i in ${ALL_DISKS}  
  do  
  echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
  done  
  echo -e "\n" >> /tmp/hddtmp.sh  
   
  chmod a+x /tmp/hddtmp.sh  
  HDD="$(/tmp/hddtmp.sh)"  
  RES=$?  
  [[ ${RES} -eq 1 ]] && return 1  
  if [[ ${RES} -eq 0 ]]  
228   then   then
229   dialog_setup_hdd_info_auto   dialog_setup_hdd_info_auto
230   dialog_setup_hdd_create_partitions   dialog_setup_hdd_create_partitions
# Line 259  dialog_setup_hdd_partitions_auto() Line 233  dialog_setup_hdd_partitions_auto()
233   fi   fi
234  }  }
235    
236  run_hardware_detection_disks()  install_meter()
 {  
  local bootdev  
   
  # all disks but exclude ramdisks  
  export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')  
  # remove the boot device from ALL_DISKS if it was an usbstick  
  if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]  
  then  
  bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"  
  export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")  
  fi  
  export ALL_CDROMS="$(get_hwinfo cdrom)"  
 }  
   
 dialog_setup_hdd_create_partitions()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Erstelle Disk Partitionen ..." 3 70  
 }  
   
 dialog_setup_hdd_format()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Erstelle Datei-Systeme ..." 3 70  
 }  
   
 dialog_install_settings()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Speichere System-Einstellungen ..." 3 70  
 }  
   
 dialog_install_system_image()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --gauge "Kopiere System-Image ..." 6 80  
 }  
   
 dialog_install_meter()  
237  {  {
238   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
239   do   do
# Line 315  dialog_install_meter() Line 246  dialog_install_meter()
246   return 0   return 0
247  }  }
248    
   
 dialog_install_bootsector()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Schreibe den Bootsektor ..." 3 70  
 }  
   
 dialog_install_successful()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --colors \  
  --msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81  
 }  
   
 dialog_install_failure()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --colors \  
  --msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\  
  Fehler bei ${ERROR}, RetVal: ${RETVAL} \  
  " 10 81  
 }  
   
249  dialog_main()  dialog_main()
250  {  {
251   METHOD=0   local method=0
252     local retval
253    
254   while [[ ${METHOD} -le 2 ]]   while [[ ${method} -le 2 ]]
255   do   do
256   METHOD=$(dialog \   method=$(menubox $"Configuration:" \
257   --backtitle "${TITLE}" \   $"1:Install system" \
258   --no-cancel \   $"2:Show detected harddrives" \
259   --ok-label "Weiter" \   $"3:Exit and reboot" \
260   --stdout \   $"4:Exit and drop into a shell")
261   --menu "Konfiguration" 14 70 5 \   retval=$?
262   "1" "AutoSta_LX installieren" \   [[ ${retval} -eq 1 ]] && exit 1
263   "2" "Uebersicht gefundener Laufwerke" \   if [[ ${retval} -eq 0 ]]
  "3" "Beenden und neustarten" \  
  "4" "Beenden und eine Shell starten")  
  RES=$?  
  [[ ${RES} -eq 1 ]] && exit 1  
  if [[ ${RES} -eq 0 ]]  
264   then   then
265   case ${METHOD} in   case ${method} in
266   "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
267   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
268   "3") install_do_reboot ;;   "3") install_do_reboot ;;
# Line 380  run_hardware_detection() Line 281  run_hardware_detection()
281    
282   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
283    
284   # check for special devices/clients:   ## check for special devices/clients:
285   # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd   ## if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
286   local removable=0   #local removable=0
287   if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]   #if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
288   then   #then
289   for i in /sys/block/[hs]d*/removable   #for i in /sys/block/[hs]d*/removable
290   do   #do
291   if [[ $(< ${i}) = 1 ]]   #if [[ $(< ${i}) = 1 ]]
292   then   #then
293   removable=1   #removable=1
294   fi   #fi
295   done   #done
296     ## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
297   # only add this for grub legacy, grub2 detect these settings on its own  
298   export GRUBLEGACYOPTS="rootdelay=8"   ## only add this for grub legacy, grub2 detect these settings on its own
299   # there are to zotac types in the wild, nvidia based gfx and intel   #export GRUBLEGACYOPTS="rootdelay=8"
300   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   ## there are to zotac types in the wild, nvidia based gfx and intel
301   then   #if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
302   export SPECIALDEVICE="zotac_nvidia"   #then
303   else   #export SPECIALDEVICE="zotac_nvidia"
304   export SPECIALDEVICE="zotac_intel"   #else
305   fi   #export SPECIALDEVICE="zotac_intel"
306   fi   #fi
307     #fi
308    
309   # check for special devices/clients:   # check for special devices/clients:
310   # if a rangee and disk ist smaller then 256mb move partion one block further ahead   # if a rangee and disk ist smaller then 256mb move partion one block further ahead
# Line 431  run_hardware_detection() Line 333  run_hardware_detection()
333   fi   fi
334  }  }
335    
336    run_hardware_detection_disks()
337    {
338     local bootdev
339    
340     # all disks but exclude ramdisks
341     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
342     # remove the boot device from ALL_DISKS if it was an usbstick
343     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
344     then
345     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
346     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
347     fi
348     export ALL_CDROMS="$(get_hwinfo cdrom)"
349    }
350    
351  hdd_size_below_256mb()  hdd_size_below_256mb()
352  {  {
353   local hdd="$1"   local hdd="$1"
# Line 453  setup_hdd_partitions_auto() Line 370  setup_hdd_partitions_auto()
370  {  {
371   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
372    
373     # sanity check - should not happen
374     if is_mounted --device "${ROOTHDD}"
375     then
376     echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
377     umount "${ROOTHDD}"
378     fi
379    
380   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
381   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
382   then   then
# Line 514  EOF Line 438  EOF
438  setup_hdd_partitions_manual()  setup_hdd_partitions_manual()
439  {  {
440   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
441     SWAPHDD=""
442   ## hdds partitionieren manual   BOOTHDD=""
443   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
444  }  }
445    
446  setup_hdd_format()  setup_hdd_format()
447  {  {
448   mke2fs -j -q ${ROOTHDD} || dialog_die   # sanity check - should not happen
449     if is_mounted --device "${ROOTHDD}"
450     then
451     echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
452     umount "${ROOTHDD}"
453     fi
454    
455     mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
456  }  }
457    
458  install_mount_rootfs()  install_mount_rootfs()
459  {  {
460   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
461   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
  cd ${INSTALLROOT} || dialog_die  
462  }  }
463    
464  install_system_image()  install_system_image()
465  {  {
466     pushd ${INSTALLROOT} > /dev/null
467   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
468     popd > /dev/null
469  }  }
470    
471  install_bootsector_chroot()  install_bootsector_chroot()
# Line 637  exit 0 Line 569  exit 0
569  CHROOTEOF  CHROOTEOF
570   fi   fi
571    
572   ## enter chroot   # run installrc
573   mount -t proc proc ${INSTALLROOT}/proc   chrooted /bin/bash --rcfile /root/.installrc -i
  mount -t sysfs sysfs ${INSTALLROOT}/sys  
  mount -o bind /dev ${INSTALLROOT}/dev  
  chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i  
  umount ${INSTALLROOT}/proc  
  umount ${INSTALLROOT}/sys  
  umount ${INSTALLROOT}/dev  
574   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
575  }  }
576    
 is_initrd_supported()  
 {  
  # only generate initrds if the cmd exists  
  [[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0  
  return 1  
 }  
   
577  install_initrd_chroot()  install_initrd_chroot()
578  {  {
579   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
# Line 697  mkinitrd -f /boot/$(readlink /boot/initr Line 616  mkinitrd -f /boot/$(readlink /boot/initr
616  exit 0  exit 0
617  CHROOTEOF  CHROOTEOF
618    
619   ## enters chroot   # run installrc
620   mount -t proc proc ${INSTALLROOT}/proc   chrooted /bin/bash --rcfile /root/.installrc -i
  mount -t sysfs sysfs ${INSTALLROOT}/sys  
  mount -o bind /dev ${INSTALLROOT}/dev  
  chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i  
  umount ${INSTALLROOT}/proc  
  umount ${INSTALLROOT}/sys  
  umount ${INSTALLROOT}/dev  
621   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
622  }  }
623    
# Line 722  is_uuid_supported() Line 635  is_uuid_supported()
635   return 1   return 1
636  }  }
637    
 get_uuid()  
 {  
  local UUID  
  local SEC_TYPE  
  local TYPE  
   
  local dev="$1"  
  [[ -z ${dev} ]] && dialog_die "no dev given"  
   
  # check if given device is already an UUID  
  if [[ ${dev/UUID=/}x != ${dev}x ]]  
  then  
  eval "${dev}"  
  else  
  eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')  
  fi  
  echo "${UUID}"  
 }  
   
638  install_system_settings()  install_system_settings()
639  {  {
640   # schreibe fstab   # schreibe fstab
# Line 774  install_system_settings() Line 668  install_system_settings()
668    
669  install_umount_rootfs()  install_umount_rootfs()
670  {  {
671   cd /   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
672   umount ${INSTALLROOT}/boot || dialog_die   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
  umount ${INSTALLROOT} || dialog_die  
673  }  }
674    
675  install_do_reboot()  install_do_reboot()
# Line 796  run_install_normal() Line 689  run_install_normal()
689   dialog_setup_hdd_format   dialog_setup_hdd_format
690   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
691   install_mount_rootfs   install_mount_rootfs
692   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
693    
694   dialog_install_settings   dialog_install_settings
695   sleep 1   sleep 1
696   install_system_settings   install_system_settings
697     dialog_install_initrd
698   install_initrd_chroot   install_initrd_chroot
699    
700   dialog_install_bootsector   dialog_install_bootsector
# Line 818  run_install_auto() Line 712  run_install_auto()
712   dialog_setup_hdd_format   dialog_setup_hdd_format
713   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
714   install_mount_rootfs   install_mount_rootfs
715   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
716    
717   dialog_install_settings   dialog_install_settings
718   sleep 1   sleep 1
719   install_system_settings   install_system_settings
720     dialog_install_initrd
721   install_initrd_chroot   install_initrd_chroot
722    
723   dialog_install_bootsector   dialog_install_bootsector

Legend:
Removed from v.2421  
changed lines
  Added in v.2439