Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer-simple/bin/installer.sh.in

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

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

    revision 2410 by niro, Tue Jan 7 13:29:00 2014 UTC revision 2475 by niro, Wed Jan 8 08:59:52 2014 UTC
    # Line 7  Line 7 
    7  # Niels Rogalla <niro@magellan-linux.de>  # Niels Rogalla <niro@magellan-linux.de>
    8  #  #
    9    
    10  # ignore the environment  # setup locales
    11  LC_ALL=C  TEXTDOMAIN=installer
    12    LC_MESSAGES=C
    13    
    14  # include dir  # include dir
    15  INSTALLER_LIBDIR="%LIBDIR%"  INSTALLER_LIBDIR="%LIBDIR%"
    16    
    # Line 27  for inc in %SYSCONFDIR%/installer.conf \ Line 29  for inc in %SYSCONFDIR%/installer.conf \
    29   ${INSTALLER_LIBDIR}/functions/common.sh \   ${INSTALLER_LIBDIR}/functions/common.sh \
    30   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
    31   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \
    32     ${INSTALLER_LIBDIR}/functions/bootloader.sh \
    33     ${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
    34   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
    35  do  do
    36   if [ -e ${inc} ]   if [ -e ${inc} ]
    # Line 106  dialog_warning() Line 110  dialog_warning()
    110   fi   fi
    111  }  }
    112    
    113  dialog_setup_hdd_info()  task_setup_system_menu()
     {  
      local SHDD="${HDD//\/dev\/}"  
       
      dialog \  
      --colors \  
      --title "[ Festplatten Partitionierung ]" \  
      --backtitle "${TITLE}" \  
      --ok-label "Weiter" \  
      --msgbox "\nBitte legen Sie 1 Partition an.\n\n\  
      [ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\  
      Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81  
     }  
       
     dialog_setup_hdd_info_auto()  
     {  
      local SHDD="${HDD//\/dev\/}"  
       
      dialog \  
      --colors \  
      --title "[ Festplatten Partitionierung ]" \  
      --backtitle "${TITLE}" \  
      --ok-label "Weiter" \  
      --msgbox "\nAchtung!\n\  
      Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81  
     }  
       
     dialog_setup_system_menu()  
    114  {  {
    115   local i   local mode
    116     local retval
    117    
    118   i=$(dialog \   mode="$(dialog_setup_system_menu)"
    119   --backtitle "${TITLE}" \   retval=$?
    120   --title "[ Festplatten Partitionierung ]" \   [[ ${retval} -eq 1 ]] && return 1
    121   --cancel-label "Abbrechen" \   if [[ ${retval} -eq 0 ]]
      --ok-label "Weiter" \  
      --stdout \  
      --colors \  
      --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \  
      "1" "Automatisches Setup (Empfohlen)" \  
      "" "" \  
      "" "\Z1Experten Modi:\Zn" \  
      "2" "Normale IDE-Disk (Manuell)" \  
      RES=$?  
      [[ ${RES} -eq 1 ]] && return 1  
      if [[ ${RES} -eq 0 ]]  
    122   then   then
    123   case "${i}" in   case "${mode}" in
    124   "1") run_install_auto ;;   "1") run_install_auto ;;
    125   "2") run_install_normal ;;   "2") run_install_normal ;;
    126   "") dialog_setup_system_menu;;   "") task_setup_system_menu;;
    127   esac   esac
    128   fi   fi
    129  }  }
    130    
    131  dialog_hardware_detection()  dialog_hardware_detection()
    132  {  {
    133   local i   local message
      local hwtmp  
       
      if [ -x $(type -P mktemp) ]  
      then  
      hwtmp="$(mktemp)"  
      else  
      hwtmp="/tmp/hwtmp.sh"  
      fi  
    134    
    135   run_hardware_detection_disks   run_hardware_detection_disks
    136    
    137   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}  
    138    
    139   if [[ ! -z ${ALL_DISKS} ]]   if [[ ! -z ${ALL_DISKS} ]]
    140   then   then
    141   for i in ${ALL_DISKS}   for i in ${ALL_DISKS}
    142   do   do
    143   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}   message+="\Z3${i}\Zn "
    144   done   done
    145     message+="\n"
    146   fi   fi
    147    
    148   if [[ ! -z ${ALL_CDROMS} ]]   if [[ ! -z ${ALL_CDROMS} ]]
    149   then   then
    150   echo " \n \\" >> ${hwtmp}   message+="\n"
    151   echo " CDROM Laufwerke:\n \\" >> ${hwtmp}   message+=$"Optical disk drives:\n"
    152   for i in ${ALL_CDROMS}   for i in ${ALL_CDROMS}
    153   do   do
    154   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}   message+="\Z3${i}\Zn"
    155   done   done
    156     message+="\n"
    157   fi   fi
    158    
    159   # other devices   # other devices
    160   run_hardware_detection   run_hardware_detection
    161   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
    162   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
    163   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
    164   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
    165   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;   *) message+=$"\n\ZnCommon device detected.\Zn" ;;
    166   esac   esac
    167   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    168   then   then
    169   echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
    170   fi   fi
    171    
    172   echo " \" 14 70" >> ${hwtmp}   messagebox -y 12 -h $"Detected hardware:" "${message}"
      chmod a+x ${hwtmp}  
      ${hwtmp}  
       
      # remove tmp file  
      if [[ -f ${hwtmp} ]]  
      then  
      rm ${hwtmp}  
      fi  
    173  }  }
    174    
    175  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manual()
    176  {  {
    177   local i   local i
    178     local retval
    179    
    180   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
    181   then   then
    182   dialog \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    183   exit 1   exit 1
    184   else   else
    185     HDD=$(dialog_select_target_harddrive)
    186   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
    187   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
    188   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 ${installdevs}  
      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 ]]  
    189   then   then
    190   dialog_setup_hdd_info   dialog_setup_hdd_info
    191   setup_hdd_partitions_manuell   setup_hdd_partitions_manual
    192   fi   fi
    193   fi   fi
    194  }  }
    # Line 266  dialog_setup_hdd_partitions_manuell() Line 196  dialog_setup_hdd_partitions_manuell()
    196  dialog_setup_hdd_partitions_auto()  dialog_setup_hdd_partitions_auto()
    197  {  {
    198   local i   local i
    199     local retval
    200    
    201   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
    202   then   then
    203   dialog \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    204   exit 1   exit 1
    205   else   else
    206     HDD=$(dialog_select_target_harddrive)
    207   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
    208   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
    209   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 ${installdevs}  
      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 ]]  
    210   then   then
    211   dialog_setup_hdd_info_auto   dialog_setup_hdd_info_auto
    212   dialog_setup_hdd_create_partitions   dialog_setup_hdd_create_partitions
    # Line 302  dialog_setup_hdd_partitions_auto() Line 215  dialog_setup_hdd_partitions_auto()
    215   fi   fi
    216  }  }
    217    
    218  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()  
    219  {  {
    220   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    221   do   do
    # Line 358  dialog_install_meter() Line 228  dialog_install_meter()
    228   return 0   return 0
    229  }  }
    230    
       
     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  
     }  
       
    231  dialog_main()  dialog_main()
    232  {  {
    233   METHOD=0   local method=0
    234     local retval
    235    
    236   while [[ ${METHOD} -le 2 ]]   while [[ ${method} -le 2 ]]
    237   do   do
    238   METHOD=$(dialog \   method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \
    239   --backtitle "${TITLE}" \   $"1:Install system" \
    240   --no-cancel \   $"2:Show detected harddrives" \
    241   --ok-label "Weiter" \   $"3:Exit and reboot" \
    242   --stdout \   $"4:Exit and drop into a shell")
    243   --menu "Konfiguration" 14 70 5 \   retval=$?
    244   "1" "AutoSta_LX installieren" \   [[ ${retval} -eq 1 ]] && exit 1
    245   "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 ]]  
    246   then   then
    247   case ${METHOD} in   case ${method} in
    248   "1") dialog_setup_system_menu ;;   "1") task_setup_system_menu ;;
    249   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
    250   "3") install_do_reboot ;;   "3") install_do_reboot ;;
    251   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
    # Line 423  run_hardware_detection() Line 263  run_hardware_detection()
    263    
    264   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    265    
    266   # check for special devices/clients:   ## check for special devices/clients:
    267   # 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
    268   local removable=0   #local removable=0
    269   if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]   #if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
    270   then   #then
    271   for i in /sys/block/[hs]d*/removable   #for i in /sys/block/[hs]d*/removable
    272   do   #do
    273   if [[ $(< ${i}) = 1 ]]   #if [[ $(< ${i}) = 1 ]]
    274   then   #then
    275   removable=1   #removable=1
    276   fi   #fi
    277   done   #done
    278     ## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
    279   # only add this for grub legacy, grub2 detect these settings on its own  
    280   export GRUBLEGACYOPTS="rootdelay=8"   ## only add this for grub legacy, grub2 detect these settings on its own
    281   # there are to zotac types in the wild, nvidia based gfx and intel   #export GRUBLEGACYOPTS="rootdelay=8"
    282   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   ## there are to zotac types in the wild, nvidia based gfx and intel
    283   then   #if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    284   export SPECIALDEVICE="zotac_nvidia"   #then
    285   else   #export SPECIALDEVICE="zotac_nvidia"
    286   export SPECIALDEVICE="zotac_intel"   #else
    287   fi   #export SPECIALDEVICE="zotac_intel"
    288   fi   #fi
    289     #fi
    290    
    291   # check for special devices/clients:   # check for special devices/clients:
    292   # 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 474  run_hardware_detection() Line 315  run_hardware_detection()
    315   fi   fi
    316  }  }
    317    
    318    run_hardware_detection_disks()
    319    {
    320     local bootdev
    321    
    322     # all disks but exclude ramdisks
    323     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
    324     # remove the boot device from ALL_DISKS if it was an usbstick
    325     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
    326     then
    327     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
    328     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
    329     fi
    330     export ALL_CDROMS="$(get_hwinfo cdrom)"
    331    }
    332    
    333  hdd_size_below_256mb()  hdd_size_below_256mb()
    334  {  {
    335   local hdd="$1"   local hdd="$1"
    # Line 496  setup_hdd_partitions_auto() Line 352  setup_hdd_partitions_auto()
    352  {  {
    353   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    354    
    355     # sanity check - should not happen
    356     if is_mounted --device "${ROOTHDD}"
    357     then
    358     echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
    359     umount "${ROOTHDD}"
    360     fi
    361    
    362   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    363   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    364   then   then
    # Line 554  EOF Line 417  EOF
    417   fi   fi
    418  }  }
    419    
    420  setup_hdd_partitions_manuell()  setup_hdd_partitions_manual()
    421  {  {
    422   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    423     SWAPHDD=""
    424   ## hdds partitionieren manuell   BOOTHDD=""
    425   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
    426  }  }
    427    
    428  setup_hdd_format()  setup_hdd_format()
    429  {  {
    430   mke2fs -j -q ${ROOTHDD} || dialog_die   # sanity check - should not happen
    431     if is_mounted --device "${ROOTHDD}"
    432     then
    433     echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
    434     umount "${ROOTHDD}"
    435     fi
    436    
    437     mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
    438  }  }
    439    
    440  install_mount_rootfs()  install_mount_rootfs()
    441  {  {
    442   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
    443   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
      cd ${INSTALLROOT} || dialog_die  
    444  }  }
    445    
    446  install_system_image()  install_system_image()
    447  {  {
    448     pushd ${INSTALLROOT} > /dev/null
    449   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
    450     popd > /dev/null
    451  }  }
    452    
    453  install_bootsector_chroot()  disabled_install_bootsector_chroot()
    454  {  {
    455   local my_roothdd   local my_roothdd
    456   local grubconf=${INSTALLROOT}/boot/grub/grub.conf   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
    457   local grub2conf=/boot/grub/grub.cfg   local grub2conf="/boot/grub/grub.cfg"
    458    
    459   # check for grub2   # check for grub2
    460   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
    # Line 599  install_bootsector_chroot() Line 470  install_bootsector_chroot()
    470   then   then
    471   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLROOT}/etc/conf.d/grub || dialog_die   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLROOT}/etc/conf.d/grub || dialog_die
    472   else   else
    473   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/grub"
    474   fi   clearconfig
    475   echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die   addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
    476   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   fi
    477   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   CONFIG="${INSTALLROOT}/root/.installrc"
    478   echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die   clearconfig
    479     # only grub 1.99
    480     addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
    481     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
    482     addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
    483     addconfig "exit 0"
    484    
    485   # grub-legacy   # grub-legacy
    486   else   else
      ### grubconf schreiben  
    487   source ${INSTALLROOT}/boot/kernelversion   source ${INSTALLROOT}/boot/kernelversion
    488    
      #for alx only  
    489   if [ -e ${INSTALLROOT}/etc/alx_version ]   if [ -e ${INSTALLROOT}/etc/alx_version ]
    490   then   then
    491   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
    # Line 625  install_bootsector_chroot() Line 499  install_bootsector_chroot()
    499   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
    500    
    501   # uuid support   # uuid support
    502   if is_uuid_supported   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
      then  
      my_roothdd="UUID=$(get_uuid ${ROOTHDD})"  
      else  
      my_roothdd="${ROOTHDD}"  
      fi  
    503    
    504   : > ${grubconf} || dialog_die   CONFIG="${grubconf}"
    505   echo "default 0" >> ${grubconf} || dialog_die   clearconfig
    506   echo "timeout 3" >> ${grubconf} || dialog_die   addconfig "default 0"
    507     addconfig "timeout 3"
    508   # using current root password   # using current root password
    509   echo "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || dialog_die   addconfig "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"
    510    
    511   echo  >> ${grubconf} || dialog_die   addconfig
    512   echo "# normal boot" >> ${grubconf} || dialog_die   addconfig "# normal boot"
    513   echo "title ${KRNVER}" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER}"
    514   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    515   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
    516   if is_initrd_supported   if is_initrd_supported
    517   then   then
    518   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    519   fi   fi
    520    
    521   echo >> ${grubconf} || dialog_die   addconfig
    522   echo "# admin boot" >> ${grubconf} || dialog_die   addconfig "# admin boot"
    523   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Re-run hardware-detection"
    524   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    525   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    526   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection"
    527   if is_initrd_supported   if is_initrd_supported
    528   then   then
    529   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    530   fi   fi
    531    
    532   echo >> ${grubconf} || dialog_die   addconfig
    533   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Reset *all* local settings"
    534   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    535   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    536   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings"
    537   if is_initrd_supported   if is_initrd_supported
    538   then   then
    539   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    540   fi   fi
    541    
    542   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
    # Line 680  exit 0 Line 550  exit 0
    550  CHROOTEOF  CHROOTEOF
    551   fi   fi
    552    
    553   ## enter chroot   # run installrc
    554   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  
    555   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    556  }  }
    557    
    558  is_initrd_supported()  disabled_install_initrd_chroot()
     {  
      # only generate initrds if the cmd exists  
      [[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0  
      return 1  
     }  
       
     install_initrd_chroot()  
    559  {  {
    560   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    561   is_initrd_supported || return 0   is_initrd_supported || return 0
    # Line 726  install_initrd_chroot() Line 583  install_initrd_chroot()
    583    
    584   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    585   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
    586   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLROOT}/etc/modprobe.d/uvesafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/uvesafb.conf"
    587     clearconfig
    588     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    589    
    590   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    591   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
    592     clearconfig
    593     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    594    
    595   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    596   echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLROOT}/etc/modprobe.d/i810fb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/i810fb.conf"
    597     clearconfig
    598     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    599    
    600   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
    601  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
    # Line 740  mkinitrd -f /boot/$(readlink /boot/initr Line 603  mkinitrd -f /boot/$(readlink /boot/initr
    603  exit 0  exit 0
    604  CHROOTEOF  CHROOTEOF
    605    
    606   ## enters chroot   # run installrc
    607   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  
    608   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    609  }  }
    610    
     is_uuid_supported()  
     {  
      if [[ -x $(type -P busybox.mkinitrd) ]]  
      then  
      # only detect uuids if supported  
      if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]  
      then  
      return 0  
      fi  
      fi  
       
      return 1  
     }  
       
     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}"  
     }  
       
    611  install_system_settings()  install_system_settings()
    612  {  {
    613   # schreibe fstab   local CONFIG
    614   if is_uuid_supported  
    615   then   # write fstab
    616   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
    617   else   clearconfig
    618   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
    619   fi   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    620   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
      #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
      echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
      echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
    621    
    622   # install network config skeleton   # install network config skeleton
    623   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
    624     clearconfig
    625     addconfig 'ONBOOT="yes"'
    626     addconfig 'NETWORKING="dhcp"'
    627    
    628   # intel framebufer quirk   # intel framebuffer quirk
    629   if [[ -e /proc/fb ]]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    630   then   then
    631   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   if [ -e /proc/fb ]
    632   then   then
    633   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
      if [[ ${fbdev} != 0 ]]  
    634   then   then
    635   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    636     if [[ ${fbdev} != 0 ]]
    637     then
    638     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
    639     fi
    640   fi   fi
    641   fi   fi
    642   fi   fi
    # Line 817  install_system_settings() Line 644  install_system_settings()
    644    
    645  install_umount_rootfs()  install_umount_rootfs()
    646  {  {
    647   cd /   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    648   umount ${INSTALLROOT}/boot || dialog_die   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
      umount ${INSTALLROOT} || dialog_die  
    649  }  }
    650    
    651  install_do_reboot()  install_do_reboot()
    # Line 835  run_install_normal() Line 661  run_install_normal()
    661  {  {
    662   dialog_hardware_detection   dialog_hardware_detection
    663    
    664   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manual
    665   dialog_setup_hdd_format   dialog_setup_hdd_format
    666   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    667   install_mount_rootfs   install_mount_rootfs
    668   (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
    669    
    670   dialog_install_settings   dialog_install_settings
    671   sleep 1   sleep 1
    672   install_system_settings   install_system_settings
    673   install_initrd_chroot   if is_initrd_supported
    674     then
    675     dialog_install_initrd
    676     initrd_config
    677     initrd_install
    678     fi
    679    
    680   dialog_install_bootsector   dialog_install_bootsector
    681   install_bootsector_chroot   bootloader_config
    682     bootloader_install
    683    
    684   install_umount_rootfs   install_umount_rootfs
    685   dialog_install_successful   dialog_install_successful
    # Line 861  run_install_auto() Line 693  run_install_auto()
    693   dialog_setup_hdd_format   dialog_setup_hdd_format
    694   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    695   install_mount_rootfs   install_mount_rootfs
    696   (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
    697    
    698   dialog_install_settings   dialog_install_settings
    699   sleep 1   sleep 1
    700   install_system_settings   install_system_settings
    701   install_initrd_chroot   if is_initrd_supported
    702     then
    703     dialog_install_initrd
    704     initrd_config
    705     initrd_install
    706     fi
    707    
    708   dialog_install_bootsector   dialog_install_bootsector
    709   install_bootsector_chroot   bootloader_config
    710     bootloader_install
    711    
    712   install_umount_rootfs   install_umount_rootfs
    713   dialog_install_successful   dialog_install_successful
    Legend:
    Removed from v.2410  
    changed lines
      Added in v.2475