Magellan Linux

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

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

revision 2404 by niro, Tue Jan 7 13:20:20 2014 UTC revision 2410 by niro, Tue Jan 7 13:29:00 2014 UTC
# Line 72  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM} Line 72  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}
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 96  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 \   dialog \
114   --colors \   --colors \
# Line 110  dialog_setup_hdd_info() Line 122  dialog_setup_hdd_info()
122    
123  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
124  {  {
125   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="${HDD//\/dev\/}"
126    
127   dialog \   dialog \
128   --colors \   --colors \
# Line 863  run_install_auto() Line 875  run_install_auto()
875   dialog_install_successful   dialog_install_successful
876  }  }
877    
878    # set some proper traps
879    trap "trap_exit" SIGINT SIGQUIT
880    
881  dialog_main  dialog_main
882    
883  exit 0  exit 0

Legend:
Removed from v.2404  
changed lines
  Added in v.2410