Skip to content
This repository has been archived by the owner on Feb 8, 2021. It is now read-only.

This PR will fix #4 #5

Closed
wants to merge 3 commits into from
Closed

This PR will fix #4 #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5a0c17
Simplify function of checking OS init system
Oct 8, 2015
cbbf1d5
Remove redundancy logic on Mint distro checking.
Oct 8, 2015
563159b
Fix #2, tput would work without $TERM environ
Oct 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions hyper-bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ DEBIAN_CODE=(jessie wheezy)
CENTOS_VER=(6 7)
FEDORA_VER=(20 21 22)
#Color Constant
[ ! -z ${TERM} ] || TERM="xterm" # tput would complain without $TERM environ
RED=`tput setaf 1`
GREEN=`tput setaf 2`
YELLOW=`tput setaf 3`
Expand Down Expand Up @@ -100,7 +101,7 @@ check_deps() {
check_deps_platform
check_deps_distro
check_deps_qemu || check_deps_xen || exit ${${ERR_NO_HYPERVISOR[0]}}
check_deps_initsystem
check_initsystem
show_message done " Done"
}
check_deps_platform() {
Expand Down Expand Up @@ -144,9 +145,7 @@ check_deps_distro() {
fi
case "${LSB_DISTRO}" in
linuxmint)
if [ "${LSB_DISTRO}" == "linuxmint" ]
then SUPPORT_CODE_LIST="${LINUX_MINT_CODE[@]}";
fi
SUPPORT_CODE_LIST="${LINUX_MINT_CODE[@]}";
if (echo "${SUPPORT_CODE_LIST}" | grep -vqw "${LSB_CODE}");then
show_message error "Hyper support ${LSB_DISTRO}( ${SUPPORT_CODE_LIST} ), but current is ${LSB_CODE}(${LSB_VER})"
exit ${ERR_NOT_SUPPORT_DISTRO_VERSION[0]}
Expand Down Expand Up @@ -222,10 +221,8 @@ check_deps_qemu() { #QEMU 2.0+ should be installed
echo -n "."
return 0
}
check_deps_initsystem() {
if [ "${LSB_DISTRO}" == "ubuntu" -a "${LSB_CODE}" == "utopic" ];then
INIT_SYSTEM="sysvinit"
elif (command_exist systemctl);then
check_initsystem() {
if (command_exist systemctl);then
INIT_SYSTEM="systemd"
else
INIT_SYSTEM="sysvinit"
Expand Down