Magellan Linux

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

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

revision 2482 by niro, Wed Jan 8 10:32:55 2014 UTC revision 2500 by niro, Wed Jan 8 13:20:29 2014 UTC
# Line 9  Line 9 
9    
10  # setup locales  # setup locales
11  TEXTDOMAIN=installer  TEXTDOMAIN=installer
 LC_MESSAGES=C  
12    
13  # include dir  # include dir
14  INSTALLER_LIBDIR="%LIBDIR%"  INSTALLER_LIBDIR="%LIBDIR%"
# Line 100  install_meter() Line 99  install_meter()
99   return 0   return 0
100  }  }
101    
102    mount_rootfs()
103    {
104     local retval
105    
106     if is_mounted --location "${INSTALLROOT}"
107     then
108     echo $"${INSTALLROOT} already mounted" >&2
109     else
110     mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
111     fi
112     [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
113    }
114    
115    umount_rootfs()
116    {
117     is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
118     is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
119    }
120    
121    install_do_reboot()
122    {
123     reboot
124    }
125    
126  run_hardware_detection()  run_hardware_detection()
127  {  {
# Line 188  setup_hdd_partitions_auto() Line 210  setup_hdd_partitions_auto()
210   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
211   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
212   then   then
213   if hdd_size_below_256mb ${HDD}   if device_minimum_size "${HDD}" 256
214   then   then
215   FDISKPARTIONBELOW256MB=1   FDISKPARTIONBELOW256MB=1
216   else   else
# Line 263  setup_hdd_format() Line 285  setup_hdd_format()
285   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
286  }  }
287    
 install_mount_rootfs()  
 {  
  is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"  
  install -d ${INSTALLROOT}/boot || dialog_die  
 }  
   
288  install_system_image()  install_system_image()
289  {  {
290   pushd ${INSTALLROOT} > /dev/null   pushd ${INSTALLROOT} > /dev/null
# Line 294  install_system_settings() Line 310  install_system_settings()
310   addconfig 'NETWORKING="dhcp"'   addconfig 'NETWORKING="dhcp"'
311    
312   # intel framebuffer quirk   # intel framebuffer quirk
313   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]   CONFIG="${INSTALLROOT}/etc/splash/splash.conf"
314     if [ -e ${CONFIG} ] && [ -e /proc/fb ]
315   then   then
316   if [ -e /proc/fb ]   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
317   then   then
318   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
319   then   [[ ${fbdev} != 0 ]] && sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${CONFIG} || dialog_die
  fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')  
  if [[ ${fbdev} != 0 ]]  
  then  
  sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die  
  fi  
  fi  
320   fi   fi
321   fi   fi
322  }  }
323    
 install_umount_rootfs()  
 {  
  is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot  
  is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}  
 }  
   
 install_do_reboot()  
 {  
  reboot  
 }  
   
324    
325  ### installer dialogs ###  ### installer dialogs ###
326    
# Line 483  run_install_normal() Line 483  run_install_normal()
483   task_setup_hdd_partitions_manual   task_setup_hdd_partitions_manual
484   dialog_setup_hdd_format   dialog_setup_hdd_format
485   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
486   install_mount_rootfs   mount_rootfs
487   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
488    
489   dialog_install_settings   dialog_install_settings
# Line 500  run_install_normal() Line 500  run_install_normal()
500   bootloader_config   bootloader_config
501   bootloader_install   bootloader_install
502    
503   install_umount_rootfs   umount_rootfs
504   dialog_install_successful   dialog_install_successful
505  }  }
506    
# Line 511  run_install_auto() Line 511  run_install_auto()
511   task_setup_hdd_partitions_auto   task_setup_hdd_partitions_auto
512   dialog_setup_hdd_format   dialog_setup_hdd_format
513   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
514   install_mount_rootfs   mount_rootfs
515   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
516    
517   dialog_install_settings   dialog_install_settings
# Line 528  run_install_auto() Line 528  run_install_auto()
528   bootloader_config   bootloader_config
529   bootloader_install   bootloader_install
530    
531   install_umount_rootfs   umount_rootfs
532   dialog_install_successful   dialog_install_successful
533  }  }
534    

Legend:
Removed from v.2482  
changed lines
  Added in v.2500