--- /usr/bin/refractasnapshot-original	2024-03-02 12:37:19.027945614 +0100
+++ /usr/bin/refractasnapshot	2024-03-02 13:44:19.447975320 +0100
@@ -330,57 +330,6 @@
 }

-handle_cpio_extraction () {
-	#
-	# Handle newer kernels, whose initrd might have the "actual"
-	# filesystem concatenated. If so, temporarily save the original
-	# initrd filename and work with the "real" filesystem image.
-	#
-	mkdir -p /tmp/cpio_extracted
-	pushd /tmp/cpio_extracted
-
-	local size=$(du -sb $initrd_image | cut -f 1)
-	local cpio_extracted_size=$(cpio -iF $initrd_image 2>&1 | cut -d ' ' -f 1)
-
-	if [[ $cpio_extracted_size < $size ]]; then
-		dd if=$initrd_image of=main_filesystem skip=$cpio_extracted_size
-		cpio_initrd_image=$initrd_image
-		initrd_image="$(pwd)/main_filesystem"
-	fi
-
-	set_initrd_compression_type
-
-	popd
-}
-
-
-cleanup_cpio_extraction () {
-	#
-	# Create the final CPIO archive, whose structure should match that
-	# of the original initrd image. Remove old files/variables.
-	#
-	pushd /tmp/cpio_extracted
-
-	rm main_filesystem || ( \
-		echo "Error while removing extracted filesystem."
-		echo "Try `rm /etc/cpio_extracted/main_filesystem` manually."
-		exit 1
-	)
-	find . | cpio --create --format='newc' > rebuilt_cpio
-	cat ${work_dir}/iso/live/${initrd_image##*/} >> rebuilt_cpio
-
-	rm ${work_dir}/iso/live/${initrd_image##*/}
-	initrd_image=$cpio_initrd_image
-	unset cpio_initrd_image
-
-	mv rebuilt_cpio ${work_dir}/iso/live/${initrd_image##*/}
-
-	popd
-	if [ -d "/tmp/cpio_extracted" ]; then
-		rm -rf /tmp/cpio_extracted
-	fi
-}
-

 extract_initrd () {

@@ -389,26 +338,13 @@

 	set_initrd_compression_type

-	if [ "$initrd_compression" == "cpio archive" ]; then
-		echo "cpio archive found: Searching for its real filesystem..."
-		unset initrd_compression
-		handle_cpio_extraction
-	fi
-
-	if [ "$initrd_compression" == "Zstandard compressed" ]; then
-		echo "Archive is zstd compressed..."
-		zstd --decompress --stdout "$initrd_image" | \
-			cpio --extract --make-directories --preserve-modification-time
-
-	elif [ "$initrd_compression" == "gzip compressed" ]; then
-		echo "Archive is gzip compressed..."
-		zcat "$initrd_image" | cpio -i
-
-	elif [ "$initrd_compression" == "XZ compressed" ]; then
-		echo "Archive is XZ compressed..."
-		xzcat "$initrd_image" | cpio -d -i -m
-
-	fi
+	unmkinitramfs "$initrd_image" .
+	for i in main early; do
+		if [ -d $i ]; then
+			mv $i/* .
+			rmdir $i
+		fi
+	done

 	popd

@@ -450,7 +386,10 @@

 	pushd /tmp/extracted

-	if [ "$initrd_compression" == "gzip compressed" ]; then
+	if [ "$initrd_compression" == "cpio archive" ]; then
+		find . -print0 | cpio -0 -H newc -o > ${work_dir}/iso/live/${initrd_image##*/}
+
+	elif [ "$initrd_compression" == "gzip compressed" ]; then
 		find . -print0 | cpio -0 -H newc -o | gzip -c > ${work_dir}/iso/live/${initrd_image##*/}

 	elif [ "$initrd_compression" == "XZ compressed" ] ; then
@@ -464,10 +403,6 @@
 		exit 1
 	fi

-	if [ $cpio_initrd_image ]; then
-		cleanup_cpio_extraction
-	fi
-
 	popd

 	rm -rf /tmp/extracted

--- /usr/bin/refractasnapshot-original	2024-01-01 09:09:11.664004107 +0100
+++ /usr/bin/refractasnapshot	2024-01-01 09:55:52.332110964 +0100
@@ -319,35 +319,14 @@
 	pushd /tmp/extracted

 	COMPRESSION=$(file -L "$initrd_image" | egrep -o 'gzip compressed|XZ compressed|cpio archive')
+	#COMPRESSION="XZ compressed"

-	if [ "$COMPRESSION" = "gzip compressed" ]; then
-		echo "Archive is gzip compressed..."
-		zcat "$initrd_image" | cpio -i
-
-	elif [ "$COMPRESSION" = "XZ compressed" ]; then
-		echo "Archive is XZ compressed..."
-		xzcat "$initrd_image" | cpio -d -i -m
-
-	elif [ "$COMPRESSION" = "cpio archive" ]; then
-		echo "Archive is cpio archive..."
-		(cpio -i ; zcat | cpio -i) < "$initrd_image"
-		exit_code="$?"
-		if [ "$exit_code" -ne 0 ] ; then
-			(cpio -i ; xzcat | cpio -i) < "$initrd_image"
-			exit_code="$?"
-			if [ "$exit_code" -ne 0 ] ; then
-				echo "Decompression error" && exit 1
-			else
-				COMPRESSION="XZ compressed"
-			fi
-		else
-			COMPRESSION="gzip compressed"
-		fi
-
-		echo "COMPRESSION is $COMPRESSION"
-
-	else
-		echo "Decompession error..." && exit 1
+	unmkinitramfs "$initrd_image" .
+        exit_code="$?"
+        [ -d early ] && ( mv early/* .; rmdir early )
+	[ -d main ]  && ( mv main/* .; rmdir main )
+	if [ "$exit_code" -ne 0 ] ; then
+		echo "Decompression error" && exit 1
 	fi

 	popd
@@ -395,6 +374,8 @@
 		find . -print0 | cpio -0 -H newc -o | gzip -c > ${work_dir}/iso/live/${initrd_image##*/}
 	elif [ "$COMPRESSION" = "XZ compressed" ] ; then
 		find . | cpio -o -H newc | xz --check=crc32 --x86 --lzma2=dict=512KiB > ${work_dir}/iso/live/${initrd_image##*/}
+	elif [ "$COMPRESSION" = "cpio archive" ] ; then
+		find . -print0 | cpio -0 -H newc -o > ${work_dir}/iso/live/${initrd_image##*/}
 	else
 		echo "Compression error..."
 		exit 1

--- /usr/bin/refractasnapshot-gui-original	2024-01-01 11:09:21.640279198 +0100
+++ /usr/bin/refractasnapshot-gui	2024-01-01 11:12:14.148285780 +0100
@@ -379,35 +379,14 @@
 	pushd /tmp/extracted

 	COMPRESSION=$(file -L "$initrd_image" | egrep -o 'gzip compressed|XZ compressed|cpio archive')
+	#COMPRESSION="XZ compressed"

-	if [ "$COMPRESSION" = "gzip compressed" ]; then
-		echo "Archive is gzip compressed..."
-		zcat "$initrd_image" | cpio -i
-
-	elif [ "$COMPRESSION" = "XZ compressed" ]; then
-		echo "Archive is XZ compressed..."
-		xzcat "$initrd_image" | cpio -d -i -m
-
-	elif [ "$COMPRESSION" = "cpio archive" ]; then
-		echo "Archive is cpio archive..."
-		(cpio -i ; zcat | cpio -i) < "$initrd_image"
-		exit_code="$?"
-		if [ "$exit_code" -ne 0 ] ; then
-			(cpio -i ; xzcat | cpio -i) < "$initrd_image"
-			exit_code="$?"
-			if [ "$exit_code" -ne 0 ] ; then
-				echo "Decompression error" && exit 1
-			else
-				COMPRESSION="XZ compressed"
-			fi
-		else
-			COMPRESSION="gzip compressed"
-		fi
-
-		echo "COMPRESSION is $COMPRESSION"
-
-	else
-		echo "Decompession error..." && exit 1
+	unmkinitramfs "$initrd_image" .
+	exit_code="$?"
+	[ -d early ] && ( mv early/* .; rmdir early )
+	[ -d main ]  && ( mv main/* .; rmdir main )
+	if [ "$exit_code" -ne 0 ] ; then
+		echo "Decompression error" && exit 1
 	fi

 	popd
@@ -455,6 +434,8 @@
 		find . -print0 | cpio -0 -H newc -o | gzip -c > ${work_dir}/iso/live/${initrd_image##*/}
 	elif [ "$COMPRESSION" = "XZ compressed" ] ; then
 		find . | cpio -o -H newc | xz --check=crc32 --x86 --lzma2=dict=512KiB > ${work_dir}/iso/live/${initrd_image##*/}
+	elif [ "$COMPRESSION" = "cpio archive" ] ; then
+		find . -print0 | cpio -0 -H newc -o > ${work_dir}/iso/live/${initrd_image##*/}
 	else
 		echo "Compression error..."
 		exit 1