ready for ascii

debian/changelog

@@ -1,11 +1,24 @@
+refractasnapshot-base (10.1.1) unstable; urgency=low
+
+  * Added boot option 'net.ifnames=0'
+  
+
+refractasnapshot-base (10.1.0) unstable; urgency=low
+
+  * Added excludes for /usr/lib/live where /lib is symlink.
+
+ -- fsmithred <fsmithred@gmail.com>  Sat, 21 Oct 2017 07:25:00 -0400
+
+
 refractasnapshot-base (10.0.3) unstable; urgency=low
 
   * Re-enabled cleanup option in '01 Create a snapshot'
   * Added /etc/popularity-contest.conf to excludes.
   * Fixed removal of NetworkManager/system-connections/* 
-  * Media volume ID is now a variable in config file.
+  * Media volume-ID is is now a variable in config file.
+
+ -- fsmithred <fsmithred@gmail.com>  Sun, 16 Jul 2017 14:25:00 -0400
 
- -- fsmithred <fsmithred@gmail.com>
 
 refractasnapshot-base (10.0.2+devuan1.2) unstable; urgency=medium
 

debian/control

@@ -21,7 +21,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: refracta-lang (>= 1.0) | live-config-refracta (<= 0.0.4), dosfstools
-Replaces: refractasnapshot-base (<< 10.0.3), refractasnapshot (<< 9.0)
+Replaces: refractasnapshot-base (<< 10.1.1), refractasnapshot (<< 9.0)
 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

grub.cfg.template

@@ -45,7 +45,7 @@ submenu 'Advanced options ...' {
 
     menuentry "${DISTRO} (failsafe)" {
 	set gfxpayload=keep
-	linux   /live/vmlinuz boot=live nocomponents=xinit noapm noapic nolapic nodma nosmp nomodeset vga=normal ${ifnames_opt} ${netconfig_opt} ${username_opt} 
+	linux   /live/vmlinuz boot=live nocomponents=xinit noapm noapic nolapic nodma nosmp forcepae nomodeset vga=normal ${ifnames_opt} ${netconfig_opt} ${username_opt} 
 	initrd  /live/initrd.img
     }
 

iso/isolinux/live.cfg

@@ -20,7 +20,7 @@ label toram
 
 label failsafe
 	menu label ${DISTRO} (failsafe)
-    kernel /live/vmlinuz noapic noapm nodma nomce nolapic nosmp nomodeset vga=normal ${ifnames_opt} ${netconfig_opt} ${username_opt} 
+    kernel /live/vmlinuz noapic noapm nodma nomce nolapic nosmp forcepae nomodeset vga=normal ${ifnames_opt} ${netconfig_opt} ${username_opt} 
     append initrd=/live/initrd.img boot=live   
 
 label memtest

refractasnapshot

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-version="refractasnapshot-10.0.3 (20170716)"
+version="refractasnapshot-10.1.1 (20171213)"
 
 TEXTDOMAIN=refractasnapshot-base
 TEXTDOMAINDIR=/usr/share/locale/
@@ -847,6 +847,7 @@ set_boot_options () {
 if [ "$iso_dir" = "/usr/lib/refractasnapshot/iso" ] ; then
 	sed -i "s:\${DISTRO}:$DISTRO:g" "$work_dir"/iso/isolinux/"$boot_menu"
 	sed -i "s:\${netconfig_opt}:$netconfig_opt:g" "$work_dir"/iso/isolinux/"$boot_menu"
+	sed -i "s:\${ifnames_opt}:$ifnames_opt:g" "$work_dir"/iso/isolinux/"$boot_menu"
 	sed -i "s:\${username_opt}:$username_opt:g" "$work_dir"/iso/isolinux/"$boot_menu"
 #	sed -i "s:\${CONFIGS}:$CONFIGS:g" "$work_dir"/iso/isolinux/"$boot_menu"
 fi
@@ -855,6 +856,7 @@ if [[ $make_efi = "yes" ]] ; then
 	sed -i "s:\${DISTRO}:$DISTRO:g" "$work_dir"/iso/boot/grub/grub.cfg
 	sed -i "s:\${netconfig_opt}:$netconfig_opt:g" "$work_dir"/iso/boot/grub/grub.cfg
 	sed -i "s:\${username_opt}:$username_opt:g" "$work_dir"/iso/boot/grub/grub.cfg
+	sed -i "s:\${ifnames_opt}:$ifnames_opt:g" "$work_dir"/iso/boot/grub/grub.cfg
 fi
 
 }

refractasnapshot.conf

@@ -281,7 +281,7 @@ grub_template="/usr/lib/refractasnapshot/grub.cfg.template"
 # Uncomment if you need to revert from "Predictable" (not memorable)
 # interface names back to the old names like eth0 or wlan0.
 
-#net.ifnames=0
+#ifnames_opt="net.ifnames=0"
 
 
 # DEPRECATED:
@@ -305,6 +305,6 @@ grub_template="/usr/lib/refractasnapshot/grub.cfg.template"
 # can abort the snapshot run at the Disk Space Report, run nocrypt,
 # then make your snapshot.)
 # 
-# Default is "yes"
+# Default is "no" or commented out.
 
-patch_init_nosystemd="yes"
+#patch_init_nosystemd="yes"

snapshot_exclude.list

@@ -43,6 +43,11 @@
 - /lib/live/mount
 - /run/*
 
+# Added for symlink /lib
+- /usr/lib/live/overlay
+- /usr/lib/live/image
+- /usr/lib/live/rootfs
+- /usr/lib/live/mount
 
 ## Entries below are optional. They are included either for privacy
 ## or to reduce the size of the snapshot. If you have any large
@@ -143,7 +148,7 @@
 - /home/*/.gnupg
 - /home/*/.ssh
 - /home/*/.xchat2
-- /home/*/.config/hexchat/logs/*
+- /home/*/.config/hexchat
 
 # Exclude ssh_host_keys. New ones will be generated upon live boot.
 # This fixes a security hole in all versions before 9.0.9-3.

snapshot_exclude.list.defaults

@@ -43,6 +43,11 @@
 - /lib/live/mount
 - /run/*
 
+# Added for symlink /lib
+- /usr/lib/live/overlay
+- /usr/lib/live/image
+- /usr/lib/live/rootfs
+- /usr/lib/live/mount
 
 ## Entries below are optional. They are included either for privacy
 ## or to reduce the size of the snapshot. If you have any large
@@ -143,7 +148,7 @@
 - /home/*/.gnupg
 - /home/*/.ssh
 - /home/*/.xchat2
-- /home/*/.config/hexchat/logs/*
+- /home/*/.config/hexchat
 
 # Exclude ssh_host_keys. New ones will be generated upon live boot.
 # This fixes a security hole in all versions before 9.0.9-3.