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 2424 by niro, Tue Jan 7 13:56:51 2014 UTC revision 2476 by niro, Wed Jan 8 09:15:14 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\/}"  
       
      messagebox -h $"[ Harddrive partitioning ]" \  
      $"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."  
     }  
       
     dialog_setup_hdd_info_auto()  
     {  
      local SHDD="${HDD//\/dev\/}"  
       
      messagebox -h $"[ Harddrive partitioning ]" \  
      $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"  
     }  
       
     dialog_setup_system_menu()  
    114  {  {
    115   local mode   local mode
    116   local retval   local retval
    117    
    118   mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \   mode="$(dialog_setup_system_menu)"
      $"1:Automatic setup (recommended)" \  
      ":" \  
      $":\Z1Expert modes:\Zn" \  
      $"2:Common IDE-disk (manual setup)")  
    119   retval=$?   retval=$?
    120   [[ ${retval} -eq 1 ]] && return 1   [[ ${retval} -eq 1 ]] && return 1
    121   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
    # Line 139  dialog_setup_system_menu() Line 123  dialog_setup_system_menu()
    123   case "${mode}" 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  }  }
    # Line 178  dialog_hardware_detection() Line 162  dialog_hardware_detection()
    162   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
    163   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
    164   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
    165   *) message+=$"\n \\ZnCommon device detected.\Zn" ;;   *) message+=$"\n\ZnCommon device detected.\Zn" ;;
    166   esac   esac
    167   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    168   then   then
    169   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
    170   fi   fi
    171    
    172   messagebox -y 15 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
    173  }  }
    174    
    175  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
    # Line 231  dialog_setup_hdd_partitions_auto() Line 215  dialog_setup_hdd_partitions_auto()
    215   fi   fi
    216  }  }
    217    
     run_hardware_detection_disks()  
     {  
      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  
     }  
       
    218  install_meter()  install_meter()
    219  {  {
    220   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    # Line 287  install_meter() Line 228  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   local method=0   local method=0
    # Line 320  dialog_main() Line 235  dialog_main()
    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")
      --menu "Konfiguration" 14 70 5 \  
      "1" "AutoSta_LX installieren" \  
      "2" "Uebersicht gefundener Laufwerke" \  
      "3" "Beenden und neustarten" \  
      "4" "Beenden und eine Shell starten")  
    243   retval=$?   retval=$?
    244   [[ ${retval} -eq 1 ]] && exit 1   [[ ${retval} -eq 1 ]] && exit 1
    245   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -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 353  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 404  run_hardware_detection() Line 315  run_hardware_detection()
    315   fi   fi
    316  }  }
    317    
    318  hdd_size_below_256mb()  run_hardware_detection_disks()
    319  {  {
    320   local hdd="$1"   local bootdev
      local size  
      local retval  
      [[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"  
    321    
    322   size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')   # all disks but exclude ramdisks
    323   if [[ ${size} -le 257000000 ]]   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   then
    327   retval="0"   bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
    328   else   export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
      retval="1"  
    329   fi   fi
    330     export ALL_CDROMS="$(get_hwinfo cdrom)"
      return "${retval}"  
    331  }  }
    332    
    333  setup_hdd_partitions_auto()  setup_hdd_partitions_auto()
    334  {  {
    335   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    336    
    337     # sanity check - should not happen
    338     if is_mounted --device "${ROOTHDD}"
    339     then
    340     echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
    341     umount "${ROOTHDD}"
    342     fi
    343    
    344   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    345   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    346   then   then
    # Line 487  EOF Line 402  EOF
    402  setup_hdd_partitions_manual()  setup_hdd_partitions_manual()
    403  {  {
    404   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    405     SWAPHDD=""
    406   ## hdds partitionieren manual   BOOTHDD=""
    407   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
    408  }  }
    409    
    410  setup_hdd_format()  setup_hdd_format()
    411  {  {
    412   mke2fs -j -q ${ROOTHDD} || dialog_die   # sanity check - should not happen
    413     if is_mounted --device "${ROOTHDD}"
    414     then
    415     echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
    416     umount "${ROOTHDD}"
    417     fi
    418    
    419     mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
    420  }  }
    421    
    422  install_mount_rootfs()  install_mount_rootfs()
    423  {  {
    424   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
    425   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
      cd ${INSTALLROOT} || dialog_die  
    426  }  }
    427    
    428  install_system_image()  install_system_image()
    429  {  {
    430     pushd ${INSTALLROOT} > /dev/null
    431   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
    432     popd > /dev/null
    433  }  }
    434    
    435  install_bootsector_chroot()  disabled_install_bootsector_chroot()
    436  {  {
    437   local my_roothdd   local my_roothdd
    438   local grubconf=${INSTALLROOT}/boot/grub/grub.conf   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
    439   local grub2conf=/boot/grub/grub.cfg   local grub2conf="/boot/grub/grub.cfg"
    440    
    441   # check for grub2   # check for grub2
    442   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
    # Line 529  install_bootsector_chroot() Line 452  install_bootsector_chroot()
    452   then   then
    453   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
    454   else   else
    455   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/grub"
    456   fi   clearconfig
    457   echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die   addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
    458   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   fi
    459   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   CONFIG="${INSTALLROOT}/root/.installrc"
    460   echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die   clearconfig
    461     # only grub 1.99
    462     addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
    463     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
    464     addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
    465     addconfig "exit 0"
    466    
    467   # grub-legacy   # grub-legacy
    468   else   else
      ### grubconf schreiben  
    469   source ${INSTALLROOT}/boot/kernelversion   source ${INSTALLROOT}/boot/kernelversion
    470    
      #for alx only  
    471   if [ -e ${INSTALLROOT}/etc/alx_version ]   if [ -e ${INSTALLROOT}/etc/alx_version ]
    472   then   then
    473   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
    # Line 555  install_bootsector_chroot() Line 481  install_bootsector_chroot()
    481   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
    482    
    483   # uuid support   # uuid support
    484   if is_uuid_supported   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
      then  
      my_roothdd="UUID=$(get_uuid ${ROOTHDD})"  
      else  
      my_roothdd="${ROOTHDD}"  
      fi  
    485    
    486   : > ${grubconf} || dialog_die   CONFIG="${grubconf}"
    487   echo "default 0" >> ${grubconf} || dialog_die   clearconfig
    488   echo "timeout 3" >> ${grubconf} || dialog_die   addconfig "default 0"
    489     addconfig "timeout 3"
    490   # using current root password   # using current root password
    491   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)"
    492    
    493   echo  >> ${grubconf} || dialog_die   addconfig
    494   echo "# normal boot" >> ${grubconf} || dialog_die   addconfig "# normal boot"
    495   echo "title ${KRNVER}" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER}"
    496   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    497   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
    498   if is_initrd_supported   if is_initrd_supported
    499   then   then
    500   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    501   fi   fi
    502    
    503   echo >> ${grubconf} || dialog_die   addconfig
    504   echo "# admin boot" >> ${grubconf} || dialog_die   addconfig "# admin boot"
    505   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Re-run hardware-detection"
    506   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    507   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    508   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"
    509   if is_initrd_supported   if is_initrd_supported
    510   then   then
    511   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    512   fi   fi
    513    
    514   echo >> ${grubconf} || dialog_die   addconfig
    515   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Reset *all* local settings"
    516   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    517   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    518   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"
    519   if is_initrd_supported   if is_initrd_supported
    520   then   then
    521   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    522   fi   fi
    523    
    524   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
    # Line 610  exit 0 Line 532  exit 0
    532  CHROOTEOF  CHROOTEOF
    533   fi   fi
    534    
    535   ## enter chroot   # run installrc
    536   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  
    537   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    538  }  }
    539    
    540  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()  
    541  {  {
    542   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    543   is_initrd_supported || return 0   is_initrd_supported || return 0
    # Line 656  install_initrd_chroot() Line 565  install_initrd_chroot()
    565    
    566   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    567   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
    568   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"
    569     clearconfig
    570     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    571    
    572   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    573   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
    574     clearconfig
    575     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    576    
    577   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    578   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"
    579     clearconfig
    580     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    581    
    582   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
    583  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 670  mkinitrd -f /boot/$(readlink /boot/initr Line 585  mkinitrd -f /boot/$(readlink /boot/initr
    585  exit 0  exit 0
    586  CHROOTEOF  CHROOTEOF
    587    
    588   ## enters chroot   # run installrc
    589   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  
    590   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    591  }  }
    592    
     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}"  
     }  
       
    593  install_system_settings()  install_system_settings()
    594  {  {
    595   # schreibe fstab   local CONFIG
    596   if is_uuid_supported  
    597   then   # write fstab
    598   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
    599   else   clearconfig
    600   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"
    601   fi   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    602   # 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  
    603    
    604   # install network config skeleton   # install network config skeleton
    605   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
    606     clearconfig
    607     addconfig 'ONBOOT="yes"'
    608     addconfig 'NETWORKING="dhcp"'
    609    
    610   # intel framebufer quirk   # intel framebuffer quirk
    611   if [[ -e /proc/fb ]]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    612   then   then
    613   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   if [ -e /proc/fb ]
    614   then   then
    615   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
      if [[ ${fbdev} != 0 ]]  
    616   then   then
    617   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:')
    618     if [[ ${fbdev} != 0 ]]
    619     then
    620     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
    621     fi
    622   fi   fi
    623   fi   fi
    624   fi   fi
    # Line 747  install_system_settings() Line 626  install_system_settings()
    626    
    627  install_umount_rootfs()  install_umount_rootfs()
    628  {  {
    629   cd /   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    630   umount ${INSTALLROOT}/boot || dialog_die   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
      umount ${INSTALLROOT} || dialog_die  
    631  }  }
    632    
    633  install_do_reboot()  install_do_reboot()
    # Line 774  run_install_normal() Line 652  run_install_normal()
    652   dialog_install_settings   dialog_install_settings
    653   sleep 1   sleep 1
    654   install_system_settings   install_system_settings
    655   install_initrd_chroot   if is_initrd_supported
    656     then
    657     dialog_install_initrd
    658     initrd_config
    659     initrd_install
    660     fi
    661    
    662   dialog_install_bootsector   dialog_install_bootsector
    663   install_bootsector_chroot   bootloader_config
    664     bootloader_install
    665    
    666   install_umount_rootfs   install_umount_rootfs
    667   dialog_install_successful   dialog_install_successful
    # Line 796  run_install_auto() Line 680  run_install_auto()
    680   dialog_install_settings   dialog_install_settings
    681   sleep 1   sleep 1
    682   install_system_settings   install_system_settings
    683   install_initrd_chroot   if is_initrd_supported
    684     then
    685     dialog_install_initrd
    686     initrd_config
    687     initrd_install
    688     fi
    689    
    690   dialog_install_bootsector   dialog_install_bootsector
    691   install_bootsector_chroot   bootloader_config
    692     bootloader_install
    693    
    694   install_umount_rootfs   install_umount_rootfs
    695   dialog_install_successful   dialog_install_successful
    Legend:
    Removed from v.2424  
    changed lines
      Added in v.2476