Magellan Linux

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

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

revision 2442 by niro, Tue Jan 7 14:48:42 2014 UTC revision 2476 by niro, Wed Jan 8 09:15:14 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 108  dialog_warning() Line 110  dialog_warning()
110   fi   fi
111  }  }
112    
113  dialog_setup_hdd_info()  task_setup_system_menu()
 {  
  local SHDD="${HDD//\/dev\/}"  
   
  messagebox -h $"[ Harddrive partitioning ]" \  
  $"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."  
 }  
   
 dialog_setup_hdd_info_auto()  
 {  
  local SHDD="${HDD//\/dev\/}"  
   
  messagebox -h $"[ Harddrive partitioning ]" \  
  $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"  
 }  
   
 dialog_setup_system_menu()  
114  {  {
115   local mode   local mode
116   local retval   local retval
117    
118   mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \   mode="$(dialog_setup_system_menu)"
  $"1:Automatic setup (recommended)" \  
  ":" \  
  $":\Z1Expert modes:\Zn" \  
  $"2:Common IDE-disk (manual setup)")  
119   retval=$?   retval=$?
120   [[ ${retval} -eq 1 ]] && return 1   [[ ${retval} -eq 1 ]] && return 1
121   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
# Line 141  dialog_setup_system_menu() Line 123  dialog_setup_system_menu()
123   case "${mode}" in   case "${mode}" in
124   "1") run_install_auto ;;   "1") run_install_auto ;;
125   "2") run_install_normal ;;   "2") run_install_normal ;;
126   "") dialog_setup_system_menu;;   "") task_setup_system_menu;;
127   esac   esac
128   fi   fi
129  }  }
# Line 180  dialog_hardware_detection() Line 162  dialog_hardware_detection()
162   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
163   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
164   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
165   *) message+=$"\n \\ZnCommon device detected.\Zn" ;;   *) message+=$"\n\ZnCommon device detected.\Zn" ;;
166   esac   esac
167   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
168   then   then
169   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
170   fi   fi
171    
172   messagebox -y 15 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
173  }  }
174    
175  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
# Line 253  dialog_main() Line 235  dialog_main()
235    
236   while [[ ${method} -le 2 ]]   while [[ ${method} -le 2 ]]
237   do   do
238   method=$(menubox $"Configuration:" \   method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \
239   $"1:Install system" \   $"1:Install system" \
240   $"2:Show detected harddrives" \   $"2:Show detected harddrives" \
241   $"3:Exit and reboot" \   $"3:Exit and reboot" \
# Line 263  dialog_main() Line 245  dialog_main()
245   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
246   then   then
247   case ${method} in   case ${method} in
248   "1") dialog_setup_system_menu ;;   "1") task_setup_system_menu ;;
249   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
250   "3") install_do_reboot ;;   "3") install_do_reboot ;;
251   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
# Line 348  run_hardware_detection_disks() Line 330  run_hardware_detection_disks()
330   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
331  }  }
332    
 hdd_size_below_256mb()  
 {  
  local hdd="$1"  
  local size  
  local retval  
  [[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"  
   
  size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')  
  if [[ ${size} -le 257000000 ]]  
  then  
  retval="0"  
  else  
  retval="1"  
  fi  
   
  return "${retval}"  
 }  
   
333  setup_hdd_partitions_auto()  setup_hdd_partitions_auto()
334  {  {
335   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
# Line 468  install_system_image() Line 432  install_system_image()
432   popd > /dev/null   popd > /dev/null
433  }  }
434    
435  install_bootsector_chroot()  disabled_install_bootsector_chroot()
436  {  {
437   local my_roothdd   local my_roothdd
438   local grubconf=${INSTALLROOT}/boot/grub/grub.conf   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
439   local grub2conf=/boot/grub/grub.cfg   local grub2conf="/boot/grub/grub.cfg"
440    
441   # check for grub2   # check for grub2
442   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
# Line 488  install_bootsector_chroot() Line 452  install_bootsector_chroot()
452   then   then
453   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
454   else   else
455   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/grub"
456     clearconfig
457     addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
458   fi   fi
459   echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die   CONFIG="${INSTALLROOT}/root/.installrc"
460   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   clearconfig
461   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   # only grub 1.99
462   echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die   addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
463     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
464     addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
465     addconfig "exit 0"
466    
467   # grub-legacy   # grub-legacy
468   else   else
  ### grubconf schreiben  
469   source ${INSTALLROOT}/boot/kernelversion   source ${INSTALLROOT}/boot/kernelversion
470    
  #for alx only  
471   if [ -e ${INSTALLROOT}/etc/alx_version ]   if [ -e ${INSTALLROOT}/etc/alx_version ]
472   then   then
473   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
# Line 516  install_bootsector_chroot() Line 483  install_bootsector_chroot()
483   # uuid support   # uuid support
484   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
485    
486   : > ${grubconf} || dialog_die   CONFIG="${grubconf}"
487   echo "default 0" >> ${grubconf} || dialog_die   clearconfig
488   echo "timeout 3" >> ${grubconf} || dialog_die   addconfig "default 0"
489     addconfig "timeout 3"
490   # using current root password   # using current root password
491   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)"
492    
493   echo  >> ${grubconf} || dialog_die   addconfig
494   echo "# normal boot" >> ${grubconf} || dialog_die   addconfig "# normal boot"
495   echo "title ${KRNVER}" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER}"
496   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
497   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
498   if is_initrd_supported   if is_initrd_supported
499   then   then
500   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
501   fi   fi
502    
503   echo >> ${grubconf} || dialog_die   addconfig
504   echo "# admin boot" >> ${grubconf} || dialog_die   addconfig "# admin boot"
505   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Re-run hardware-detection"
506   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
507   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
508   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"
509   if is_initrd_supported   if is_initrd_supported
510   then   then
511   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
512   fi   fi
513    
514   echo >> ${grubconf} || dialog_die   addconfig
515   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Reset *all* local settings"
516   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
517   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
518   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"
519   if is_initrd_supported   if is_initrd_supported
520   then   then
521   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
522   fi   fi
523    
524   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
# Line 569  CHROOTEOF Line 537  CHROOTEOF
537   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
538  }  }
539    
540  install_initrd_chroot()  disabled_install_initrd_chroot()
541  {  {
542   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
543   is_initrd_supported || return 0   is_initrd_supported || return 0
# Line 597  install_initrd_chroot() Line 565  install_initrd_chroot()
565    
566   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
567   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
568   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"
569     clearconfig
570     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
571    
572   # install an appropriate viafb.conf   # install an appropriate viafb.conf
573   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
574     clearconfig
575     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
576    
577   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
578   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"
579     clearconfig
580     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
581    
582   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
583  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 618  CHROOTEOF Line 592  CHROOTEOF
592    
593  install_system_settings()  install_system_settings()
594  {  {
595   # schreibe fstab   local CONFIG
596   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
597   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # write fstab
598   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
599   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   clearconfig
600   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
601     addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
602     addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
603    
604   # install network config skeleton   # install network config skeleton
605   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
606     clearconfig
607     addconfig 'ONBOOT="yes"'
608     addconfig 'NETWORKING="dhcp"'
609    
610   # intel framebuffer quirk   # intel framebuffer quirk
611   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]

Legend:
Removed from v.2442  
changed lines
  Added in v.2476