Bläddra i källkod

Switch to MB so that RAM requirements can be more granular

Bob Mottram 8 år sedan
förälder
incheckning
c0f118250e
3 ändrade filer med 5 tillägg och 5 borttagningar
  1. 1
    1
      src/freedombone-app-etherpad
  2. 1
    1
      src/freedombone-app-matrix
  3. 3
    3
      src/freedombone-utils-setup

+ 1
- 1
src/freedombone-app-etherpad Visa fil

452
         exit 7359
452
         exit 7359
453
     fi
453
     fi
454
 
454
 
455
-    check_ram_availability 2
455
+    check_ram_availability 2000
456
 
456
 
457
     if [ -f $IMAGE_PASSWORD_FILE ]; then
457
     if [ -f $IMAGE_PASSWORD_FILE ]; then
458
         ETHERPAD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
458
         ETHERPAD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"

+ 1
- 1
src/freedombone-app-matrix Visa fil

626
 }
626
 }
627
 
627
 
628
 function install_matrix {
628
 function install_matrix {
629
-    check_ram_availability 2
629
+    check_ram_availability 1500
630
 
630
 
631
     if [ ! -d $INSTALL_DIR ]; then
631
     if [ ! -d $INSTALL_DIR ]; then
632
         mkdir -p $INSTALL_DIR
632
         mkdir -p $INSTALL_DIR

+ 3
- 3
src/freedombone-utils-setup Visa fil

1029
 }
1029
 }
1030
 
1030
 
1031
 function check_ram_availability {
1031
 function check_ram_availability {
1032
-    minimum_ram_gb="$1"
1033
-    minimum_ram_bytes=$((minimum_ram_gb * 1024 * 1024))
1032
+    minimum_ram_MB="$1"
1033
+    minimum_ram_bytes=$((minimum_ram_gb * 1024))
1034
 
1034
 
1035
     ram_available=$(grep MemTotal /proc/meminfo | awk '{print $2}')
1035
     ram_available=$(grep MemTotal /proc/meminfo | awk '{print $2}')
1036
     if [ $ram_available -lt $minimum_ram_bytes ]; then
1036
     if [ $ram_available -lt $minimum_ram_bytes ]; then
1037
-        echo $"Need at least ${minimum_ram_gb}GB RAM to install this app"
1037
+        echo $"Need at least ${minimum_ram_gb}MB RAM to install this app"
1038
         exit 783524
1038
         exit 783524
1039
     fi
1039
     fi
1040
 }
1040
 }