diff options
| author | Kun Ma <kun.ma@citrix.com> | 2017-03-21 15:35:55 +0800 |
|---|---|---|
| committer | Kun Ma <kun.ma@citrix.com> | 2017-03-21 15:35:55 +0800 |
| commit | 472b5842124bc7db1ef583d0d929c7f1d17aa246 (patch) | |
| tree | 160d4f3aa227aa4ea000aa963869e1bb93ed81cc | |
| parent | b7da1b038eead2ec046c820f70b1271d9fbf6e64 (diff) | |
| download | vyos-xe-guest-utilities-472b5842124bc7db1ef583d0d929c7f1d17aa246.tar.gz vyos-xe-guest-utilities-472b5842124bc7db1ef583d0d929c7f1d17aa246.zip | |
CP-20237: Replace place-holder for DISTRO to '^'
Signed-off-by: Kun Ma <kun.ma@citrix.com>
| -rw-r--r-- | mk/Citrix.repo | 6 | ||||
| -rw-r--r-- | mk/citrix.list | 4 | ||||
| -rwxr-xr-x | mk/debian/xe-guest-utilities.postinst | 2 | ||||
| -rw-r--r-- | mk/xe-guest-utilities.spec.in | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/mk/Citrix.repo b/mk/Citrix.repo index b55385d..a3414b8 100644 --- a/mk/Citrix.repo +++ b/mk/Citrix.repo @@ -1,7 +1,7 @@ [citrix] -name=@PRODUCT_BRAND@ @PRODUCT_VERSION@ updates for @DISTRO@ -mirrorlist=http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/@DISTRO@/mirrorlist -#baseurl=http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/@DISTRO@/ +name=@PRODUCT_BRAND@ @PRODUCT_VERSION@ updates for ^DISTRO^ +mirrorlist=http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/^DISTRO^/mirrorlist +#baseurl=http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/^DISTRO^/ gpgcheck=1 gpgkey=http://updates.vmd.citrix.com/@PRODUCT_BRAND@/RPM-GPG-KEY-@PRODUCT_VERSION@ enabled=1 diff --git a/mk/citrix.list b/mk/citrix.list index 3dbc4f5..4bf18c5 100644 --- a/mk/citrix.list +++ b/mk/citrix.list @@ -1,2 +1,2 @@ -deb http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/debian/ @DISTRO@ main -deb-src http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/debian/ @DISTRO@ main +deb http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/debian/ ^DISTRO^ main +deb-src http://updates.vmd.citrix.com/@PRODUCT_BRAND@/@PRODUCT_VERSION@/debian/ ^DISTRO^ main diff --git a/mk/debian/xe-guest-utilities.postinst b/mk/debian/xe-guest-utilities.postinst index 208aaa0..8b19a52 100755 --- a/mk/debian/xe-guest-utilities.postinst +++ b/mk/debian/xe-guest-utilities.postinst @@ -12,7 +12,7 @@ if [ X"$1" = X"configure" ] ; then esac if [ -n "${distro}" ] ; then rm -f /etc/apt/sources.list.d/xensource.list # contains deprecated urls - sed -e "s/@DISTRO@/${distro}/g" \ + sed -e "s/\^DISTRO\^/${distro}/g" \ < /usr/share/xe-guest-utilities/citrix.list \ > /etc/apt/sources.list.d/citrix.list fi diff --git a/mk/xe-guest-utilities.spec.in b/mk/xe-guest-utilities.spec.in index 512a47c..33392bc 100644 --- a/mk/xe-guest-utilities.spec.in +++ b/mk/xe-guest-utilities.spec.in @@ -84,7 +84,7 @@ if [ -d /etc/yum.repos.d ] && [ -n "${os_distro}" ] && [ -n "${os_majorver}" ] ; if [ -f /etc/yum.repos.d/XenSource.repo ] ; then rm -f /etc/yum.repos.d/XenSource.repo # contains deprecated urls fi - sed -e "s/@DISTRO@/${distro}/g" \ + sed -e "s/\^DISTRO\^/${distro}/g" \ < /usr/share/doc/%{name}-%{version}/examples/Citrix.repo \ > /etc/yum.repos.d/Citrix.repo ;; |