From 647d7d2b23048e786814eba4152bff3b5a7378d2 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Mon, 29 Sep 2014 15:31:50 +0530 Subject: [PATCH] Improved Swap creation --- src/lib/ee_lib_create_swap.sh | 12 ++++++------ src/lib/ee_lib_ram.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/ee_lib_create_swap.sh b/src/lib/ee_lib_create_swap.sh index c18ca87b..3fde4dc8 100644 --- a/src/lib/ee_lib_create_swap.sh +++ b/src/lib/ee_lib_create_swap.sh @@ -7,22 +7,22 @@ function ee_lib_create_swap() # Use dd command to create SWAP # Swap Parameters: - # Location: /swapfile + # Location: /ee-swapfile # Block Size: 1024 ee_lib_echo "Adding 1GB swapfile, please wait..." - dd if=/dev/zero of=/swapfile bs=1024 count=1024k &>> $EE_COMMAND_LOG \ - || ee_lib_error "Unable to generate /swapfile, exit status = " $? + dd if=/dev/zero of=/ee-swapfile bs=1024 count=1024k &>> $EE_COMMAND_LOG \ + || ee_lib_error "Unable to generate /ee-swapfile, exit status = " $? # Create it as a Swap - mkswap /swapfile &>> $EE_COMMAND_LOG \ + mkswap /ee-swapfile &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to create swapfile, exit status = " $? # On the Swap - swapon /swapfile &>> $EE_COMMAND_LOG \ + swapon /ee-swapfile &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to on Swap, exit status = " $? # Add entry into /etc/fstab - echo "/swapfile none swap sw 0 0" >> /etc/fstab \ + echo "/ee-swapfile none swap sw 0 0" >> /etc/fstab \ || ee_lib_error "Unable to add entry into /etc/fstab, exit status = " $? fi fi diff --git a/src/lib/ee_lib_ram.sh b/src/lib/ee_lib_ram.sh index cc9c9120..b96d9bef 100644 --- a/src/lib/ee_lib_ram.sh +++ b/src/lib/ee_lib_ram.sh @@ -4,7 +4,7 @@ function ee_lib_ram() { # Detect RAM and SWAP of System readonly EE_TOTAL_RAM=$(free -m | grep -i Mem | awk '{ print $2 }') - readonly EE_TOTAL_SWAP=$(free -m | grep -i Swap | awk '{ print $2 }') + readonly EE_TOTAL_SWAP=$(free -m --si | grep -i Swap | awk '{ print $2 }') # RAM < 512MB if [ $EE_TOTAL_RAM -le 512 ]; then