Magellan Linux

Diff of /trunk/installer-simple/bin/installer.sh.in

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

revision 2430 by niro, Tue Jan 7 14:14:23 2014 UTC revision 2433 by niro, Tue Jan 7 14:18:40 2014 UTC
# Line 293  run_hardware_detection() Line 293  run_hardware_detection()
293   #removable=1   #removable=1
294   #fi   #fi
295   #done   #done
296     ## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
297    
298   ## only add this for grub legacy, grub2 detect these settings on its own   ## only add this for grub legacy, grub2 detect these settings on its own
299   #export GRUBLEGACYOPTS="rootdelay=8"   #export GRUBLEGACYOPTS="rootdelay=8"
# Line 437  setup_hdd_partitions_manual() Line 438  setup_hdd_partitions_manual()
438    
439  setup_hdd_format()  setup_hdd_format()
440  {  {
441   mke2fs -j -q ${ROOTHDD} || dialog_die   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
442  }  }
443    
444  install_mount_rootfs()  install_mount_rootfs()
# Line 449  install_mount_rootfs() Line 450  install_mount_rootfs()
450    
451  install_system_image()  install_system_image()
452  {  {
453     pushd ${INSTALLROOT} > /dev/null
454   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
455     popd > /dev/null
456  }  }
457    
458  install_bootsector_chroot()  install_bootsector_chroot()
# Line 690  install_system_settings() Line 693  install_system_settings()
693    
694  install_umount_rootfs()  install_umount_rootfs()
695  {  {
  cd /  
696   umount ${INSTALLROOT}/boot || dialog_die   umount ${INSTALLROOT}/boot || dialog_die
697   umount ${INSTALLROOT} || dialog_die   umount ${INSTALLROOT} || dialog_die
698  }  }

Legend:
Removed from v.2430  
changed lines
  Added in v.2433