Refactor destination setting in lh_binary_silo to check arguments at beginning of the script.
This commit is contained in:
parent
1271828d6d
commit
468838fdad
|
@ -33,6 +33,17 @@ then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
# Check image type
|
||||
case "${LH_BINARY_IMAGES}" in
|
||||
iso|usb-hdd)
|
||||
;;
|
||||
|
||||
net|tar)
|
||||
Echo_error "not yet supported, aborting (FIXME)."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
Echo_message "Begin installing silo..."
|
||||
|
||||
# Requiring stage file
|
||||
|
@ -98,38 +109,20 @@ Silo_install_entry ()
|
|||
LINUX_INSTALL="${LINUX_INSTALL}\t append=\"LH_BOOTAPPEND_LIVE ${APPEND} LH_BOOTAPPEND_INSTALL\"\n"
|
||||
}
|
||||
|
||||
# Setting destination directories
|
||||
DESTDIR_INSTALL="binary/install"
|
||||
case "${LH_INITRAMFS}" in
|
||||
casper)
|
||||
INITFS="casper"
|
||||
;;
|
||||
|
||||
live-initramfs)
|
||||
INITFS="live"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Setting destination directory
|
||||
case "${LH_BINARY_IMAGES}" in
|
||||
iso|usb-hdd)
|
||||
case "${LH_INITRAMFS}" in
|
||||
casper)
|
||||
DESTDIR_LIVE="binary/casper"
|
||||
;;
|
||||
|
||||
live-initramfs)
|
||||
INITFS="live"
|
||||
DESTDIR_LIVE="binary/live"
|
||||
;;
|
||||
esac
|
||||
|
||||
DESTDIR_INSTALL="binary/install"
|
||||
;;
|
||||
|
||||
net|tar)
|
||||
Echo_error "not yet supported, aborting (FIXME)."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Creating directory
|
||||
mkdir -p "${DESTDIR_LIVE}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue