[lxc-devel] [lxc/master] Fix spelling of CentOS in the templates
roman-mueller on Github
lxc-bot at linuxcontainers.org
Wed Sep 28 08:10:49 UTC 2016
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 398 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160928/b8154855/attachment.bin>
-------------- next part --------------
From 491a01cf7b11b059130771a4964128745473d039 Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller at gmail.com>
Date: Wed, 28 Sep 2016 10:03:39 +0200
Subject: [PATCH] Fix spelling of CentOS in the templates
Signed-off-by: Roman Mueller <roman.mueller at gmail.com>
---
templates/lxc-centos.in | 26 +++++++++++++-------------
templates/lxc-download.in | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
index 051faef..2c444e4 100644
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -1,7 +1,7 @@
#!/bin/bash
#
-# template script for generating centos container for LXC
+# template script for generating CentOS container for LXC
#
# lxc: linux Container library
@@ -71,7 +71,7 @@ default_path=@LXCPATH@
lxc_network_type=veth
lxc_network_link=lxcbr0
-# is this centos?
+# is this CentOS?
# Alow for weird remixes like the Raspberry Pi
#
# Use the Mitre standard CPE identifier for the release ID if possible...
@@ -161,7 +161,7 @@ force_mknod()
configure_centos()
{
- # disable selinux in centos
+ # disable selinux in CentOS
mkdir -p $rootfs_path/selinux
echo 0 > $rootfs_path/selinux/enforce
@@ -404,7 +404,7 @@ EOF
download_centos()
{
- # check the mini centos was not already downloaded
+ # check the mini CentOS was not already downloaded
INSTALL_ROOT=$cache/partial
mkdir -p $INSTALL_ROOT
if [ $? -ne 0 ]; then
@@ -412,8 +412,8 @@ download_centos()
return 1
fi
- # download a mini centos into a cache
- echo "Downloading centos minimal ..."
+ # download a mini CentOS into a cache
+ echo "Downloading CentOS minimal ..."
YUM0="yum --installroot $INSTALL_ROOT -y --nogpgcheck"
if yum -h | grep -q 'releasever=RELEASEVER'; then
@@ -508,7 +508,7 @@ EOF
copy_centos()
{
- # make a local copy of the mini centos
+ # make a local copy of the mini CentOS
echo -n "Copying rootfs to $rootfs_path ..."
#cp -a $cache/rootfs-$arch $rootfs_path || return 1
# i prefer rsync (no reason really)
@@ -542,14 +542,14 @@ install_centos()
if [ ! -e "$cache/rootfs" ]; then
download_centos
if [ $? -ne 0 ]; then
- echo "Failed to download 'centos base'"
+ echo "Failed to download 'CentOS base'"
return 1
fi
else
echo "Cache found. Updating..."
update_centos
if [ $? -ne 0 ]; then
- echo "Failed to update 'centos base', continuing with last known good cache"
+ echo "Failed to update 'CentOS base', continuing with last known good cache"
else
echo "Update finished"
fi
@@ -663,7 +663,7 @@ clean()
exit 1
fi
- echo -n "Purging the download cache for centos-$release..."
+ echo -n "Purging the download cache for CentOS-$release..."
rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
exit 0
@@ -682,7 +682,7 @@ Mandatory args:
Optional args:
-p,--path path to where the container rootfs will be created, defaults to /var/lib/lxc/name.
-c,--clean clean the cache
- -R,--release Centos release for the new container. if the host is Centos, then it will defaultto the host's release.
+ -R,--release CentOS release for the new container. If the host is CentOS, then it will default to the host's release.
--fqdn fully qualified domain name (FQDN) for DNS and system naming
--repo repository to use (url)
-a,--arch Define what arch the container will be [i686,x86_64]
@@ -870,13 +870,13 @@ fi
install_centos
if [ $? -ne 0 ]; then
- echo "failed to install centos"
+ echo "failed to install CentOS"
exit 1
fi
configure_centos
if [ $? -ne 0 ]; then
- echo "failed to configure centos for a container"
+ echo "failed to configure CentOS for a container"
exit 1
fi
diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index 4a67a7c..e0ffdb2 100644
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -577,7 +577,7 @@ for file in $TEMPLATE_FILES; do
sed -i "s#LXC_HOOK_DIR#$LXC_HOOK_DIR#g" $file
done
-# prevent mingetty from calling vhangup(2) since it fails with userns on Centos / Oracle
+# prevent mingetty from calling vhangup(2) since it fails with userns on CentOS / Oracle
if [ -f ${LXC_ROOTFS}/etc/init/tty.conf ]; then
sed -i 's|mingetty|mingetty --nohangup|' ${LXC_ROOTFS}/etc/init/tty.conf
fi
More information about the lxc-devel
mailing list