Magellan Linux

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

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

revision 2399 by niro, Tue Jan 7 13:13:26 2014 UTC revision 2403 by niro, Tue Jan 7 13:18:21 2014 UTC
# Line 22  die() Line 22  die()
22   exit 1   exit 1
23  }  }
24    
25  # configuration  # load common includes
26  if [ -e %SYSCONFDIR%/installer.conf ]  for inc in %SYSCONFDIR%/installer.conf \
27  then   ${INSTALLER_LIBDIR}/functions/common.sh \
28   source %SYSCONFDIR%/installer.conf   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
29  else   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \
30   die "/etc/installer.conf not found"   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
31  fi  do
32     if [ -e ${inc} ]
33     then
34     source "${inc}"
35     else
36     die "'${inc}' not found"
37     fi
38    done
39    
40  # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !  # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
41  # -> now in images.conf  # -> now in images.conf
# Line 45  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}"

Legend:
Removed from v.2399  
changed lines
  Added in v.2403