From bf8d91d4e18963c9dda9f5761e71e88a1e687016 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Wed, 22 Jun 2016 10:10:40 +0800 Subject: [PATCH 1/2] [go-xcat] Fix typo --- xCAT-server/share/xcat/tools/go-xcat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index 737fcc14d..2b43dfea3 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -33,7 +33,7 @@ function usage() Actions: install installs all the latest versions of xcat-core - end xcat-dep packages from the repository + and xcat-dep packages from the repository update updates installed xcat-core packages to the latest version from the repository From 34abeed36cb64a4f402e62c5ac21c01cd45345db Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 23 Jun 2016 16:00:51 +0800 Subject: [PATCH 2/2] [go-xcat] Fix a bug on Ubuntu. On amd64, apt is configured for bi-arch, while xcat repository is not bi-arch. --- xCAT-server/share/xcat/tools/go-xcat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index 2b43dfea3..205358d50 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -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