--- trunk/installer-simple/bin/installer.sh.in 2016/01/21 14:40:55 2929 +++ trunk/installer-simple/bin/installer.sh.in 2016/02/03 11:00:35 2930 @@ -40,6 +40,25 @@ fi done +# fetch cmdline +for argv in $* +do + case $1 in + --liveroot) shift; cmdliveroot="$1" ;; + --imageroot) shift; cmdimageroot="$1" ;; + --installroot) shift; cmdinstallroot="$1" ;; + --filesystem) shift; cmdformatfilesystem="$1" ;; + --help) + echo "$0 options:" + echo " --liveroot [path] - override default liveroot" + echo " --imageroot [path] - override default imageroot" + echo " --installroot [path] - override default installroot" + echo " --filesystem [fstype] - override default filesystem used to format the disk" + exit 0 ;; + esac + shift +done + ### System/Config Version VERSION="%VERSIONTAG%" TITLE="${DEFAULT_TITLE} - ${VERSION}" @@ -47,9 +66,24 @@ # initialize global variables so they are exportable # some sane defaults INSTALL_METHOD="" -LIVEROOT="${DEFAULT_LIVEROOT}" -IMAGEROOT="${DEFAULT_IMAGEROOT}" -INSTALLROOT="${DEFAULT_INSTALLROOT}" +if [[ -n ${cmdliveroot} ]] +then + LIVEROOT="${cmdliveroot}" +else + LIVEROOT="${DEFAULT_LIVEROOT}" +fi +if [[ -n ${cmdimageroot} ]] +then + IMAGEROOT="${cmdimageroot}" +else + IMAGEROOT="${DEFAULT_IMAGEROOT}" +fi +if [[ -n ${cmdinstallroot} ]] +then + INSTALLROOT="${cmdinstallroot}" +else + INSTALLROOT="${DEFAULT_INSTALLROOT}" +fi KERNELPKG="${DEFAULT_KERNELPKG}" KERNELOPTS="${DEFAULT_KERNELOPTS}" GRUBLEGACYOPTS="" @@ -57,7 +91,12 @@ FDISKPARTIONBELOW256MB=0 SPECIALDEVICE="" FORMFACTOR="${DEFAULT_FORMFACTOR}" -FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}" +if [[ -n ${cmdformatfilesystem} ]] +then + FORMAT_FILESYSTEM="${cmdformatfilesystem}" +else + FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}" +fi FLASHDISK=0 # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 ! @@ -154,7 +193,6 @@ run_hardware_detection() { local hwinfo - hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)" # check for special devices/clients: