From dd9352778814da71d4f106882c1c6a14427808d6 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 7 Jun 2018 22:14:54 -0400 Subject: [PATCH] pentoo-system: update pentoo-zram to show which step is being slow --- .../{pentoo-zram.initd => pentoo-zram.initd-r1} | 15 +++++++++++++-- ...1-r7.ebuild => pentoo-system-2018.1-r8.ebuild} | 0 2 files changed, 13 insertions(+), 2 deletions(-) rename pentoo/pentoo-system/files/{pentoo-zram.initd => pentoo-zram.initd-r1} (71%) rename pentoo/pentoo-system/{pentoo-system-2018.1-r7.ebuild => pentoo-system-2018.1-r8.ebuild} (100%) diff --git a/pentoo/pentoo-system/files/pentoo-zram.initd b/pentoo/pentoo-system/files/pentoo-zram.initd-r1 similarity index 71% rename from pentoo/pentoo-system/files/pentoo-zram.initd rename to pentoo/pentoo-system/files/pentoo-zram.initd-r1 index d7a864a9d..feb0402de 100644 --- a/pentoo/pentoo-system/files/pentoo-zram.initd +++ b/pentoo/pentoo-system/files/pentoo-zram.initd-r1 @@ -14,9 +14,20 @@ start() { echo $(nproc) >/sys/devices/virtual/block/zram0/max_comp_streams || REVAL=$? echo lz4 >/sys/devices/virtual/block/zram0/comp_algorithm || RETVAL=$? echo "${ZRAM_ABSOLUTE/\.??/}" > /sys/devices/virtual/block/zram0/disksize || RETVAL=$? + eindent + if [ -d /sys/firmware/efi ]; then + ebegin "Formatting swap" + else + ebegin "Formatting swap (this is much faster if you boot uefi)" + fi mkswap /dev/zram0 > /dev/null || RETVAL=$? - swapon /dev/zram0 -p 10 > /dev/null || RETVAL=$? - eend ${RETVAL} + eend ${RETVAL} + eoutdent + if [ "${RETVAL}" = "0" ]; then + ebegin "Activating ZRAM swap device" + swapon /dev/zram0 -p 10 > /dev/null || RETVAL=$? + eend ${RETVAL} + fi } # Swap gets torn down without help from this init script diff --git a/pentoo/pentoo-system/pentoo-system-2018.1-r7.ebuild b/pentoo/pentoo-system/pentoo-system-2018.1-r8.ebuild similarity index 100% rename from pentoo/pentoo-system/pentoo-system-2018.1-r7.ebuild rename to pentoo/pentoo-system/pentoo-system-2018.1-r8.ebuild