Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer-simple/bin/installer.sh.in

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

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

    revision 2929 by niro, Fri Jul 31 11:40:56 2015 UTC revision 2930 by niro, Wed Feb 3 11:00:35 2016 UTC
    # Line 40  do Line 40  do
    40   fi   fi
    41  done  done
    42    
    43    # fetch cmdline
    44    for argv in $*
    45    do
    46     case $1 in
    47     --liveroot) shift; cmdliveroot="$1" ;;
    48     --imageroot) shift; cmdimageroot="$1" ;;
    49     --installroot) shift; cmdinstallroot="$1" ;;
    50     --filesystem) shift; cmdformatfilesystem="$1" ;;
    51     --help)
    52     echo "$0 options:"
    53     echo " --liveroot [path]     - override default liveroot"
    54     echo " --imageroot [path]    - override default imageroot"
    55     echo " --installroot [path]  - override default installroot"
    56     echo " --filesystem [fstype] - override default filesystem used to format the disk"
    57     exit 0 ;;
    58     esac
    59     shift
    60    done
    61    
    62  ### System/Config Version  ### System/Config Version
    63  VERSION="%VERSIONTAG%"  VERSION="%VERSIONTAG%"
    64  TITLE="${DEFAULT_TITLE} - ${VERSION}"  TITLE="${DEFAULT_TITLE} - ${VERSION}"
    # Line 47  TITLE="${DEFAULT_TITLE} - ${VERSION}" Line 66  TITLE="${DEFAULT_TITLE} - ${VERSION}"
    66  # initialize global variables so they are exportable  # initialize global variables so they are exportable
    67  # some sane defaults  # some sane defaults
    68  INSTALL_METHOD=""  INSTALL_METHOD=""
    69  LIVEROOT="${DEFAULT_LIVEROOT}"  if [[ -n ${cmdliveroot} ]]
    70  IMAGEROOT="${DEFAULT_IMAGEROOT}"  then
    71  INSTALLROOT="${DEFAULT_INSTALLROOT}"   LIVEROOT="${cmdliveroot}"
    72    else
    73     LIVEROOT="${DEFAULT_LIVEROOT}"
    74    fi
    75    if [[ -n ${cmdimageroot} ]]
    76    then
    77     IMAGEROOT="${cmdimageroot}"
    78    else
    79     IMAGEROOT="${DEFAULT_IMAGEROOT}"
    80    fi
    81    if [[ -n ${cmdinstallroot} ]]
    82    then
    83     INSTALLROOT="${cmdinstallroot}"
    84    else
    85     INSTALLROOT="${DEFAULT_INSTALLROOT}"
    86    fi
    87  KERNELPKG="${DEFAULT_KERNELPKG}"  KERNELPKG="${DEFAULT_KERNELPKG}"
    88  KERNELOPTS="${DEFAULT_KERNELOPTS}"  KERNELOPTS="${DEFAULT_KERNELOPTS}"
    89  GRUBLEGACYOPTS=""  GRUBLEGACYOPTS=""
    # Line 57  GRUB2OPTS="" Line 91  GRUB2OPTS=""
    91  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
    92  SPECIALDEVICE=""  SPECIALDEVICE=""
    93  FORMFACTOR="${DEFAULT_FORMFACTOR}"  FORMFACTOR="${DEFAULT_FORMFACTOR}"
    94  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"  if [[ -n ${cmdformatfilesystem} ]]
    95    then
    96     FORMAT_FILESYSTEM="${cmdformatfilesystem}"
    97    else
    98     FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
    99    fi
    100  FLASHDISK=0  FLASHDISK=0
    101    
    102  # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !  # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
    # Line 154  install_do_reboot() Line 193  install_do_reboot()
    193  run_hardware_detection()  run_hardware_detection()
    194  {  {
    195   local hwinfo   local hwinfo
       
    196   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    197    
    198   # check for special devices/clients:   # check for special devices/clients:
    Legend:
    Removed from v.2929  
    changed lines
      Added in v.2930