Use zram module hot add support instead of modprobe

nefelim4ag · May 11, 2016 · 2f143ee · 2f143ee
1 parent 005ea9d
commit 2f143ee
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/90-systemd-swap.conf b/90-systemd-swap.conf
diff --git a/README.md b/README.md
@@ -4,7 +4,6 @@ It is configurable in /etc/systemd-swap.conf.
 Source:
 ```
 /etc/systemd-swap.conf
-/usr/lib/modprobe.d/90-systemd-swap.conf
 /usr/lib/systemd/system/systemd-swap.service
 /usr/lib/systemd/scripts/systemd-swap.sh
 ```
@@ -17,7 +16,3 @@ Using:
 Note:
 =======
 Dependence: util-linux >= 2.26
-
-In package install /usr/lib/modprobe.d/90-systemd-swap.conf - this file create zram devices, 32 - this is maximum for this module.
-
-You can use empty devices. 32 - because zram can't create new devices if others already in using, like loop module.
diff --git a/install.sh b/install.sh
@@ -28,4 +28,3 @@ fi
 $SUDO cp -v   ./systemd-swap.sh       /usr/lib/systemd/scripts/systemd-swap.sh
 $SUDO ln -svf  /etc/systemd-swap.conf /etc/systemd/swap.conf
 $SUDO cp -v   ./systemd-swap.service  /usr/lib/systemd/system/systemd-swap.service
-$SUDO cp -v   ./90-systemd-swap.conf  /etc/modprobe.d/90-systemd-swap.conf
diff --git a/systemd-swap.sh b/systemd-swap.sh
@@ -20,22 +20,32 @@ manage_zram(){
   case $1 in
       start)
           [ -z ${zram[size]} ] && return 0
-          # if module not loaded create many zram devices for users needs
-          [ -f /dev/zram0 ] || modprobe zram num_devices=32
           zram[alg]=${zram[alg]:-lzo}
           zram[streams]=${zram[streams]:-${sys[cpu_count]}}
           zram[force]=${zram[force]:-true}
           # Wrapper, for handling zram initialization problems
           while :; do
+              [ -d /sys/module/zram ] || modprobe zram
               # zramctl is a external program -> return name of first free device
-              if zram[dev]=$(zramctl -f -a ${zram[alg]} -t ${zram[streams]} -s ${zram[size]}); then
+              OUTPUT="$(zramctl -f -a ${zram[alg]} -t ${zram[streams]} -s ${zram[size]} 2>&1 || :)"
+              if echo $OUTPUT | grep -q "/dev/zram"; then
+                  zram[dev]="$OUTPUT"
                   break
               else
-                  # if force option disabled, just break loop
-                  if ! ${zram[force]}; then
+                  if echo $OUTPUT | grep -q "zramctl: no free zram device found"; then
+                      WARN "zramctl can't find free device"
+                      INFO "Use workaround hook for hot add"
+                      if [ -f /sys/class/zram-control/hot_add ]; then
+                          NEW_ZRAM=$(cat /sys/class/zram-control/hot_add)
+                          INFO "Success: new device /dev/zram$NEW_ZRAM"
+                      else
+                          ERRO "This kernel not support hot add zram device, please use 4.2< kernels"
+                      fi
+                  elif ! ${zram[force]}; then
                       break
+                  else
+                      sleep 1
                   fi
-                  sleep 1
               fi
           done
           mkswap ${zram[dev]}