Magellan Linux

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

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

revision 2444 by niro, Tue Jan 7 14:53:46 2014 UTC revision 2473 by niro, Wed Jan 8 08:53:38 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 110  dialog_warning() Line 112  dialog_warning()
112    
113  dialog_setup_hdd_info()  dialog_setup_hdd_info()
114  {  {
115   local SHDD="${HDD//\/dev\/}"   local drivenode="${HDD//\/dev\/}"
116    
117   messagebox -h $"[ Harddrive partitioning ]" \   messagebox -h $"[ Harddrive partitioning ]" \
118   $"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."   $"Please create 1 partition.\n\n[ \Z3${drivenode}1\Zn ] type: \Z3linux\Zn with the whole diskspace.\nPlease mark ${SHDD}1 \Z3bootable\Zn."
119  }  }
120    
121  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
122  {  {
123   local SHDD="${HDD//\/dev\/}"   local drivenode="${HDD//\/dev\/}"
124    
125   messagebox -h $"[ Harddrive partitioning ]" \   messagebox -h $"[ Harddrive partitioning ]" \
126   $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"   $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${drivenode}\Zn ] will be erased!"
127  }  }
128    
129  dialog_setup_system_menu()  dialog_setup_system_menu()
# Line 180  dialog_hardware_detection() Line 182  dialog_hardware_detection()
182   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
183   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
184   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
185   *) message+=$"\n \\ZnCommon device detected.\Zn" ;;   *) message+=$"\n\ZnCommon device detected.\Zn" ;;
186   esac   esac
187   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
188   then   then
189   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
190   fi   fi
191    
192   messagebox -y 15 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
193  }  }
194    
195  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
# Line 253  dialog_main() Line 255  dialog_main()
255    
256   while [[ ${method} -le 2 ]]   while [[ ${method} -le 2 ]]
257   do   do
258   method=$(menubox $"Configuration:" \   method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \
259   $"1:Install system" \   $"1:Install system" \
260   $"2:Show detected harddrives" \   $"2:Show detected harddrives" \
261   $"3:Exit and reboot" \   $"3:Exit and reboot" \
# Line 468  install_system_image() Line 470  install_system_image()
470   popd > /dev/null   popd > /dev/null
471  }  }
472    
473  install_bootsector_chroot()  disabled_install_bootsector_chroot()
474  {  {
475   local my_roothdd   local my_roothdd
476   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
# Line 573  CHROOTEOF Line 575  CHROOTEOF
575   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
576  }  }
577    
578  install_initrd_chroot()  disabled_install_initrd_chroot()
579  {  {
580   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
581   is_initrd_supported || return 0   is_initrd_supported || return 0

Legend:
Removed from v.2444  
changed lines
  Added in v.2473