xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-21 05:25:32 +00:00
Code Issues Releases Wiki Activity

[go-xcat] Fix a bug on Ubuntu. On amd64, apt is configured for bi-arch, while xcat repository is not bi-arch.

Browse Source
This commit is contained in:
GONG Jie
2016-06-23 16:00:51 +08:00
parent bf8d91d4e1
commit 34abeed36c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/share/xcat/tools/go-xcat
View File

@ -741,7 +741,7 @@ function add_repo_by_url_yum_or_zypper()
function add_repo_by_url_apt()
{
[[ -d /etc/apt/sources.list.d/ ]] || return 255
local base_url="$1"
local url="$1"
local repo_id="$2"
local tmp=""
local install_path="${GO_XCAT_DEFAULT_INSTALL_PATH}"
@ -763,7 +763,7 @@ function add_repo_by_url_apt()
;;
*) # assume it is the base url of the repo
tmp="${TMP_DIR}/tmp_repo.list"
echo "deb ${base_url} ${codename} main" >"${tmp}"
echo "deb [arch=$(dpkg --print-architecture)] ${url} ${codename} main" >"${tmp}"
url="${tmp}"
;;
esac
@ -791,7 +791,7 @@ function add_repo_by_url_apt()
[[ "${url:0:1}" = "/" ]] || url="${PWD}/${url}"
# directory
tmp="${TMP_DIR}/tmp_repo.list"
echo "deb file://${url} ${codename} main" >"${tmp}"
echo "deb [arch=$(dpkg --print-architechure)] file://${url} ${codename} main" >"${tmp}"
add_repo_by_file_apt "${tmp}" "${repo_id}"
return "$?"
fi