Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

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

    revision 6820 by niro, Thu Jul 23 08:54:42 2015 UTC revision 6834 by niro, Thu Jul 23 12:25:33 2015 UTC
    # Line 10  MLIBDIR="/usr/lib/alxinstall-ng" Line 10  MLIBDIR="/usr/lib/alxinstall-ng"
    10  source /mnt/cdrom/system/images.conf  source /mnt/cdrom/system/images.conf
    11    
    12  # includes  # includes
    13    source ${MLIBDIR}/functions/generic.sh
    14  source ${MLIBDIR}/functions/hwdetection.sh  source ${MLIBDIR}/functions/hwdetection.sh
    15    
    16  ### System/Config Version  ### System/Config Version
    17  VERSION="@@VERSION@@"  VERSION="@@VERSION@@"
    18  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
    19    
    20    # locations
    21  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
    22  INSTALLPATH="/mnt/magellan"  INSTALLPATH="/mnt/magellan"
    23    
    24  ### linecount of system.tar.gz -1 !  # default system settings
     CURRENTLINE=0  
     #TOTALLINES=11072 # -> now in images.conf  
       
    25  # standard kernel opts  # standard kernel opts
    26  KERNELOPTS="quiet video=1024x768"  DEFAULT_KERNELOPTS="quiet video=1024x768"
    27    
    28  # grub options  # grub options
    29  GRUBLEGACYOPTS=""  DEFAULT_GRUBLEGACYOPTS=""
    30  GRUB2OPTS=""  DEFAULT_GRUB2OPTS=""
    31  GRUB2GFXPAYLOAD="1024x768x16,1024x768"  DEFAULT_GRUB2GFXPAYLOAD="1024x768x16,1024x768"
       
     # fdisk options  
     FDISKPARTIONBELOW256MB=0  
    32    
    33  # default specialdevices  # default specialdevices
    34  SPECIALDEVICE=""  DEFAULT_FORMFACTOR="desktop"
     FORMFACTOR="desktop"  
    35    
    36  # target filesystem  # target filesystem
    37  FORMAT_FILESYSTEM="ext4"  DEFAULT_FORMAT_FILESYSTEM="ext4"
    38    
    39    # initialize global variables so they are exportable
    40    INSTALL_METHOD=""
    41    KERNELOPTS=""
    42    GRUBLEGACYOPTS=""
    43    GRUB2OPTS=""
    44    GRUB2GFXPAYLOAD=""
    45    FORMFACTOR=""
    46    FORMAT_FILESYSTEM=""
    47    FDISKPARTIONBELOW256MB=0
    48    SPECIALDEVICE=""
    49    ### linecount of system.tar.gz -1 !
    50    CURRENTLINE=0
    51    #TOTALLINES=11072 # -> now in images.conf
    52    
    53  #################################################  #################################################
    54  #  DIALOG BOXES #  #  DIALOG BOXES #
    # Line 50  die() Line 59  die()
    59   ERROR=$1   ERROR=$1
    60   RETVAL=$?   RETVAL=$?
    61   dialog_install_failure   dialog_install_failure
    62     trap_exit
    63   exit 1   exit 1
    64  }  }
    65    
    # Line 73  dialog_warning() Line 83  dialog_warning()
    83    
    84  dialog_setup_hdd_info()  dialog_setup_hdd_info()
    85  {  {
    86     case "${INSTALL_METHOD}" in
    87     auto)
    88     dialog_setup_hdd_info_auto
    89     dialog_setup_hdd_create_partitions
    90     ;;
    91     normal) dialog_setup_hdd_info_normal ;;
    92     single) dialog_setup_hdd_info_single ;;
    93     esac
    94    }
    95    
    96    dialog_setup_hdd_info_normal()
    97    {
    98   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
    99    
    100   dialog \   dialog \
    # Line 87  dialog_setup_hdd_info() Line 109  dialog_setup_hdd_info()
    109   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    110  }  }
    111    
    112  dialog_setup_hdd_info_simple()  dialog_setup_hdd_info_single()
    113  {  {
    114   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    115    
    # Line 130  dialog_setup_system_menu() Line 152  dialog_setup_system_menu()
    152   "" "" \   "" "" \
    153   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
    154   "2" "Normale IDE-Disk (Manuell)" \   "2" "Normale IDE-Disk (Manuell)" \
    155   "3" "Flash-Speicher (Manuell)")   "3" "Normale IDE Disk (Single)")
    156   RES=$?   RES=$?
    157   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    158   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    159   then   then
    160   case "${i}" in   case "${i}" in
    161   "1") run_install_auto ;;   "1") run_install auto ;;
    162   "2") run_install_normal ;;   "2") run_install normal ;;
    163   "3") run_install_simple ;;   "3") run_install single ;;
    164   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    165   esac   esac
    166   fi   fi
    # Line 209  dialog_hardware_detection() Line 231  dialog_hardware_detection()
    231   fi   fi
    232  }  }
    233    
    234  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions()
    235  {  {
    236   local i   local i
    237    
    # Line 242  dialog_setup_hdd_partitions_manuell() Line 264  dialog_setup_hdd_partitions_manuell()
    264   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    265   then   then
    266   dialog_setup_hdd_info   dialog_setup_hdd_info
    267   setup_hdd_partitions_manuell   setup_hdd_partitions
      fi  
      fi  
     }  
       
     dialog_setup_hdd_partitions_manuell_simple()  
     {  
      local i  
       
      if [[ -z ${ALL_DISKS} ]]  
      then  
      dialog \  
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
      exit 1  
      else  
       
      echo "dialog \\" > /tmp/hddtmp.sh  
      echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh  
      echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh  
      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 ]]  
      then  
      dialog_setup_hdd_info_simple  
      setup_hdd_partitions_manuell_simple  
      fi  
      fi  
     }  
       
     dialog_setup_hdd_partitions_auto()  
     {  
      local i  
       
      if [[ -z ${ALL_DISKS} ]]  
      then  
      dialog \  
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
      exit 1  
      else  
       
      echo "dialog \\" > /tmp/hddtmp.sh  
      echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh  
      echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh  
      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 ]]  
      then  
      dialog_setup_hdd_info_auto  
      dialog_setup_hdd_create_partitions  
      setup_hdd_partitions_auto  
    268   fi   fi
    269   fi   fi
    270  }  }
    # Line 365  dialog_install_meter() Line 310  dialog_install_meter()
    310   return 0   return 0
    311  }  }
    312    
       
    313  dialog_install_bootsector()  dialog_install_bootsector()
    314  {  {
    315   dialog \   dialog \
    # Line 427  dialog_main() Line 371  dialog_main()
    371  run_hardware_detection()  run_hardware_detection()
    372  {  {
    373   local hwinfo   local hwinfo
       
    374   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    375    
    376   # check for special devices/clients:   # check for special devices/clients:
    # Line 532  hdd_size_below_256mb() Line 475  hdd_size_below_256mb()
    475   return "${retval}"   return "${retval}"
    476  }  }
    477    
    478  setup_hdd_partitions_auto()  setup_hdd_partitions()
    479  {  {
    480   ROOTHDD="${HDD}1"   case "${INSTALL_METHOD}" in
    481     normal)
    482     BOOTHDD="${HDD}1"
    483     SWAPHDD="${HDD}2"
    484     ROOTHDD="${HDD}3"
    485     ;;
    486    
    487     single|auto)
    488     BOOTHDD=""
    489     SWAPHDD=""
    490     ROOTHDD="${HDD}1"
    491     ;;
    492     esac
    493    
    494   # run this only if FDISKPARTITIONBELOW256MB is not already 1   if [[ ${INSTALL_METHOD} = auto ]]
      if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]  
    495   then   then
    496   if hdd_size_below_256mb ${HDD}   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    497     if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    498   then   then
    499   FDISKPARTIONBELOW256MB=1   if hdd_size_below_256mb ${HDD}
    500   else   then
    501   FDISKPARTIONBELOW256MB=0   FDISKPARTIONBELOW256MB=1
    502     else
    503     FDISKPARTIONBELOW256MB=0
    504     fi
    505   fi   fi
      fi  
    506    
    507   ## delete disk   ## delete disk
    508   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
    509    
    510   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
    511   then   then
    512   ## setup one bootable partition   ## setup one bootable partition
    513   #1. n= new disk   #1. n= new disk
    514   #2. p= primary disk   #2. p= primary disk
    515   #3. 1= first partition   #3. 1= first partition
    516   #4. 2= default sector start // small disk needs more space for grub2 mbr sector   #4. 2= default sector start // small disk needs more space for grub2 mbr sector
    517   #5. ''= defaul sector end   #5. ''= defaul sector end
    518   #6. a= bootable flag   #6. a= bootable flag
    519   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
    520   #8. w= write/quit   #8. w= write/quit
    521   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
    522  n  n
    523  p  p
    524  1  1
    # Line 571  a Line 528  a
    528  1  1
    529  w  w
    530  EOF  EOF
    531   else   else
    532   ## setup one bootable partition   ## setup one bootable partition
    533   #1. n= new disk   #1. n= new disk
    534   #2. p= primary disk   #2. p= primary disk
    535   #3. 1= first partition   #3. 1= first partition
    536   #4. ''= default sector start   #4. ''= default sector start
    537   #5. ''= defaul sector end   #5. ''= defaul sector end
    538   #6. a= bootable flag   #6. a= bootable flag
    539   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
    540   #8. w= write/quit   #8. w= write/quit
    541   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
    542  n  n
    543  p  p
    544  1  1
    # Line 591  a Line 548  a
    548  1  1
    549  w  w
    550  EOF  EOF
    551     fi
    552     else
    553     ## hdds partitionieren manuell
    554     cfdisk ${HDD} || die
    555   fi   fi
    556  }  }
    557    
     setup_hdd_partitions_manuell()  
     {  
      BOOTHDD="${HDD}1"  
      SWAPHDD="${HDD}2"  
      ROOTHDD="${HDD}3"  
       
      ## hdds partitionieren manuell  
      cfdisk ${HDD} || die  
     }  
       
     setup_hdd_partitions_manuell_simple()  
     {  
      ROOTHDD="${HDD}1"  
       
      ## hdds partitionieren manuell  
      cfdisk ${HDD} || die  
     }  
       
    558  setup_hdd_format()  setup_hdd_format()
    559  {  {
    560   mkswap ${SWAPHDD} || die   if [[ -n ${SWAPHDD} ]]
    561   mke2fs -j -q ${BOOTHDD} || die   then
    562   mke2fs -j -q ${ROOTHDD} || die   mkswap ${SWAPHDD} || die
    563  }   fi
    564     if [[ -n ${BOOTHDD} ]]
    565  setup_hdd_format_simple()   then
    566  {   mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die
    567   mke2fs -j -q ${ROOTHDD} || die   fi
    568     if [[ -n ${ROOTHDD} ]]
    569     then
    570     mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || die
    571     fi
    572  }  }
    573    
    574  install_mount_rootfs()  install_mount_rootfs()
    575  {  {
    576   swapon ${SWAPHDD} || die   if [[ -n ${SWAPHDD} ]]
    577   mount ${ROOTHDD} ${INSTALLPATH} || die   then
    578   install -d ${INSTALLPATH}/boot || die   swapon ${SWAPHDD} || die
    579   mount ${BOOTHDD} ${INSTALLPATH}/boot || die   fi
    580   cd ${INSTALLPATH} || die   if [[ -n ${ROOTHDD} ]]
    581  }   then
    582     mount ${ROOTHDD} ${INSTALLPATH} || die
    583     fi
    584     if [[ -n ${BOOTHDD} ]]
    585     then
    586     install -d ${INSTALLPATH}/boot || die
    587     mount ${BOOTHDD} ${INSTALLPATH}/boot || die
    588     fi
    589    
     install_mount_rootfs_simple()  
     {  
      mount ${ROOTHDD} ${INSTALLPATH} || die  
      install -d ${INSTALLPATH}/boot || die  
    590   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || die
    591  }  }
    592    
    # Line 650  install_bootsector_chroot() Line 600  install_bootsector_chroot()
    600   local my_roothdd   local my_roothdd
    601   local grubconf=${INSTALLPATH}/boot/grub/grub.conf   local grubconf=${INSTALLPATH}/boot/grub/grub.conf
    602   local grub2conf=/boot/grub/grub.cfg   local grub2conf=/boot/grub/grub.cfg
    603     local CONFIG
    604    
    605   # check for grub2   # check for grub2
    606   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]
    # Line 669  install_bootsector_chroot() Line 620  install_bootsector_chroot()
    620   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
    621   echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die   echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die
    622   fi   fi
    623   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   CONFIG=${INSTALLPATH}/.installrc
    624   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   clearconfig
    625   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   addconfig 'grub-mkdevicemap'
    626   echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die   addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
    627     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
    628     addconfig "exit 0"
    629    
    630   # grub-legacy   # grub-legacy
    631   else   else
    # Line 700  install_bootsector_chroot() Line 653  install_bootsector_chroot()
    653   my_roothdd="${ROOTHDD}"   my_roothdd="${ROOTHDD}"
    654   fi   fi
    655    
    656   : > ${grubconf} || die   CONFIG="${grubconf}"
    657   echo "default 0" >> ${grubconf} || die   clearconfig
    658   echo "timeout 3" >> ${grubconf} || die   addconfig "default 0"
    659     addconfig "timeout 3"
    660   # using current root password   # using current root password
    661   echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die   addconfig "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"
    662     addconfig
    663   echo  >> ${grubconf} || die   addconfig "# normal boot"
    664   echo "# normal boot" >> ${grubconf} || die   addconfig "title ${KRNVER}"
    665   echo "title ${KRNVER}" >> ${grubconf} || die   addconfig "root (hd0,0)"
    666   echo "root (hd0,0)" >> ${grubconf} || die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
      echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die  
    667   if is_initrd_supported   if is_initrd_supported
    668   then   then
    669   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
    670   fi   fi
    671     addconfig
    672   echo >> ${grubconf} || die   addconfig "# admin boot"
    673   echo "# admin boot" >> ${grubconf} || die   addconfig "title ${KRNVER} - Re-run hardware-detection"
    674   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die   addconfig "lock"
    675   echo "lock"  >> ${grubconf} || die   addconfig "root (hd0,0)"
    676   echo "root (hd0,0)" >> ${grubconf} || die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection"
      echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die  
    677   if is_initrd_supported   if is_initrd_supported
    678   then   then
    679   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
    680   fi   fi
    681     addconfig
    682   echo >> ${grubconf} || die   addconfig "title ${KRNVER} - Reset *all* local settings"
    683   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die   addconfig "lock"
    684   echo "lock"  >> ${grubconf} || die   addconfig "root (hd0,0)"
    685   echo "root (hd0,0)" >> ${grubconf} || die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings"
      echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die  
    686   if is_initrd_supported   if is_initrd_supported
    687   then   then
    688   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
    689   fi   fi
    690    
    691   # write bootsector chrooted (lfs/magellan)   # write bootsector chrooted (lfs/magellan)
    692   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   CONFIG=${INSTALLPATH}/.installrc
    693  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null   clearconfig
    694  root (hd0,0)   addconfig '/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null'
    695  setup (hd0)   addconfig 'root (hd0,0)'
    696  quit   addconfig 'setup (hd0)'
    697  EOF   addconfig 'quit'
    698  exit 0   addconfig 'EOF'
    699  CHROOTEOF   addconfig 'exit 0'
    700   fi   fi
    701    
    702   ## enters chroot   ## enter chroot
    703   mount -t proc proc ${INSTALLPATH}/proc   enter_chroot_installrc
      mount -t sysfs sysfs ${INSTALLPATH}/sys  
      mount -o bind /dev ${INSTALLPATH}/dev  
      chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i  
      umount ${INSTALLPATH}/proc  
      umount ${INSTALLPATH}/sys  
      umount ${INSTALLPATH}/dev  
      rm ${INSTALLPATH}/root/.installrc  
    704  }  }
    705    
    706  is_initrd_supported()  is_initrd_supported()
    # Line 768  is_initrd_supported() Line 712  is_initrd_supported()
    712    
    713  install_initrd_chroot()  install_initrd_chroot()
    714  {  {
    715     local CONFIG
    716    
    717   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    718   is_initrd_supported || return 0   is_initrd_supported || return 0
    719    
    # Line 793  install_initrd_chroot() Line 739  install_initrd_chroot()
    739   fi   fi
    740    
    741   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    742   install -d ${INSTALLPATH}/etc/modprobe.d || die   CONFIG=${INSTALLPATH}/etc/modprobe.d/uvesafb.conf
    743   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die   clearconfig
    744     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    745    
    746   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    747   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die   CONFIG=${INSTALLPATH}/etc/modprobe.d/viafb.conf
    748     clearconfig
    749     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    750    
    751   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    752   echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die   CONFIG=${INSTALLPATH}/etc/modprobe.d/i810fb.conf
    753     clearconfig
    754   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    755  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd  
    756  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null   CONFIG=${INSTALLPATH}/.installrc
    757  exit 0   clearconfig
    758  CHROOTEOF   addconfig 'echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd'
    759     addconfig 'mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null'
    760   ## enters chroot   addconfig 'exit 0'
    761   mount -t proc proc ${INSTALLPATH}/proc   ## enter chroot
    762   mount -t sysfs sysfs ${INSTALLPATH}/sys   enter_chroot_installrc
      mount -o bind /dev ${INSTALLPATH}/dev  
      chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i  
      umount ${INSTALLPATH}/proc  
      umount ${INSTALLPATH}/sys  
      umount ${INSTALLPATH}/dev  
      rm ${INSTALLPATH}/root/.installrc  
    763  }  }
    764    
    765  is_uuid_supported()  is_uuid_supported()
    # Line 857  install_system_settings() Line 800  install_system_settings()
    800   # schreibe fstab   # schreibe fstab
    801   if is_uuid_supported   if is_uuid_supported
    802   then   then
    803   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if [[ -n ${BOOTHDD} ]]
    804   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
    805     echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    806     fi
    807     if [[ -n ${ROOTHDD} ]]
    808     then
    809     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    810     fi
    811   else   else
    812   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if [[ -n ${BOOTHDD} ]]
    813   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
    814     echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    815     fi
    816     if [[ -n ${ROOTHDD} ]]
    817     then
    818     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    819     fi
    820   fi   fi
    821   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    822   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    # Line 885  install_system_settings() Line 840  install_system_settings()
    840   fi   fi
    841  }  }
    842    
     install_system_settings_simple()  
     {  
      # write fstab  
      if is_uuid_supported  
      then  
      echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die  
      else  
      echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die  
      fi  
      echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die  
      echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die  
     }  
       
    843  install_umount_rootfs()  install_umount_rootfs()
    844  {  {
    845   cd /   cd /
    846   umount ${INSTALLPATH}/boot || die   if [[ -n ${BOOTHDD} ]]
    847   umount ${INSTALLPATH} || die   then
    848   swapoff ${SWAPHDD} || die   umount ${INSTALLPATH}/boot || die
    849  }   fi
    850     if [[ -n ${ROOTHDD} ]]
    851  install_umount_rootfs_simple()   then
    852  {   umount ${INSTALLPATH} || die
    853   cd /   fi
    854   umount ${INSTALLPATH} || die   if [[ -n ${SWAPHDD} ]]
    855     then
    856     swapoff ${SWAPHDD} || die
    857     fi
    858  }  }
    859    
    860  install_do_reboot()  install_do_reboot()
    # Line 921  install_do_reboot() Line 866  install_do_reboot()
    866  #     Install Main Scripts #  #     Install Main Scripts #
    867  #################################################  #################################################
    868    
    869  run_install_normal()  run_install()
    870  {  {
    871     local method="$1"
    872    
    873     # setup install environment
    874     export KERNELOPTS="${DEFAULT_KERNELOPTS}"
    875     export GRUBLEGACYOPTS="${GRUBLEGACYOPTS}"
    876     export GRUB2OPTS="${GRUB2OPTS}"
    877     export GRUB2GFXPAYLOAD="${DEFAULT_GRUB2GFXPAYLOAD}"
    878     export FORMFACTOR="${DEFAULT_FORMFACTOR}"
    879     export FORMAT_FILESYSTEM="${DEFAULT_FORMAT_FILESYSTEM}"
    880    
    881     case "${method}" in
    882     auto)
    883     export INSTALL_METHOD="${method}"
    884     ;;
    885     normal)
    886     export INSTALL_METHOD="${method}"
    887     ;;
    888     single)
    889     export INSTALL_METHOD="${method}"
    890     ;;
    891     *)
    892     echo "Unknown install method '${method}', aborting."
    893     exit 1
    894     ;;
    895     esac
    896    
    897   dialog_hardware_detection   dialog_hardware_detection
    898    
    899   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions
    900   dialog_setup_hdd_format   dialog_setup_hdd_format
    901   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    902   install_mount_rootfs   install_mount_rootfs
    # Line 943  run_install_normal() Line 914  run_install_normal()
    914   dialog_install_successful   dialog_install_successful
    915  }  }
    916    
    917  run_install_simple()  # set some proper traps
    918  {  trap "trap_exit" SIGINT SIGQUIT
      dialog_hardware_detection  
       
      dialog_setup_hdd_partitions_manuell_simple  
      dialog_setup_hdd_format  
      setup_hdd_format_simple > /dev/null  
      install_mount_rootfs_simple  
      (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image  
       
      dialog_install_settings  
      sleep 1  
      install_system_settings_simple  
      install_initrd_chroot  
       
      dialog_install_bootsector  
      install_bootsector_chroot  
       
      install_umount_rootfs_simple  
      dialog_install_successful  
     }  
       
     run_install_auto()  
     {  
      dialog_hardware_detection  
       
      dialog_setup_hdd_partitions_auto  
      dialog_setup_hdd_format  
      setup_hdd_format_simple > /dev/null  
      install_mount_rootfs_simple  
      (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image  
       
      dialog_install_settings  
      sleep 1  
      install_system_settings_simple  
      install_initrd_chroot  
       
      dialog_install_bootsector  
      install_bootsector_chroot  
       
      install_umount_rootfs_simple  
      dialog_install_successful  
     }  
    919    
    920  dialog_main  dialog_main
    921    
    Legend:
    Removed from v.6820  
    changed lines
      Added in v.6834