From 2e5815e7fe0bf8063549fc662ffae068b4cc5a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=E1=B4=8F=C9=B4=C9=A2=20Jie?= Date: Fri, 30 Mar 2018 16:03:10 +0800 Subject: [PATCH] Use lowercase file name xcat-core.repo instead of xCAT-core.repo (#5010) * Use lowercase file name xcat-core.repo instead of xCAT-core.repo * Rename xCAT-core.repo to xCAT-core.repo.nouse if it exists * Change xCAT-dep.repo mentioned in document to xcat-dep.repo --- buildcore.sh | 11 +++++++---- builddep.sh | 6 +++--- buildlocal.sh | 10 +++++----- .../guides/install-guides/yum/configure_xcat.rst | 4 ++-- .../guides/install-guides/zypper/configure_xcat.rst | 4 ++-- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/buildcore.sh b/buildcore.sh index 7ed9e277e..f1b7794d9 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -500,8 +500,8 @@ if [ "$OSNAME" != "AIX" ]; then # Always recreate it, in case the whole dir was copied from devel to 2.x if [ -n "$1" ]; then embed="$1/" else embed=""; fi - cat >xCAT-core.repo << EOF -[xcat-2-core] + cat >xcat-core.repo << EOF +[xcat-core] name=xCAT 2 Core packages baseurl=$YUMREPOURL/$REL$EMBEDDIR/$CORE enabled=1 @@ -514,8 +514,8 @@ EOF cat >mklocalrepo.sh << 'EOF2' #!/bin/sh cd `dirname $0` -REPOFILE=`basename xCAT-*.repo` -if [[ $REPOFILE == "xCAT-*.repo" ]]; then +REPOFILE=`basename xcat-*.repo` +if [[ $REPOFILE == "xcat-*.repo" ]]; then echo "ERROR: For xcat-dep, please execute $0 in the correct / subdirectory" exit 1 fi @@ -527,6 +527,9 @@ if [ ! -d "$DIRECTORY" ]; then DIRECTORY="/etc/zypp/repos.d" fi sed -e 's|baseurl=.*|baseurl=file://'"`pwd`"'|' $REPOFILE | sed -e 's|gpgkey=.*|gpgkey=file://'"`pwd`"'/repodata/repomd.xml.key|' > "$DIRECTORY/$REPOFILE" +if [ -f "$DIRECTORY/xCAT-core.repo" ]; then + mv "$DIRECTORY/xCAT-core.repo" "$DIRECTORY/xCAT-core.repo.nouse" +fi cd - EOF2 chmod 775 mklocalrepo.sh diff --git a/builddep.sh b/builddep.sh index 1413dcca2..7a4e4de8f 100755 --- a/builddep.sh +++ b/builddep.sh @@ -125,8 +125,8 @@ if [ "$OSNAME" != "AIX" ]; then fi done - # Modify xCAT-dep.repo files to point to the correct place - echo "===> Modifying the xCAT-dep.repo files to point to the correct location..." + # Modify xcat-dep.repo files to point to the correct place + echo "===> Modifying the xcat-dep.repo files to point to the correct location..." # 10/01/2015 - vkhu # The URLs have been updated in GSA, this section is not needed at the moment # @@ -138,7 +138,7 @@ if [ "$OSNAME" != "AIX" ]; then # oldurl="$YUMREPOURL2" #fi # - #sed -i -e "s|=$oldurl|=$newurl|g" `find . -name "xCAT-dep.repo" ` + #sed -i -e "s|=$oldurl|=$newurl|g" `find . -name "xcat-dep.repo" ` fi if [ "$OSNAME" == "AIX" ]; then diff --git a/buildlocal.sh b/buildlocal.sh index da6f64899..60da105aa 100755 --- a/buildlocal.sh +++ b/buildlocal.sh @@ -144,19 +144,19 @@ echo "This is an $OSNAME system" grep -i 'Red' /etc/*release*; if [ "$OSNAME" != "AIX" -a $? -eq 0 ]; then - cat >$CURDIR/build/xCAT-core.repo << EOF -[xcat-2-core] + cat >$CURDIR/build/xcat-core.repo << EOF +[xcat-core] name=xCAT 2 Core packages baseurl=file://$CURDIR/build enabled=1 gpgcheck=0 EOF - cp $CURDIR/build/xCAT-core.repo /etc/yum.repos.d/ + cp $CURDIR/build/xcat-core.repo /etc/yum.repos.d/ createrepo $CURDIR/build else - rm -f /etc/zypp/repos.d/xCAT-core.repo - zypper ar file://$CURDIR/build xCAT-core + rm -f /etc/zypp/repos.d/xcat-core.repo + zypper ar file://$CURDIR/build xcat-core fi fi diff --git a/docs/source/guides/install-guides/yum/configure_xcat.rst b/docs/source/guides/install-guides/yum/configure_xcat.rst index b57380ae2..c8106a163 100644 --- a/docs/source/guides/install-guides/yum/configure_xcat.rst +++ b/docs/source/guides/install-guides/yum/configure_xcat.rst @@ -8,11 +8,11 @@ Internet Repository **[xcat-core]** -For the xCAT build you want to install, download the ``xCAT-core.repo`` file and copy to ``/etc/yum.repos.d`` +For the xCAT build you want to install, download the ``xcat-core.repo`` file and copy to ``/etc/yum.repos.d`` **[xcat-dep]** -From the `xCAT-dep Online Repository `_, navigate to the correct subdirectory for the target machine and download the ``xCAT-dep.repo`` file and copy to ``/etc/yum.repos.d``. +From the `xCAT-dep Online Repository `_, navigate to the correct subdirectory for the target machine and download the ``xcat-dep.repo`` file and copy to ``/etc/yum.repos.d``. If using internet repositories, continue to the next step to install xCAT. diff --git a/docs/source/guides/install-guides/zypper/configure_xcat.rst b/docs/source/guides/install-guides/zypper/configure_xcat.rst index 7728ef7ff..fb0dc015c 100644 --- a/docs/source/guides/install-guides/zypper/configure_xcat.rst +++ b/docs/source/guides/install-guides/zypper/configure_xcat.rst @@ -8,11 +8,11 @@ Internet Repository **[xcat-core]** -For the xCAT build you want to install, download the ``xCAT-core.repo`` file and copy to ``/etc/zypp/repos.d`` +For the xCAT build you want to install, download the ``xcat-core.repo`` file and copy to ``/etc/zypp/repos.d`` **[xcat-dep]** -From the `xCAT-dep Online Repository `_, navigate to the correct subdirectory for the target machine and download the ``xCAT-dep.repo`` file and copy to ``/etc/zypp/repos.d``. +From the `xCAT-dep Online Repository `_, navigate to the correct subdirectory for the target machine and download the ``xcat-dep.repo`` file and copy to ``/etc/zypp/repos.d``. If using internet repositories, continue to the next step to install xCAT.