From 9299e7f5d2611b055d88b13e21872e0b6be0afd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?= Date: Sat, 29 Jan 2022 00:26:33 -0300 Subject: [PATCH] Fix typos on help output for genimage and OpenStack There's a typo on genimage thats easy to fix, also the explanation for Fedora is extremely outdated, on modern Fedora releases statelite is generated automatically: [root@headnode ~]# lsdef -t osimage fedora35-x86_64-install-compute (osimage) fedora35-x86_64-install-service (osimage) fedora35-x86_64-netboot-compute (osimage) fedora35-x86_64-statelite-compute (osimage) Also theres a typo on OpenStack setup that grep caught, so we added it too the commit, for cosmetic reasons. --- xCAT-OpenStack/postscripts/setup_openstack_repo | 4 ++-- xCAT-client/bin/genimage | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-OpenStack/postscripts/setup_openstack_repo b/xCAT-OpenStack/postscripts/setup_openstack_repo index 5468df008..bb506ca58 100755 --- a/xCAT-OpenStack/postscripts/setup_openstack_repo +++ b/xCAT-OpenStack/postscripts/setup_openstack_repo @@ -61,11 +61,11 @@ if [ "$(uname -s)" = "Linux" ]; then apt-get install ubuntu-cloud-keyring -y apt-get update - echo "Added the OpenStack ${opsrelease} version for Ubunto ${urelease} release to the repository, Please modify this script if you need a different version." + echo "Added the OpenStack ${opsrelease} version for Ubuntu ${urelease} release to the repository, Please modify this script if you need a different version." elif ( pmatch "$OSVER" "rh*" ) || [ -f /etc/redhat-release ]; then #use yum repository - echo "Redhat. Please refer to http://sourceforge.net/apps/mediawiki/xcat/index.php?title=Deploying_OpenStack for how to setup OpenStack repository for RedHat". + echo "Red Hat. Please refer to http://sourceforge.net/apps/mediawiki/xcat/index.php?title=Deploying_OpenStack for how to setup OpenStack repository for Red Hat". else echo "OpenStack deployment with xCAT is not supported on this platform yet.". fi diff --git a/xCAT-client/bin/genimage b/xCAT-client/bin/genimage index ec65eb7c9..a06499041 100755 --- a/xCAT-client/bin/genimage +++ b/xCAT-client/bin/genimage @@ -61,7 +61,7 @@ sub print_usage print ' genimage [-o ] [-a ] [-p ] [-i ] [-n ] [--onlyinitrd] [-r ] [-k ] [-g ] [-m statelite] [-l rootlimitsize] [-t tmplimitsize] [--permission ] [--interactive] [--dryrun] [--noupdate] ' . "\n\n"; print " --permission is used for statelite only\n"; print " -g is used for SLES only\n\n"; - print " -m is used for urbuntu, debian and fedora12 only\n\n"; + print " -m is used for Ubuntu, Debian and legacy Fedora versions only\n\n"; print "Examples:\n"; print " genimage\n"; print " genimage --interactive\n";