Magellan Linux

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

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

revision 2402 by niro, Tue Jan 7 13:17:47 2014 UTC revision 2414 by niro, Tue Jan 7 13:36:09 2014 UTC
# Line 52  else Line 52  else
52   die "/mnt/cdrom/system/images.conf not found"   die "/mnt/cdrom/system/images.conf not found"
53  fi  fi
54    
 # includes  
 source ${INSTALLER_LIBDIR}/functions/hwdetection.sh  
   
55  ### System/Config Version  ### System/Config Version
56  VERSION="%VERSIONTAG%"  VERSION="%VERSIONTAG%"
57  TITLE="${DEFAULT_TITLE} - ${VERSION}"  TITLE="${DEFAULT_TITLE} - ${VERSION}"
58    
59    # some sane defaults
60  CDROOT="${DEFAULT_CDROOT}"  CDROOT="${DEFAULT_CDROOT}"
61  INSTALLROOT="${DEFAULT_INSTALLROOT}"  INSTALLROOT="${DEFAULT_INSTALLROOT}"
62    KERNELPKG="${DEFAULT_KERNELPKG}"
63  # standard kernel opts  KERNELOPTS="${DEFAULT_KERNELOPTS}"
 KERNELOPTS="quiet video=1024x768"  
   
 # grub options  
64  GRUBLEGACYOPTS=""  GRUBLEGACYOPTS=""
65  GRUB2OPTS=""  GRUB2OPTS=""
   
 # fdisk options  
66  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
   
 # default specialdevices  
67  SPECIALDEVICE=""  SPECIALDEVICE=""
68  FORMFACTOR="desktop"  FORMFACTOR="${DEFAULT_FORMFACTOR}"
   
 # target filesystem  
69  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
70    
71  #################################################  #################################################
72  #  DIALOG BOXEN #  #  DIALOG BOXEN #
73  #################################################  #################################################
74    
75    trap_exit()
76    {
77     is_mounted --location "${INSTALLROOT}/dev" && umount ${INSTALLROOT}/dev
78     is_mounted --location "${INSTALLROOT}/proc" && umount ${INSTALLROOT}/proc
79     is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys
80     is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot
81     is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}
82    
83     echo $"Installation aborted."
84     exit 1
85    }
86    
87  dialog_die()  dialog_die()
88  {  {
89   ERROR="$1"   ERROR="$1"
# Line 107  dialog_warning() Line 108  dialog_warning()
108    
109  dialog_setup_hdd_info()  dialog_setup_hdd_info()
110  {  {
111   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="${HDD//\/dev\/}"
112    
113   dialog \   messagebox -h $"[ Harddrive partitioning ]" \
114   --colors \   $"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
  --title "[ Festplatten Partitionierung ]" \  
  --backtitle "${TITLE}" \  
  --ok-label "Weiter" \  
  --msgbox "\nBitte legen Sie 1 Partition an.\n\n\  
  [ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\  
  Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81  
115  }  }
116    
117  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
118  {  {
119   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="${HDD//\/dev\/}"
120    
121   dialog \   messagebox -h $"[ Harddrive partitioning ]" \
122   --colors \   $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
  --title "[ Festplatten Partitionierung ]" \  
  --backtitle "${TITLE}" \  
  --ok-label "Weiter" \  
  --msgbox "\nAchtung!\n\  
  Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81  
123  }  }
124    
125  dialog_setup_system_menu()  dialog_setup_system_menu()
126  {  {
127   local i   local mode
128     local retval
129    
130   i=$(dialog \   mode=$(dialog \
131   --backtitle "${TITLE}" \   --backtitle "${TITLE}" \
132   --title "[ Festplatten Partitionierung ]" \   --title "[ Festplatten Partitionierung ]" \
133   --cancel-label "Abbrechen" \   --cancel-label "Abbrechen" \
# Line 148  dialog_setup_system_menu() Line 139  dialog_setup_system_menu()
139   "" "" \   "" "" \
140   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
141   "2" "Normale IDE-Disk (Manuell)" \   "2" "Normale IDE-Disk (Manuell)" \
142   RES=$?   retval=$?
143   [[ ${RES} -eq 1 ]] && return 1   [[ ${retval} -eq 1 ]] && return 1
144   if [[ ${RES} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
145   then   then
146   case "${i}" in   case "${menu}" in
147   "1") run_install_auto ;;   "1") run_install_auto ;;
148   "2") run_install_normal ;;   "2") run_install_normal ;;
149   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
# Line 224  dialog_hardware_detection() Line 215  dialog_hardware_detection()
215   fi   fi
216  }  }
217    
218  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manual()
219  {  {
220   local i   local i
221    
# Line 257  dialog_setup_hdd_partitions_manuell() Line 248  dialog_setup_hdd_partitions_manuell()
248   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
249   then   then
250   dialog_setup_hdd_info   dialog_setup_hdd_info
251   setup_hdd_partitions_manuell   setup_hdd_partitions_manual
252   fi   fi
253   fi   fi
254  }  }
# Line 553  EOF Line 544  EOF
544   fi   fi
545  }  }
546    
547  setup_hdd_partitions_manuell()  setup_hdd_partitions_manual()
548  {  {
549   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
550    
551   ## hdds partitionieren manuell   ## hdds partitionieren manual
552   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
553  }  }
554    
# Line 834  run_install_normal() Line 825  run_install_normal()
825  {  {
826   dialog_hardware_detection   dialog_hardware_detection
827    
828   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manual
829   dialog_setup_hdd_format   dialog_setup_hdd_format
830   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
831   install_mount_rootfs   install_mount_rootfs
# Line 874  run_install_auto() Line 865  run_install_auto()
865   dialog_install_successful   dialog_install_successful
866  }  }
867    
868    # set some proper traps
869    trap "trap_exit" SIGINT SIGQUIT
870    
871  dialog_main  dialog_main
872    
873  exit 0  exit 0

Legend:
Removed from v.2402  
changed lines
  Added in v.2414