changes for beowulf/ceres

debian/changelog

@@ -1,3 +1,17 @@
+refractasnapshot-base (10.2.3) unstable; urgency=low
+
+  * Build for Devuan repo.
+
+ -- fsmithred <fsmithred@gmail.com> Sat, 04 May 2019 11:29:00 -0400
+
+
+refractasnapshot-base (10.2.3~fsr) unstable; urgency=low
+
+  * Test for new locations of cryptroot and resume in initrd.
+
+ -- fsmithred <fsmithred@gmail.com> Fri, 03 May 2019 14:29:00 -0400
+
+
 refractasnapshot-base (10.2.1) unstable; urgency=low
 
   * Changed boot menu colors and splash.

debian/compat

@@ -1 +1 @@
-9
+11

debian/control

@@ -23,7 +23,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 	syslinux-common,
 	syslinux (<< 3:6.03) | syslinux (>= 3:6.03), syslinux (<< 3:6.03) | isolinux (>= 3:6.03)
 Recommends: dosfstools
-Replaces: refractasnapshot-base (<< 10.2.1)
+Replaces: refractasnapshot-base (<< 10.2.3)
 Description:  tool to create a live-CD from the running system
  Refracta Snapshot copies the running system, squashes the copy and
  makes an iso image file, which can be used to create a customized

debian/gbp.conf

@@ -1,2 +1,5 @@
 [DEFAULT]
 debian-branch=master
+upstream-tag=%(version)s
+[buildpackage]
+compression-level=9

refractasnapshot

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-version="refractasnapshot-10.2.1 (20190128)"
+version="refractasnapshot-10.2.3 (20190422)"
 
 TEXTDOMAIN=refractasnapshot-base
 TEXTDOMAINDIR=/usr/share/locale/
@@ -294,9 +294,12 @@ check_initrd () {
 if lsinitramfs "$initrd_image" | grep -q conf.d/cryptroot ; then
 	remove_cryptroot="yes"
 	cryptroot_message="The snapshot initrd will be modified to allow booting the unencrypted snapshot."
+elif lsinitramfs "$initrd_image" | grep -q cryptroot | egrep -v 'scripts|crypttab|bin' ; then
+	remove_cryptroot="yes"
+	cryptroot_message="The snapshot initrd will be modified to allow booting the unencrypted snapshot."
 fi
-if lsinitramfs "$initrd_image" | grep -q conf.d/resume ; then
-	remove resume="yes"
+if lsinitramfs "$initrd_image" | egrep -q 'conf.d/resume|conf.d/zz-resume-auto' ; then
+	remove_resume="yes"
 	swap_message="The snapshot initrd will be modified to allow booting without the host's swap partition."
 fi
 if [ "$initrd_crypt" = yes ] ; then
@@ -341,11 +344,17 @@ edit_initrd () {
 	if [ -f conf/conf.d/cryptroot ] ; then
 		echo "Removing cryptroot"
 		rm -f conf/conf.d/cryptroot
+	elif [ -f cryptroot ] ; then
+		echo "Removing cryptroot"
+		rm -f cryptroot
 	fi
 
 	if [ -f conf/conf.d/resume ] ; then
 		echo "Removing resume"
 		rm -f conf/conf.d/resume
+	elif [ -f conf/conf.d/zz-resume-auto ] ; then
+		echo "Removing resume"
+		rm -f conf/conf.d/zz-resume-auto
 	fi
 
 	popd
@@ -369,7 +378,6 @@ rebuild_initrd () {
 	popd
 
 	rm -rf /tmp/extracted
-	rm -f /tmp/initrd.tmp
 
 }
 
@@ -641,7 +649,7 @@ prepare_initrd_crypt () {
 	# Add '-k all' or specify the initrd to use???
 
 	cp "$initrd_image" "${initrd_image}_pre-snapshot"
-	sed -i 's/#CRYPTSETUP.*/CRYPTSETUP=y/' /etc/cryptsetup-initramfs/conf-hook
+	sed -i 's/.*CRYPTSETUP=.*/CRYPTSETUP=y/' /etc/cryptsetup-initramfs/conf-hook
 	
 	if [[ -f /usr/sbin/update-initramfs.orig.initramfs-tools ]] ; then
 		/usr/sbin/update-initramfs.orig.initramfs-tools -u

refractasnapshot.conf

@@ -1,5 +1,5 @@
 # This file contains some configuration variables for Refracta Snapshot
-# (version 10.2.0 GUI and CLI versions). If you want to change
+# (version 10.2.x GUI and CLI versions). If you want to change
 # the defaults, this is the place to do it.
 #
 # Put this file in /etc or edit the configfile variable found at the