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 2429 by niro, Tue Jan 7 14:13:11 2014 UTC revision 2439 by niro, Tue Jan 7 14:37:35 2014 UTC
    # Line 281  run_hardware_detection() Line 281  run_hardware_detection()
    281    
    282   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    283    
    284   # check for special devices/clients:   ## check for special devices/clients:
    285   # 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
    286   local removable=0   #local removable=0
    287   if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]   #if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
    288   then   #then
    289   for i in /sys/block/[hs]d*/removable   #for i in /sys/block/[hs]d*/removable
    290   do   #do
    291   if [[ $(< ${i}) = 1 ]]   #if [[ $(< ${i}) = 1 ]]
    292   then   #then
    293   removable=1   #removable=1
    294   fi   #fi
    295   done   #done
    296     ## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
    297   # only add this for grub legacy, grub2 detect these settings on its own  
    298   export GRUBLEGACYOPTS="rootdelay=8"   ## only add this for grub legacy, grub2 detect these settings on its own
    299   # there are to zotac types in the wild, nvidia based gfx and intel   #export GRUBLEGACYOPTS="rootdelay=8"
    300   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   ## there are to zotac types in the wild, nvidia based gfx and intel
    301   then   #if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    302   export SPECIALDEVICE="zotac_nvidia"   #then
    303   else   #export SPECIALDEVICE="zotac_nvidia"
    304   export SPECIALDEVICE="zotac_intel"   #else
    305   fi   #export SPECIALDEVICE="zotac_intel"
    306   fi   #fi
    307     #fi
    308    
    309   # check for special devices/clients:   # check for special devices/clients:
    310   # 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 369  setup_hdd_partitions_auto() Line 370  setup_hdd_partitions_auto()
    370  {  {
    371   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    372    
    373     # sanity check - should not happen
    374     if is_mounted --device "${ROOTHDD}"
    375     then
    376     echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
    377     umount "${ROOTHDD}"
    378     fi
    379    
    380   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    381   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    382   then   then
    # Line 430  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    
    446  setup_hdd_format()  setup_hdd_format()
    447  {  {
    448   mke2fs -j -q ${ROOTHDD} || dialog_die   # sanity check - should not happen
    449     if is_mounted --device "${ROOTHDD}"
    450     then
    451     echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
    452     umount "${ROOTHDD}"
    453     fi
    454    
    455     mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
    456  }  }
    457    
    458  install_mount_rootfs()  install_mount_rootfs()
    459  {  {
    460   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
    461   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
      cd ${INSTALLROOT} || dialog_die  
    462  }  }
    463    
    464  install_system_image()  install_system_image()
    465  {  {
    466     pushd ${INSTALLROOT} > /dev/null
    467   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
    468     popd > /dev/null
    469  }  }
    470    
    471  install_bootsector_chroot()  install_bootsector_chroot()
    # Line 553  exit 0 Line 569  exit 0
    569  CHROOTEOF  CHROOTEOF
    570   fi   fi
    571    
    572   ## enter chroot   # run installrc
    573   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  
    574   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    575  }  }
    576    
     is_initrd_supported()  
     {  
      # only generate initrds if the cmd exists  
      [[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0  
      return 1  
     }  
       
    577  install_initrd_chroot()  install_initrd_chroot()
    578  {  {
    579   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    # Line 613  mkinitrd -f /boot/$(readlink /boot/initr Line 616  mkinitrd -f /boot/$(readlink /boot/initr
    616  exit 0  exit 0
    617  CHROOTEOF  CHROOTEOF
    618    
    619   ## enters chroot   # run installrc
    620   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  
    621   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    622  }  }
    623    
    # Line 638  is_uuid_supported() Line 635  is_uuid_supported()
    635   return 1   return 1
    636  }  }
    637    
     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}"  
     }  
       
    638  install_system_settings()  install_system_settings()
    639  {  {
    640   # schreibe fstab   # schreibe fstab
    # Line 690  install_system_settings() Line 668  install_system_settings()
    668    
    669  install_umount_rootfs()  install_umount_rootfs()
    670  {  {
    671   cd /   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    672   umount ${INSTALLROOT}/boot || dialog_die   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
      umount ${INSTALLROOT} || dialog_die  
    673  }  }
    674    
    675  install_do_reboot()  install_do_reboot()
    Legend:
    Removed from v.2429  
    changed lines
      Added in v.2439