Magellan Linux

Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh

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

revision 522 by niro, Fri Jun 27 22:43:02 2008 UTC revision 525 by niro, Fri Jun 27 23:31:48 2008 UTC
# Line 1  Line 1 
1  #!/bin/sh  #!/bin/sh
2  #  #
3  # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.8 2008-06-27 22:43:02 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.11 2008-06-27 23:31:48 niro Exp $
4  #  #
5  # AutoSta_LX Installation Script  # AutoSta_LX Installation Script
6  #  #
# Line 17  source /mnt/cdrom/system/images.conf Line 17  source /mnt/cdrom/system/images.conf
17  #Includes  #Includes
18  source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null  source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null
19  ### bugfix ###############################  ### bugfix ###############################
20  cdromdev="`echo $cdromdev|sed -e 's/ //'`"  cdromdev="$(echo ${cdromdev} | sed 's/ //')"
21  ########################################  ########################################
22    
23  ### System/Config Version  ### System/Config Version
24  VERSION="0.3"  VERSION="0.3"
25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
26    
 #CONFIGS_TEMPLATE="/opt/alx-config/configs"  
   
27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
28  INSTALLPATH="/mnt/magellan"  INSTALLPATH="/mnt/magellan"
29    
# Line 268  dialog_install_meter() Line 266  dialog_install_meter()
266  {  {
267   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
268   do   do
269   CURRENTLINE=$(grep --count . /tmp/install.log)   CURRENTLINE=$(grep -c . /tmp/install.log)
270   PERCENT=$(expr ${CURRENTLINE} \* 100 / ${TOTALLINES})   PERCENT=$(( ${CURRENTLINE} * 100 / ${TOTALLINES}))
271   echo ${PERCENT}   echo ${PERCENT}
272   sleep 1   sleep 1
273   done   done
# Line 320  dialog_main() Line 318  dialog_main()
318   "3" "Beenden und neustarten" \   "3" "Beenden und neustarten" \
319   "4" "Beenden und eine Shell starten")   "4" "Beenden und eine Shell starten")
320   RES=$?   RES=$?
321   if [[ ${RES} -eq 1 ]] && exit 1   [[ ${RES} -eq 1 ]] && exit 1
322   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
323   then   then
324   case ${METHOD} in   case ${METHOD} in
# Line 420  root (hd0,0) Line 418  root (hd0,0)
418  setup (hd0)  setup (hd0)
419  quit  quit
420  EOF  EOF
421    echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx\" > /etc/conf.d/mkinitrd
422    mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g")
423  exit 0  exit 0
424  CHROOTEOF  CHROOTEOF
425    

Legend:
Removed from v.522  
changed lines
  Added in v.525