From 1a839f47d804fda637b0eac5ca74c77c8c257ef3 Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Thu, 6 Sep 2012 22:13:17 +0000
Subject: [PATCH] pentoo: fix flushchanges thanks to Wuodan

---
 pentoo/pentoo/Manifest                     |  3 +-
 pentoo/pentoo/files/flushchanges-2012.1-r2 | 74 ++++++++++++++++++++++
 pentoo/pentoo/pentoo-2012.1.ebuild         |  2 +-
 3 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100755 pentoo/pentoo/files/flushchanges-2012.1-r2

diff --git a/pentoo/pentoo/Manifest b/pentoo/pentoo/Manifest
index 725469641..0a736b1bd 100644
--- a/pentoo/pentoo/Manifest
+++ b/pentoo/pentoo/Manifest
@@ -11,6 +11,7 @@ AUX domo-roolz.jpg 133404 SHA256 f9b2b8b9ced7562e3665cae0b7caaa891befdaf0a1dedb3
 AUX flushchanges-2012.0 1424 SHA256 7bec75c6e79f752720d64903fb56983e60b6f47ba518f283e1b0529f4ba08e05 SHA512 9899aef5d837b2c690095a04e0c32b84085dff0f007ae733b3b9c810ace0d7239a0f769ab34ac18ec34b3d78a1ceab2a530f61edf5374aeb088c0d592268a5ba WHIRLPOOL 4cbe007f17940b27eb2c43c9c121960fc8f3f4fc7043414ca7b2f268b1901ec9b56852a78d7c8739a99298776476f8f9e403752a0f6532313457e3c2524bf251
 AUX flushchanges-2012.1 1433 SHA256 399ed54ac270122befc234cb6338ecf2aacd34e9344f4fba9eef1f7eef1dcbc7 SHA512 bd901e6083f56051d9d04c412eb21d417c18159a727c81e52e3f7738cc20e90be71d92cf903851f7b90b53240146da2bd9c1422810ebccceca044cc49c22a2bc WHIRLPOOL 7c6081ecc1cf96d56ef0012417dc67b7ef617ea30725bd940711d8c2780b0e74a58b82bc30884801dd2f6c9083449db195334238529bc584f0665be441c4c731
 AUX flushchanges-2012.1-r1 1457 SHA256 791f8c44b682a4bbc877011a137e9bcaa0306a14cca4dd60a7dbf7a8e42fd51c SHA512 72fb4bf5071ac5cbaf499dbbaea9e9f70b6352b2d12052ef29a31a3a216da46594398cb60b0ad2ccf2ca9d79aef078a819d150a2970e5c586d6ae68be54e055a WHIRLPOOL 1795d8ba48e8ff60a40f5f4b89067ac8b2907131480925e2a0c22940d52815a1320305f24e80b2d2a7a0857ac3db8732c2f841293b64f61cee43fcef052e25f6
