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 2436 by niro, Tue Jan 7 14:25:34 2014 UTC revision 2446 by niro, Tue Jan 7 14:56:12 2014 UTC
    # Line 438  EOF Line 438  EOF
    438  setup_hdd_partitions_manual()  setup_hdd_partitions_manual()
    439  {  {
    440   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    441     SWAPHDD=""
    442   ## hdds partitionieren manual   BOOTHDD=""
    443   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
    444  }  }
    445    
    # Line 468  install_system_image() Line 468  install_system_image()
    468   popd > /dev/null   popd > /dev/null
    469  }  }
    470    
    471  install_bootsector_chroot()  disabled_install_bootsector_chroot()
    472  {  {
    473   local my_roothdd   local my_roothdd
    474   local grubconf=${INSTALLROOT}/boot/grub/grub.conf   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
    475   local grub2conf=/boot/grub/grub.cfg   local grub2conf="/boot/grub/grub.cfg"
    476    
    477   # check for grub2   # check for grub2
    478   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
    # Line 488  install_bootsector_chroot() Line 488  install_bootsector_chroot()
    488   then   then
    489   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
    490   else   else
    491   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/grub"
    492     clearconfig
    493     addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
    494   fi   fi
    495   echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die   CONFIG="${INSTALLROOT}/root/.installrc"
    496   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   clearconfig
    497   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   # only grub 1.99
    498   echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die   addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
    499     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
    500     addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
    501     addconfig "exit 0"
    502    
    503   # grub-legacy   # grub-legacy
    504   else   else
      ### grubconf schreiben  
    505   source ${INSTALLROOT}/boot/kernelversion   source ${INSTALLROOT}/boot/kernelversion
    506    
      #for alx only  
    507   if [ -e ${INSTALLROOT}/etc/alx_version ]   if [ -e ${INSTALLROOT}/etc/alx_version ]
    508   then   then
    509   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
    # Line 514  install_bootsector_chroot() Line 517  install_bootsector_chroot()
    517   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
    518    
    519   # uuid support   # uuid support
    520   if is_uuid_supported   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
      then  
      my_roothdd="UUID=$(get_uuid ${ROOTHDD})"  
      else  
      my_roothdd="${ROOTHDD}"  
      fi  
    521    
    522   : > ${grubconf} || dialog_die   CONFIG="${grubconf}"
    523   echo "default 0" >> ${grubconf} || dialog_die   clearconfig
    524   echo "timeout 3" >> ${grubconf} || dialog_die   addconfig "default 0"
    525     addconfig "timeout 3"
    526   # using current root password   # using current root password
    527   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)"
    528    
    529   echo  >> ${grubconf} || dialog_die   addconfig
    530   echo "# normal boot" >> ${grubconf} || dialog_die   addconfig "# normal boot"
    531   echo "title ${KRNVER}" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER}"
    532   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    533   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
    534   if is_initrd_supported   if is_initrd_supported
    535   then   then
    536   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    537   fi   fi
    538    
    539   echo >> ${grubconf} || dialog_die   addconfig
    540   echo "# admin boot" >> ${grubconf} || dialog_die   addconfig "# admin boot"
    541   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Re-run hardware-detection"
    542   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    543   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    544   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"
    545   if is_initrd_supported   if is_initrd_supported
    546   then   then
    547   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    548   fi   fi
    549    
    550   echo >> ${grubconf} || dialog_die   addconfig
    551   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Reset *all* local settings"
    552   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    553   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    554   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"
    555   if is_initrd_supported   if is_initrd_supported
    556   then   then
    557   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    558   fi   fi
    559    
    560   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
    # Line 574  CHROOTEOF Line 573  CHROOTEOF
    573   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    574  }  }
    575    
    576  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()  
    577  {  {
    578   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    579   is_initrd_supported || return 0   is_initrd_supported || return 0
    # Line 609  install_initrd_chroot() Line 601  install_initrd_chroot()
    601    
    602   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    603   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
    604   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"
    605     clearconfig
    606     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    607    
    608   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    609   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
    610     clearconfig
    611     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    612    
    613   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    614   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"
    615     clearconfig
    616     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    617    
    618   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
    619  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 628  CHROOTEOF Line 626  CHROOTEOF
    626   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    627  }  }
    628    
     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}"  
     }  
       
    629  install_system_settings()  install_system_settings()
    630  {  {
    631   # schreibe fstab   local CONFIG
    632   if is_uuid_supported  
    633   then   # write fstab
    634   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
    635   else   clearconfig
    636   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"
    637   fi   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    638   # 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  
    639    
    640   # install network config skeleton   # install network config skeleton
    641   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
    642     clearconfig
    643     addconfig 'ONBOOT="yes"'
    644     addconfig 'NETWORKING="dhcp"'
    645    
    646   # intel framebufer quirk   # intel framebuffer quirk
    647   if [[ -e /proc/fb ]]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    648   then   then
    649   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   if [ -e /proc/fb ]
    650   then   then
    651   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
      if [[ ${fbdev} != 0 ]]  
    652   then   then
    653   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:')
    654     if [[ ${fbdev} != 0 ]]
    655     then
    656     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
    657     fi
    658   fi   fi
    659   fi   fi
    660   fi   fi
    # Line 720  run_install_normal() Line 688  run_install_normal()
    688   dialog_install_settings   dialog_install_settings
    689   sleep 1   sleep 1
    690   install_system_settings   install_system_settings
    691   dialog_install_initrd   if is_initrd_supported
    692   install_initrd_chroot   then
    693     dialog_install_initrd
    694     initrd_config
    695     initrd_install
    696     fi
    697    
    698   dialog_install_bootsector   dialog_install_bootsector
    699   install_bootsector_chroot   bootloader_config
    700     bootloader_install
    701    
    702   install_umount_rootfs   install_umount_rootfs
    703   dialog_install_successful   dialog_install_successful
    # Line 743  run_install_auto() Line 716  run_install_auto()
    716   dialog_install_settings   dialog_install_settings
    717   sleep 1   sleep 1
    718   install_system_settings   install_system_settings
    719   dialog_install_initrd   if is_initrd_supported
    720   install_initrd_chroot   then
    721     dialog_install_initrd
    722     initrd_config
    723     initrd_install
    724     fi
    725    
    726   dialog_install_bootsector   dialog_install_bootsector
    727   install_bootsector_chroot   bootloader_config
    728     bootloader_install
    729    
    730   install_umount_rootfs   install_umount_rootfs
    731   dialog_install_successful   dialog_install_successful
    Legend:
    Removed from v.2436  
    changed lines
      Added in v.2446