Skip to content
This repository has been archived by the owner on Mar 23, 2021. It is now read-only.

Commit

Permalink
Bug fox for opens-server installation on RHEL
Browse files Browse the repository at this point in the history
  • Loading branch information
Duncan McCracken committed Jun 15, 2017
1 parent 6055023 commit 054bd34
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions webadmin/var/www/webadmin/scripts/adminHelper.sh
Expand Up @@ -248,6 +248,7 @@ fi
#Needs updating if we do multiple NetBoot images
setnbimages)
nbi=$2
nbiname=$3
dmgfile=$(ls "/srv/NetBoot/NetBootSP0/${nbi}/"*.dmg 2>/dev/null)
if [ -n "${dmgfile}" ]; then
finaldmg=$(echo ${dmgfile} | sed "s:/srv/NetBoot/NetBootSP0/${nbi}/::g")
Expand All @@ -265,8 +266,8 @@ if python -c "import plistlib; print plistlib.readPlist('/srv/NetBoot/NetBootSP0
isinstall=0
fi
chmod +w "/srv/NetBoot/NetBootSP0/${nbi}/${finalplist}"
if [ "$3" != "" ]; then
python /var/www/html/webadmin/scripts/netbootname.py "$3" "/srv/NetBoot/NetBootSP0/${nbi}/${finalplist}"
if [ "$nbiname" != "" ]; then
python /var/www/html/webadmin/scripts/netbootname.py "$nbiname" "/srv/NetBoot/NetBootSP0/${nbi}/${finalplist}"
else
defaultname=$(basename "${nbi}" .nbi)
python /var/www/html/webadmin/scripts/netbootname.py "$defaultname" "/srv/NetBoot/NetBootSP0/${nbi}/${finalplist}"
Expand Down Expand Up @@ -727,7 +728,7 @@ if [ "$(which apt-get 2>&-)" != '' ]; then
fi
if [ "$(which yum 2>&-)" != '' ]]; then
SERVICE=sshd
if [ "$(rpm -qa openssh-server)" == '' ]; then
if [ "$(rpm -qa openssh-server)" = '' ]; then
yum install openssh-server -y -q
fi
chkconfig $SERVICE on > /dev/null 2>&1
Expand Down

0 comments on commit 054bd34

Please sign in to comment.