proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 11:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1013 from hartnellfoster/bugfix_20160509

Browse Source 
Added OR statement for cases of ID = rhel in RHEL 7+
This commit is contained in:
Christian Brauner 2016-05-09 13:51:20 +02:00
commit fc5bc4a6b4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/lxc-centos.in
View File

@ -137,8 +137,9 @@ if [ "${CPE_NAME}" != "" -a "${ID}" = "centos" -a "${VERSION_ID}" != "" ]
then then
centos_host_ver=${VERSION_ID} centos_host_ver=${VERSION_ID}
is_centos=true is_centos=true
elif [ "${CPE_NAME}" != "" -a "${ID}" = "redhat" -a "${VERSION_ID}" != "" ] elif [ "${CPE_NAME}" != "" -a "${ID}" = "redhat" -o "${ID}" = "rhel" -a "${VERSION_ID}" != "" ]
then then
# RHEL 7+ /etc/os-release ID = 'rhel', which doesn't enter this elif without the added OR statement
redhat_host_ver=${VERSION_ID} redhat_host_ver=${VERSION_ID}
is_redhat=true is_redhat=true
elif [ -e /etc/centos-release ] elif [ -e /etc/centos-release ]
@ -394,7 +395,7 @@ configure_centos_init()
# power-status-changed - shutdown on SIGPWR # power-status-changed - shutdown on SIGPWR
# #
start on power-status-changed start on power-status-changed
exec /sbin/shutdown -h now "SIGPWR received" exec /sbin/shutdown -h now "SIGPWR received"
EOF EOF
fi fi