+AUX flushchanges-2012.1-r2 1461 SHA256 05faceff5b27b0e35d006c929f4ce1c09ba516ac02d180cd022ba8c588b18070 SHA512 c407d0b1fc90826e55c1c84f74fce49b34c8b821625572b52570088412303052bcd2f1b6c381d31d82f29db5dda34a9a8b20487edd2fd9b5d1491d433dc05e92 WHIRLPOOL 49df5a0eecfe508d31c24f2270458ea35cf8a723d5fb954d93e834226ec50beac7964525f53f87c16f5e9fe1a74b7087413550115ec8d430db3f3d8824774a0e
 AUX layman-sync 56 SHA256 3d8376566a509d4cfdcee8df55bdaf48fcdaf62c4dd46649c8bf3341b1c522aa SHA512 c7a49c4e0025958800a05d8c06ce1a01621d30358bdce829ea1187bde0d8a41c6d44c284037ee3c5bcc1bca3b319cd28b2350005eb1a2bbcfa0a1534eaaceb84 WHIRLPOOL 819df69d22ff0c82924b1d765ca4b3bf6a70be3243d5a4deea45b0d069e6abddd514cdca35ba91f3de54e15b16afb3a267153c6908b714ce281e781db1790379
 AUX makemo-2012.0 1117 SHA256 aa05be5c1d624a04d2608cffbf494d6c0b85fb45df3ac9046e1b684543dddffd SHA512 049b82d526543447022a81bcae2d99438e9894120e84b63e4f5543360bb68a2a5961ac08c8523201e7911c620e4e839191ac884d9444867356496bf4236f6b1f WHIRLPOOL be01db096d17c46dbc451eb5e635b083a64ab383f87a62dbddbd4b8c4ff0dd8530241a4f87ee67b12e579e86e5b334f82b1978abb8e918d47dfd0c4453d014ca
 AUX makemo-2012.1 1129 SHA256 66627b86025b97d1b534deb8b51510492f1ce064c8af984d3dc2001d3eb36581 SHA512 09e137301e78f74601ce99daee7d20150abd3330ca061b7173b61e3bc9f7fecb89f6b9742e0c86b0f7d3de789f6026794770446790cfd3591aa19df5df53645e WHIRLPOOL 2adb9c85f86990b9deaf9b7b7b5944b82fca747ca2847dfb23d589496d2311b138e2cd97cf86e05fd8941259eb62647c2a579f91b5bbf5e8bfab4b9f57124097
@@ -21,4 +22,4 @@ AUX pentoo-release-2012.1-rc2 34 SHA256 31e6bd2df90dca4c5483de8ce197bbf39a658179
 AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 SHA512 a6a2f152861e63c33afdda9997b9be25bd735f0624c946d61d0088210264743f842f103026eeb7cf63ef94b873131b072b61c55fba1922e9830318bcacd7a074 WHIRLPOOL a3b937b810f02f1fa6ebcdc58cada7a71e778f370b3355a08670a7f524d8e370ba29bdaf408d0bdd14753a129734d80a952937f3e009a69e87bed90995a2aaaf
 AUX tux-winfly-killah.1600x1200.jpg 360183 SHA256 af7c84386a634e573fbd65884c49c716a4f92369b2f228c68672acc96f4a9879 SHA512 ed81ce83997a7ccc4eeb0fc08d09b98bedd6de8f27b9cfce2cb734ca4f4283c3e44154d7cfa73f94742c627ed67fb3ad520019ad8cbd9286cd8e2ceffc8677e7 WHIRLPOOL a8b2d4b51dc261362c4d9fca225ac9c02defc3903b6e9ecc8a7401a2155135efc2c7d62afba8727de37126ec425936ab08727455a68fd922192ec46a428ebd17
 AUX xfce4-desktop.xml 378 SHA256 97b1cb040f9819c0fe904537adf0e51fa3dbb35b8a34050d674a08dfb69c11d0 SHA512 ae84b11c4a5e833ff0b6e36e0619c5dab0e3dcab0e859fdc59dcbfed91e140d165677e2293b0c83bbf8ccaa3fcc5b5262888942a598b3e3de666b0dcdd7b2bc9 WHIRLPOOL b1bf73e6b0e577e411c0043603930fe920bd01326d4f3994661141e77c23983e61084d458ba0dd972330b13c2e0c2cd77ece37c6a3295a732879f0ae88df638b
