Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer/include/prepare_disks.sh

    Diff of /trunk/installer/include/prepare_disks.sh

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

    revision 1060 by niro, Sun May 30 23:08:59 2010 UTC revision 1061 by niro, Mon May 31 21:01:51 2010 UTC
    # Line 1  Line 1 
    1  #!/bin/sh  #!/bin/sh
    2  # $Id$  # $Id$
    3    
    4    source /etc/installer.conf
    5    
    6  : ${INSTALL_ROOT="/mnt/magellan"}  : ${INSTALL_ROOT="/mnt/magellan"}
    7  KNOWN_DISKS="ROOT BOOT SWAP HOME TMP USER VAR SVR OPT"  KNOWN_DISKS="ROOT BOOT SWAP HOME TMP USER VAR SVR OPT"
    8    
    # Line 26  format_disks() Line 28  format_disks()
    28   if [[ ! -z ${disk_fs} ]]   if [[ ! -z ${disk_fs} ]]
    29   then   then
    30   case ${disk_fs} in   case ${disk_fs} in
    31   swap) mkswap ${disk_part} &> /dev/null;;   swap) mkswap ${disk_part} &>> ${INSTALLER_LOG};;
    32   reiserfs) mkfs.${disk_fs} -f ${disk_part} &> /dev/null;;   reiserfs) mkfs.${disk_fs} -f ${disk_part} &>> ${INSTALLER_LOG};;
    33   keep-as-is) echo "keeping as-is." ;;   keep-as-is) echo "keeping ${disk_part} 'as-is'." &>> ${INSTALLER_LOG};;
    34   *) mkfs.${disk_fs} ${disk_part} &> /dev/null;;   *) mkfs.${disk_fs} ${disk_part} &>> ${INSTALLER_LOG};;
    35   esac   esac
    36   fi   fi
    37   fi   fi
    # Line 38  format_disks() Line 40  format_disks()
    40   percent=$(echo ${progress} 9 | awk '{print ($1 / $2 * 100) - 1}')   percent=$(echo ${progress} 9 | awk '{print ($1 / $2 * 100) - 1}')
    41   if [[ ${GUITYPE} = ncurses ]]   if [[ ${GUITYPE} = ncurses ]]
    42   then   then
    43   # no floats in ncurses gui possible   # no floats in ncurses gui possible + crlf
    44   printf %.0f "${percent}"   printf %.0f "${percent}";printf '\n'
    45   else   else
    46   echo "${percent}"   echo "${percent}"
    47   fi   fi
    # Line 109  umount_disks() Line 111  umount_disks()
    111   swapoff ${PARTITION_DISK_SWAP}   swapoff ${PARTITION_DISK_SWAP}
    112  }  }
    113    
    114    case $2 in
    115     --ncurses) GUITYPE="ncurses" ;;
    116     --gtk) GUITYPE="gtk" ;;
    117     *) GUITYPE="gtk" ;;
    118    esac
    119    
    120  case $1 in  case $1 in
    121   --format | -f) format_disks ;;   --format | -f) format_disks ;;
    122   --mount | -m ) mount_disks ;;   --mount | -m ) mount_disks ;;
    123   --umount | -u ) umount_disks ;;   --umount | -u ) umount_disks ;;
    124   *) echo "unknown option '$1'." ;;   *) echo "unknown option '$1'." ;;
    125  esac  esac
       
     case $2 in  
      --ncurses) GUITYPE="ncurses" ;;  
      --gtk) GUITYPE="gtk" ;;  
      *) GUITYPE="gtk" ;;  
     esac  
    Legend:
    Removed from v.1060  
    changed lines
      Added in v.1061