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 2428 by niro, Tue Jan 7 14:11:12 2014 UTC revision 2473 by niro, Wed Jan 8 08:53:38 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 110  dialog_warning() Line 112  dialog_warning()
    112    
    113  dialog_setup_hdd_info()  dialog_setup_hdd_info()
    114  {  {
    115   local SHDD="${HDD//\/dev\/}"   local drivenode="${HDD//\/dev\/}"
    116    
    117   messagebox -h $"[ Harddrive partitioning ]" \   messagebox -h $"[ Harddrive partitioning ]" \
    118   $"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."   $"Please create 1 partition.\n\n[ \Z3${drivenode}1\Zn ] type: \Z3linux\Zn with the whole diskspace.\nPlease mark ${SHDD}1 \Z3bootable\Zn."
    119  }  }
    120    
    121  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
    122  {  {
    123   local SHDD="${HDD//\/dev\/}"   local drivenode="${HDD//\/dev\/}"
    124    
    125   messagebox -h $"[ Harddrive partitioning ]" \   messagebox -h $"[ Harddrive partitioning ]" \
    126   $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"   $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${drivenode}\Zn ] will be erased!"
    127  }  }
    128    
    129  dialog_setup_system_menu()  dialog_setup_system_menu()
    # Line 180  dialog_hardware_detection() Line 182  dialog_hardware_detection()
    182   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
    183   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
    184   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
    185   *) message+=$"\n \\ZnCommon device detected.\Zn" ;;   *) message+=$"\n\ZnCommon device detected.\Zn" ;;
    186   esac   esac
    187   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    188   then   then
    189   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
    190   fi   fi
    191    
    192   messagebox -y 15 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
    193  }  }
    194    
    195  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
    # Line 233  dialog_setup_hdd_partitions_auto() Line 235  dialog_setup_hdd_partitions_auto()
    235   fi   fi
    236  }  }
    237    
     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)"  
     }  
       
    238  install_meter()  install_meter()
    239  {  {
    240   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    # Line 268  dialog_main() Line 255  dialog_main()
    255    
    256   while [[ ${method} -le 2 ]]   while [[ ${method} -le 2 ]]
    257   do   do
    258   method=$(menubox $"Configuration:" \   method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \
    259   $"1:Install system" \   $"1:Install system" \
    260   $"2:Show detected harddrives" \   $"2:Show detected harddrives" \
    261   $"3:Exit and reboot" \   $"3:Exit and reboot" \
    # Line 296  run_hardware_detection() Line 283  run_hardware_detection()
    283    
    284   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    285    
    286   # check for special devices/clients:   ## check for special devices/clients:
    287   # 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
    288   local removable=0   #local removable=0
    289   if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]   #if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
    290   then   #then
    291   for i in /sys/block/[hs]d*/removable   #for i in /sys/block/[hs]d*/removable
    292   do   #do
    293   if [[ $(< ${i}) = 1 ]]   #if [[ $(< ${i}) = 1 ]]
    294   then   #then
    295   removable=1   #removable=1
    296   fi   #fi
    297   done   #done
    298     ## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
    299   # only add this for grub legacy, grub2 detect these settings on its own  
    300   export GRUBLEGACYOPTS="rootdelay=8"   ## only add this for grub legacy, grub2 detect these settings on its own
    301   # there are to zotac types in the wild, nvidia based gfx and intel   #export GRUBLEGACYOPTS="rootdelay=8"
    302   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   ## there are to zotac types in the wild, nvidia based gfx and intel
    303   then   #if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    304   export SPECIALDEVICE="zotac_nvidia"   #then
    305   else   #export SPECIALDEVICE="zotac_nvidia"
    306   export SPECIALDEVICE="zotac_intel"   #else
    307   fi   #export SPECIALDEVICE="zotac_intel"
    308   fi   #fi
    309     #fi
    310    
    311   # check for special devices/clients:   # check for special devices/clients:
    312   # 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 347  run_hardware_detection() Line 335  run_hardware_detection()
    335   fi   fi
    336  }  }
    337    
    338    run_hardware_detection_disks()
    339    {
    340     local bootdev
    341    
    342     # all disks but exclude ramdisks
    343     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
    344     # remove the boot device from ALL_DISKS if it was an usbstick
    345     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
    346     then
    347     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
    348     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
    349     fi
    350     export ALL_CDROMS="$(get_hwinfo cdrom)"
    351    }
    352    
    353  hdd_size_below_256mb()  hdd_size_below_256mb()
    354  {  {
    355   local hdd="$1"   local hdd="$1"
    # Line 369  setup_hdd_partitions_auto() Line 372  setup_hdd_partitions_auto()
    372  {  {
    373   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    374    
    375     # sanity check - should not happen
    376     if is_mounted --device "${ROOTHDD}"
    377     then
    378     echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
    379     umount "${ROOTHDD}"
    380     fi
    381    
    382   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    383   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    384   then   then
    # Line 430  EOF Line 440  EOF
    440  setup_hdd_partitions_manual()  setup_hdd_partitions_manual()
    441  {  {
    442   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    443     SWAPHDD=""
    444   ## hdds partitionieren manual   BOOTHDD=""
    445   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
    446  }  }
    447    
    448  setup_hdd_format()  setup_hdd_format()
    449  {  {
    450   mke2fs -j -q ${ROOTHDD} || dialog_die   # sanity check - should not happen
    451     if is_mounted --device "${ROOTHDD}"
    452     then
    453     echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
    454     umount "${ROOTHDD}"
    455     fi
    456    
    457     mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
    458  }  }
    459    
    460  install_mount_rootfs()  install_mount_rootfs()
    461  {  {
    462   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
    463   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
      cd ${INSTALLROOT} || dialog_die  
    464  }  }
    465    
    466  install_system_image()  install_system_image()
    467  {  {
    468     pushd ${INSTALLROOT} > /dev/null
    469   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
    470     popd > /dev/null
    471  }  }
    472    
    473  install_bootsector_chroot()  disabled_install_bootsector_chroot()
    474  {  {
    475   local my_roothdd   local my_roothdd
    476   local grubconf=${INSTALLROOT}/boot/grub/grub.conf   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
    477   local grub2conf=/boot/grub/grub.cfg   local grub2conf="/boot/grub/grub.cfg"
    478    
    479   # check for grub2   # check for grub2
    480   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
    # Line 472  install_bootsector_chroot() Line 490  install_bootsector_chroot()
    490   then   then
    491   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
    492   else   else
    493   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/grub"
    494   fi   clearconfig
    495   echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die   addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
    496   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   fi
    497   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   CONFIG="${INSTALLROOT}/root/.installrc"
    498   echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die   clearconfig
    499     # only grub 1.99
    500     addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
    501     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
    502     addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
    503     addconfig "exit 0"
    504    
    505   # grub-legacy   # grub-legacy
    506   else   else
      ### grubconf schreiben  
    507   source ${INSTALLROOT}/boot/kernelversion   source ${INSTALLROOT}/boot/kernelversion
    508    
      #for alx only  
    509   if [ -e ${INSTALLROOT}/etc/alx_version ]   if [ -e ${INSTALLROOT}/etc/alx_version ]
    510   then   then
    511   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
    # Line 498  install_bootsector_chroot() Line 519  install_bootsector_chroot()
    519   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
    520    
    521   # uuid support   # uuid support
    522   if is_uuid_supported   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
      then  
      my_roothdd="UUID=$(get_uuid ${ROOTHDD})"  
      else  
      my_roothdd="${ROOTHDD}"  
      fi  
    523    
    524   : > ${grubconf} || dialog_die   CONFIG="${grubconf}"
    525   echo "default 0" >> ${grubconf} || dialog_die   clearconfig
    526   echo "timeout 3" >> ${grubconf} || dialog_die   addconfig "default 0"
    527     addconfig "timeout 3"
    528   # using current root password   # using current root password
    529   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)"
    530    
    531   echo  >> ${grubconf} || dialog_die   addconfig
    532   echo "# normal boot" >> ${grubconf} || dialog_die   addconfig "# normal boot"
    533   echo "title ${KRNVER}" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER}"
    534   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    535   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
    536   if is_initrd_supported   if is_initrd_supported
    537   then   then
    538   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    539   fi   fi
    540    
    541   echo >> ${grubconf} || dialog_die   addconfig
    542   echo "# admin boot" >> ${grubconf} || dialog_die   addconfig "# admin boot"
    543   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Re-run hardware-detection"
    544   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    545   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    546   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"
    547   if is_initrd_supported   if is_initrd_supported
    548   then   then
    549   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    550   fi   fi
    551    
    552   echo >> ${grubconf} || dialog_die   addconfig
    553   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Reset *all* local settings"
    554   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    555   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    556   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"
    557   if is_initrd_supported   if is_initrd_supported
    558   then   then
    559   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    560   fi   fi
    561    
    562   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
    # Line 553  exit 0 Line 570  exit 0
    570  CHROOTEOF  CHROOTEOF
    571   fi   fi
    572    
    573   ## enter chroot   # run installrc
    574   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  
    575   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    576  }  }
    577    
    578  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()  
    579  {  {
    580   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    581   is_initrd_supported || return 0   is_initrd_supported || return 0
    # Line 599  install_initrd_chroot() Line 603  install_initrd_chroot()
    603    
    604   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    605   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
    606   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"
    607     clearconfig
    608     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    609    
    610   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    611   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
    612     clearconfig
    613     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    614    
    615   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    616   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"
    617     clearconfig
    618     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    619    
    620   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
    621  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 613  mkinitrd -f /boot/$(readlink /boot/initr Line 623  mkinitrd -f /boot/$(readlink /boot/initr
    623  exit 0  exit 0
    624  CHROOTEOF  CHROOTEOF
    625    
    626   ## enters chroot   # run installrc
    627   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  
    628   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    629  }  }
    630    
     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}"  
     }  
       
    631  install_system_settings()  install_system_settings()
    632  {  {
    633   # schreibe fstab   local CONFIG
    634   if is_uuid_supported  
    635   then   # write fstab
    636   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
    637   else   clearconfig
    638   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"
    639   fi   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    640   # 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  
    641    
    642   # install network config skeleton   # install network config skeleton
    643   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
    644     clearconfig
    645     addconfig 'ONBOOT="yes"'
    646     addconfig 'NETWORKING="dhcp"'
    647    
    648   # intel framebufer quirk   # intel framebuffer quirk
    649   if [[ -e /proc/fb ]]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    650   then   then
    651   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   if [ -e /proc/fb ]
    652   then   then
    653   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
      if [[ ${fbdev} != 0 ]]  
    654   then   then
    655   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:')
    656     if [[ ${fbdev} != 0 ]]
    657     then
    658     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
    659     fi
    660   fi   fi
    661   fi   fi
    662   fi   fi
    # Line 690  install_system_settings() Line 664  install_system_settings()
    664    
    665  install_umount_rootfs()  install_umount_rootfs()
    666  {  {
    667   cd /   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    668   umount ${INSTALLROOT}/boot || dialog_die   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
      umount ${INSTALLROOT} || dialog_die  
    669  }  }
    670    
    671  install_do_reboot()  install_do_reboot()
    # Line 717  run_install_normal() Line 690  run_install_normal()
    690   dialog_install_settings   dialog_install_settings
    691   sleep 1   sleep 1
    692   install_system_settings   install_system_settings
    693   dialog_install_initrd   if is_initrd_supported
    694   install_initrd_chroot   then
    695     dialog_install_initrd
    696     initrd_config
    697     initrd_install
    698     fi
    699    
    700   dialog_install_bootsector   dialog_install_bootsector
    701   install_bootsector_chroot   bootloader_config
    702     bootloader_install
    703    
    704   install_umount_rootfs   install_umount_rootfs
    705   dialog_install_successful   dialog_install_successful
    # Line 740  run_install_auto() Line 718  run_install_auto()
    718   dialog_install_settings   dialog_install_settings
    719   sleep 1   sleep 1
    720   install_system_settings   install_system_settings
    721   dialog_install_initrd   if is_initrd_supported
    722   install_initrd_chroot   then
    723     dialog_install_initrd
    724     initrd_config
    725     initrd_install
    726     fi
    727    
    728   dialog_install_bootsector   dialog_install_bootsector
    729   install_bootsector_chroot   bootloader_config
    730     bootloader_install
    731    
    732   install_umount_rootfs   install_umount_rootfs
    733   dialog_install_successful   dialog_install_successful
    Legend:
    Removed from v.2428  
    changed lines
      Added in v.2473