-EBUILD pentoo-2012.1.ebuild 7481 SHA256 99a895d3d36de7505f5e2533a4c273b1ad235097745d9fb8bcbf26966e997ef3 SHA512 b8da01bf34718f8c2ab4e017fa155474733b0428e04d112f481227d28af399a9a4e078f9833edc310fada723246c0737d37059d23c9cc966cbdcebb7ac1f5201 WHIRLPOOL 42db2e11ae8411cdde529006d89088d41070723d5525070a9d6caee3cfbe8adc7fdcd5786212a9340710f5a30c2cc60330a939e8f296846e6ea9b6d270626941
+EBUILD pentoo-2012.1.ebuild 7481 SHA256 2ffee8e913871be3ce1c7eb4b3710de51181ed7b4eafc4c999e8c261f78a5e0a SHA512 60b310c06bf2341c21e813e04262b1938faae6a65fc944e5b005f5741b1c30048d6465c57f640a75d76338690939e19e40a820aef47ed462127211ba2bc3a705 WHIRLPOOL 0899c166b853a08fa2016763a16b54e992e0e35dfd0a96cc402e38fadee22028d37577acffa512787263e81c994011ebf7e7d9c22b4b6490caa62a1de6d0688e
diff --git a/pentoo/pentoo/files/flushchanges-2012.1-r2 b/pentoo/pentoo/files/flushchanges-2012.1-r2
new file mode 100755
index 000000000..6fd80b98a
--- /dev/null
+++ b/pentoo/pentoo/files/flushchanges-2012.1-r2
@@ -0,0 +1,74 @@
+#!/bin/sh
+# This script allows flushing of the permanent storage to a .lzm file,
+# allowing for some more space
+
+DST="/mnt/cdrom/modules"
+CHANGESDIR="/.unions/memory/aufs_changes/default/"
+
+[ -e /lib/rc/sh/functions.sh ] && . /lib/rc/sh/functions.sh
+
+usage ()
+{
+	echo
+	echo "   Usage : flushchanges [dest]"
+	echo "   Where [dest] is the modules storage directory"
+	echo "   defaulting to /mnt/cdrom/modules"
+	echo
+}
+
+squash ()
+{
+	if [ ! -e $CHANGESDIR ]
+	then
+		eerror "It appears that you're not using unionfs"
+		return $?
+	else
+		mksquashfs $CHANGESDIR $1 -b 1048576 -comp xz
+		return $?
+	fi
+}
+
+if [ ! -z $1 ]
+then
+	DST=$1
+fi
+
+echo "Using $DST for module storage"
+
+if [ ! -e /mnt/cdrom/modules ]
+then
+	ewarn "Unable to find module dir in /mnt/cdrom/"
+	usage
+	exit 1
+else
+	index=0
+	while [ 1 ]
+	do
+		index=$(($index + 1))
+		# echo $index
+		if [ ! -f "${DST}/z_changes-${index}.lzm" ]
+		then
+			squash ${DST}/z_changes-${index}.lzm
+			if [ $? -eq 0 ]
+			then
+				einfo "$DST/z_changes-$index.lzm created successfully"
+				break
+			else
+				eerror "Unable to create $DST/z_changes-$index.lzm"
+				exit $?
+			fi
+		fi
+	done
+	if [ -f "${DST}/z_changes-${index}.lzm" ]
+	then
+		ewarn "The changesfile will be cleared a next reboot"
+		if [ -e /usr/sbin/doclean.sh ]
+		then
+			cp -a /usr/sbin/doclean.sh /.unions/memory/.doclean.sh
+		else
+			eerror "Unable to find /usr/sbin/doclean.sh"
+			eerror "Your changesfile will not be cleared at reboot"
+			exit $?
+		fi
+	fi
+fi
diff --git a/pentoo/pentoo/pentoo-2012.1.ebuild b/pentoo/pentoo/pentoo-2012.1.ebuild
index 6094ee2a2..5cdaf668f 100644
--- a/pentoo/pentoo/pentoo-2012.1.ebuild
+++ b/pentoo/pentoo/pentoo-2012.1.ebuild
@@ -240,7 +240,7 @@ src_install() {
 	use enlightenment && newbin "${FILESDIR}"/dokeybindings-${PV} dokeybindings
 
 	#/usr/sbin
-	newsbin "${FILESDIR}"/flushchanges-${PV}-r1 flushchanges
+	newsbin "${FILESDIR}"/flushchanges-${PV}-r2 flushchanges
 	newsbin "${FILESDIR}"/makemo-${PV} makemo
 
 	#/etc