Fix error: no integer expression expected in AMI creation
The script imports the /etc/sysconfig/scylla-server for configuration settings (NR_PAGES). The /etc/sysconfig/scylla-server iincludes an AMI param which is of string value and called as a last step in scylla_install (after scylla_bootparam_setup has been initated). The AMI variable is setup in scylla_install and is used in multiple scripts. To resolve the conflict moving the import of /etc/sysconfig/scylla-server after the AMI variable has been compared. Fixes: #744 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>
This commit is contained in:
4
dist/common/scripts/scylla_bootparam_setup
vendored
4
dist/common/scripts/scylla_bootparam_setup
vendored
@@ -20,14 +20,14 @@ while getopts a OPT; do
|
||||
esac
|
||||
done
|
||||
|
||||
|
||||
. /etc/os-release
|
||||
. /etc/sysconfig/scylla-server
|
||||
|
||||
if [ $AMI -eq 1 ]; then
|
||||
. /etc/sysconfig/scylla-server
|
||||
sed -e "s#append #append clocksource=tsc tsc=reliable hugepagesz=2M hugepages=$NR_HUGEPAGES #" /boot/extlinux/extlinux.conf > /tmp/extlinux.conf
|
||||
mv /tmp/extlinux.conf /boot/extlinux/extlinux.conf
|
||||
else
|
||||
. /etc/sysconfig/scylla-server
|
||||
if [ ! -f /etc/default/grub ]; then
|
||||
echo "Unsupported bootloader"
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user