Magellan Linux

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

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

trunk/installer-simple/bin/alxinstall-ng.sh.in revision 2320 by niro, Fri Jan 3 13:12:33 2014 UTC trunk/installer-simple/bin/installer.sh.in revision 2340 by niro, Fri Jan 3 14:32:47 2014 UTC
# Line 1  Line 1 
1  #!/bin/sh  #!/bin/bash
2    # $Id$
3  #  #
4  # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $  # Simple Installation Script
5  #  # merged from alxinstall-ng and mcore-installer
 # AutoSta_LX Installation Script  
6  #  #
7  # Niels Rogalla <niro@magellan-linux.de>  # Niels Rogalla <niro@magellan-linux.de>
 # <rogalla@augusta-bochum.de>  
 #  
 #  
 # Install Navigation Gui  
8  #  #
9    
10  #images: (get ${CDIMAGENAME})  # ignore the environment
11  source /mnt/cdrom/system/images.conf  LC_ALL=C
12    # include dir
13    INSTALLER_LIBDIR="%LIBDIR%"
14    
15    # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
16    # -> now in images.conf
17    CURRENTLINE=0
18    
19    # configuration
20    if [ -e %SYSCONFDIR%/installer.conf ]
21    then
22     source %SYSCONFDIR%/installer.conf
23    else
24     die "/etc/installer.conf not found"
25    fi
26    
27    # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
28    # -> now in images.conf
29    CDIMAGENAME=""
30    TOTALLINES=""
31    CURRENTLINE=0
32    if [ -e /mnt/cdrom/system/images.conf ]
33    then
34     source /mnt/cdrom/system/images.conf
35     # check if all required variables are set
36     [[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"
37     [[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"
38    else
39     die "/mnt/cdrom/system/images.conf not found"
40    fi
41    
42  #Includes  # includes
43  source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null  source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
 ### bugfix ###############################  
 cdromdev="$(echo ${cdromdev} | sed 's/ //')"  
 ########################################  
44    
45  ### System/Config Version  ### System/Config Version
46  VERSION="%VERSIONTAG%"  VERSION="%VERSIONTAG%"
47  TITLE="alxinstall-ng - ${VERSION}"  TITLE="${DEFAULT_TITLE} - ${VERSION}"
48    
49  CDPATH="/mnt/cdrom"  CDPATH="${DEFAULT_CDPATH}"
50  INSTALLPATH="/mnt/magellan"  INSTALLPATH="${DEFAULT_INSTALLPATH}"
   
 ### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1  
 CURRENTLINE=0  
 #TOTALLINES=11072 # -> now in images.conf  
51    
52  # standard kernel opts  # standard kernel opts
53  KERNELOPTS="quiet video=1024x768"  KERNELOPTS="quiet video=1024x768"
# Line 46  SPECIALDEVICE="" Line 64  SPECIALDEVICE=""
64  FORMFACTOR="desktop"  FORMFACTOR="desktop"
65    
66  # target filesystem  # target filesystem
67  FORMAT_FILESYSTEM="ext4"  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
68    
69  #################################################  #################################################
70  #  DIALOG BOXEN #  #  DIALOG BOXEN #
# Line 54  FORMAT_FILESYSTEM="ext4" Line 72  FORMAT_FILESYSTEM="ext4"
72    
73  die()  die()
74  {  {
75     echo "Error: $@"
76     exit 1
77    }
78    
79    dialog_die()
80    {
81   ERROR=$1   ERROR=$1
82   RETVAL=$?   RETVAL=$?
83   dialog_install_failure   dialog_install_failure
# Line 505  hdd_size_below_256mb() Line 529  hdd_size_below_256mb()
529   local hdd="$1"   local hdd="$1"
530   local size   local size
531   local retval   local retval
532   [[ -z ${hdd} ]] && die "Error: get_hdd_size() no \$hdd given!"   [[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"
533    
534   size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')   size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
535   if [[ ${size} -le 257000000 ]]   if [[ ${size} -le 257000000 ]]
# Line 534  setup_hdd_partitions_auto() Line 558  setup_hdd_partitions_auto()
558   fi   fi
559    
560   ## delete disk   ## delete disk
561   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || dialog_die
562    
563   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
564   then   then
# Line 587  setup_hdd_partitions_manuell() Line 611  setup_hdd_partitions_manuell()
611   ROOTHDD="${HDD}3"   ROOTHDD="${HDD}3"
612    
613   ## hdds partitionieren manuell   ## hdds partitionieren manuell
614   cfdisk ${HDD} || die   cfdisk ${HDD} || dialog_die
615  }  }
616    
617  setup_hdd_partitions_manuell_flash()  setup_hdd_partitions_manuell_flash()
# Line 595  setup_hdd_partitions_manuell_flash() Line 619  setup_hdd_partitions_manuell_flash()
619   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
620    
621   ## hdds partitionieren manuell   ## hdds partitionieren manuell
622   cfdisk ${HDD} || die   cfdisk ${HDD} || dialog_die
623  }  }
624    
625  setup_hdd_format()  setup_hdd_format()
626  {  {
627   mkswap ${SWAPHDD} || die   mkswap ${SWAPHDD} || dialog_die
628   mke2fs -j -q ${BOOTHDD} || die   mke2fs -j -q ${BOOTHDD} || dialog_die
629   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || dialog_die
630  }  }
631    
632  setup_hdd_format_flash()  setup_hdd_format_flash()
633  {  {
634   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || dialog_die
635  }  }
636    
637  install_mount_rootfs()  install_mount_rootfs()
638  {  {
639   swapon ${SWAPHDD} || die   swapon ${SWAPHDD} || dialog_die
640   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALLPATH} || dialog_die
641   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALLPATH}/boot || dialog_die
642   mount ${BOOTHDD} ${INSTALLPATH}/boot || die   mount ${BOOTHDD} ${INSTALLPATH}/boot || dialog_die
643   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || dialog_die
644  }  }
645    
646  install_mount_rootfs_flash()  install_mount_rootfs_flash()
647  {  {
648   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALLPATH} || dialog_die
649   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALLPATH}/boot || dialog_die
650   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || dialog_die
651  }  }
652    
653  install_system_image()  install_system_image()
# Line 643  install_bootsector_chroot() Line 667  install_bootsector_chroot()
667   # needed by grub-mkconfig on the first run   # needed by grub-mkconfig on the first run
668   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]
669   then   then
670   install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die   install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || dialog_die
671   fi   fi
672    
673   # set kernelopts   # set kernelopts
674   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
675   then   then
676   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || dialog_die
677   else   else
678   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || dialog_die
679   fi   fi
680   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || dialog_die
681   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || dialog_die
682   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || dialog_die
683   echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die   echo "exit 0" >> ${INSTALLPATH}/root/.installrc || dialog_die
684    
685   # grub-legacy   # grub-legacy
686   else   else
# Line 684  install_bootsector_chroot() Line 708  install_bootsector_chroot()
708   my_roothdd="${ROOTHDD}"   my_roothdd="${ROOTHDD}"
709   fi   fi
710    
711   : > ${grubconf} || die   : > ${grubconf} || dialog_die
712   echo "default 0" >> ${grubconf} || die   echo "default 0" >> ${grubconf} || dialog_die
713   echo "timeout 3" >> ${grubconf} || die   echo "timeout 3" >> ${grubconf} || dialog_die
714   # using current root password   # using current root password
715   echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die   echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || dialog_die
716    
717   echo  >> ${grubconf} || die   echo  >> ${grubconf} || dialog_die
718   echo "# normal boot" >> ${grubconf} || die   echo "# normal boot" >> ${grubconf} || dialog_die
719   echo "title ${KRNVER}" >> ${grubconf} || die   echo "title ${KRNVER}" >> ${grubconf} || dialog_die
720   echo "root (hd0,0)" >> ${grubconf} || die   echo "root (hd0,0)" >> ${grubconf} || dialog_die
721   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die
722   if is_initrd_supported   if is_initrd_supported
723   then   then
724   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
725   fi   fi
726    
727   echo >> ${grubconf} || die   echo >> ${grubconf} || dialog_die
728   echo "# admin boot" >> ${grubconf} || die   echo "# admin boot" >> ${grubconf} || dialog_die
729   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die
730   echo "lock"  >> ${grubconf} || die   echo "lock"  >> ${grubconf} || dialog_die
731   echo "root (hd0,0)" >> ${grubconf} || die   echo "root (hd0,0)" >> ${grubconf} || dialog_die
732   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || dialog_die
733   if is_initrd_supported   if is_initrd_supported
734   then   then
735   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
736   fi   fi
737    
738   echo >> ${grubconf} || die   echo >> ${grubconf} || dialog_die
739   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die
740   echo "lock"  >> ${grubconf} || die   echo "lock"  >> ${grubconf} || dialog_die
741   echo "root (hd0,0)" >> ${grubconf} || die   echo "root (hd0,0)" >> ${grubconf} || dialog_die
742   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || dialog_die
743   if is_initrd_supported   if is_initrd_supported
744   then   then
745   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
746   fi   fi
747    
748   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
# Line 732  exit 0 Line 756  exit 0
756  CHROOTEOF  CHROOTEOF
757   fi   fi
758    
759   ## enters chroot   ## enter chroot
760   mount -t proc proc ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
761   mount -t sysfs sysfs ${INSTALLPATH}/sys   mount -t sysfs sysfs ${INSTALLPATH}/sys
762   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
# Line 777  install_initrd_chroot() Line 801  install_initrd_chroot()
801   fi   fi
802    
803   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
804   install -d ${INSTALLPATH}/etc/modprobe.d || die   install -d ${INSTALLPATH}/etc/modprobe.d || dialog_die
805   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || dialog_die
806    
807   # install an appropriate viafb.conf   # install an appropriate viafb.conf
808   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || dialog_die
809    
810   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
811   echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die   echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || dialog_die
812    
813   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
814  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
# Line 824  get_uuid() Line 848  get_uuid()
848   local TYPE   local TYPE
849    
850   local dev="$1"   local dev="$1"
851   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && dialog_die "no dev given"
852    
853   # check if given device is already an UUID   # check if given device is already an UUID
854   if [[ ${dev/UUID=/}x != ${dev}x ]]   if [[ ${dev/UUID=/}x != ${dev}x ]]
# Line 841  install_system_settings() Line 865  install_system_settings()
865   # schreibe fstab   # schreibe fstab
866   if is_uuid_supported   if is_uuid_supported
867   then   then
868   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || dialog_die
869   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || dialog_die
870   else   else
871   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || dialog_die
872   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || dialog_die
873   fi   fi
874   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
875   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || dialog_die
876   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || dialog_die
877   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || dialog_die
878    
879   # install network config skeleton   # install network config skeleton
880   install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die   install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || dialog_die
881    
882   # intel framebufer quirk   # intel framebufer quirk
883   if [[ -e /proc/fb ]]   if [[ -e /proc/fb ]]
# Line 863  install_system_settings() Line 887  install_system_settings()
887   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
888   if [[ ${fbdev} != 0 ]]   if [[ ${fbdev} != 0 ]]
889   then   then
890   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || dialog_die
891   fi   fi
892   fi   fi
893   fi   fi
# Line 874  install_system_settings_flash() Line 898  install_system_settings_flash()
898   # schreibe fstab   # schreibe fstab
899   if is_uuid_supported   if is_uuid_supported
900   then   then
901   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || dialog_die
902   else   else
903   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || dialog_die
904   fi   fi
905   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || dialog_die
906   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || dialog_die
907  }  }
908    
909  install_umount_rootfs()  install_umount_rootfs()
910  {  {
911   cd /   cd /
912   umount ${INSTALLPATH}/boot || die   umount ${INSTALLPATH}/boot || dialog_die
913   umount ${INSTALLPATH} || die   umount ${INSTALLPATH} || dialog_die
914   swapoff ${SWAPHDD} || die   swapoff ${SWAPHDD} || dialog_die
915  }  }
916    
917  install_umount_rootfs_flash()  install_umount_rootfs_flash()
918  {  {
919   cd /   cd /
920   umount ${INSTALLPATH} || die   umount ${INSTALLPATH} || dialog_die
921  }  }
922    
923  install_do_reboot()  install_do_reboot()

Legend:
Removed from v.2320  
changed lines
  Added in v.2340