diff --git a/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher b/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher
index 16cf2cd8930c7a73a5d4e107ae180408be79e959..0f2ccd0c06ca93be2dfa8ddf5535134c940f06be 100755
--- a/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher
+++ b/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher
@@ -208,6 +208,14 @@ check_running_system () {
fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -409,7 +417,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -457,10 +465,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher-boot-emmc-rootfs-nvme b/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher-boot-emmc-rootfs-nvme
index 106fe5af07bbbe635a815ebc45444f43cf296705..c4e464eadb4233e03851178bb373d841d1030e9e 100755
--- a/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher-boot-emmc-rootfs-nvme
+++ b/bb-beagle-flasher/suite/bookworm/debian/beagle-flasher-boot-emmc-rootfs-nvme
@@ -203,8 +203,19 @@ check_running_system () {
/usr/sbin/update-initramfs -c -k $(uname -r) || true
message="--------------------------------------------------------------------------------" ; broadcast
fi
+ if [ -f /boot/firmware/initrd.img ] ; then
+ cp -v /boot/initrd.img-$(uname -r) /boot/firmware/initrd.img
+ fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -339,15 +350,13 @@ partition_drive () {
message="--------------------------------------------------------------------------------" ; broadcast
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="1"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="1"
fi
-
copy_rootfs
-
if [ "x${extlinux}" != "x" ] ; then
if [ -f ${extlinux} ] ; then
message="INFO: [/boot/firmware/extlinux/extlinux.conf]" ; broadcast
@@ -402,10 +411,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/bookworm/debian/changelog b/bb-beagle-flasher/suite/bookworm/debian/changelog
index 077b7d205073d2e7eb73e9171713d073a9c461be..fb1cdcbeddb200a79def2cb4284995b4932db4dc 100644
--- a/bb-beagle-flasher/suite/bookworm/debian/changelog
+++ b/bb-beagle-flasher/suite/bookworm/debian/changelog
@@ -1,6 +1,6 @@
-bb-beagle-flasher (1.20230707.2-0~bookworm+20230707) bookworm; urgency=low
+bb-beagle-flasher (1.20230710.0-0~bookworm+20230710) bookworm; urgency=low
* Rebuild for repos.rcn-ee.com
- -- Robert Nelson <robertcnelson@gmail.com> Fri, 07 Jul 2023 20:23:32 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Mon, 10 Jul 2023 11:42:15 -0500
diff --git a/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher b/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher
index 6a27fa13e36795d2eaa5a4de328577a638be4aae..09a8edba9305f812bbd6466cdf2b0ba0ac2b7e29 100755
--- a/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher
+++ b/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher
@@ -203,6 +203,14 @@ check_running_system () {
message="INFO: [destination=${destination}] is a valid block device" ; broadcast
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -414,7 +422,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -462,10 +470,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher b/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher
index 16cf2cd8930c7a73a5d4e107ae180408be79e959..0f2ccd0c06ca93be2dfa8ddf5535134c940f06be 100755
--- a/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher
+++ b/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher
@@ -208,6 +208,14 @@ check_running_system () {
fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -409,7 +417,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -457,10 +465,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher-boot-emmc-rootfs-nvme b/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher-boot-emmc-rootfs-nvme
index 106fe5af07bbbe635a815ebc45444f43cf296705..c4e464eadb4233e03851178bb373d841d1030e9e 100755
--- a/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher-boot-emmc-rootfs-nvme
+++ b/bb-beagle-flasher/suite/bullseye/debian/beagle-flasher-boot-emmc-rootfs-nvme
@@ -203,8 +203,19 @@ check_running_system () {
/usr/sbin/update-initramfs -c -k $(uname -r) || true
message="--------------------------------------------------------------------------------" ; broadcast
fi
+ if [ -f /boot/firmware/initrd.img ] ; then
+ cp -v /boot/initrd.img-$(uname -r) /boot/firmware/initrd.img
+ fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -339,15 +350,13 @@ partition_drive () {
message="--------------------------------------------------------------------------------" ; broadcast
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="1"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="1"
fi
-
copy_rootfs
-
if [ "x${extlinux}" != "x" ] ; then
if [ -f ${extlinux} ] ; then
message="INFO: [/boot/firmware/extlinux/extlinux.conf]" ; broadcast
@@ -402,10 +411,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/bullseye/debian/changelog b/bb-beagle-flasher/suite/bullseye/debian/changelog
index a72b15097e5817080e37c19ba1fd6f7730ec6dd4..7e9e56172e4f175ec84d8bacf2e58bfe8bed89cf 100644
--- a/bb-beagle-flasher/suite/bullseye/debian/changelog
+++ b/bb-beagle-flasher/suite/bullseye/debian/changelog
@@ -1,6 +1,6 @@
-bb-beagle-flasher (1.20230707.2-0~bullseye+20230707) bullseye; urgency=low
+bb-beagle-flasher (1.20230710.0-0~bullseye+20230710) bullseye; urgency=low
* Rebuild for repos.rcn-ee.com
- -- Robert Nelson <robertcnelson@gmail.com> Fri, 07 Jul 2023 20:23:32 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Mon, 10 Jul 2023 11:42:15 -0500
diff --git a/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher b/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher
index 6a27fa13e36795d2eaa5a4de328577a638be4aae..09a8edba9305f812bbd6466cdf2b0ba0ac2b7e29 100755
--- a/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher
+++ b/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher
@@ -203,6 +203,14 @@ check_running_system () {
message="INFO: [destination=${destination}] is a valid block device" ; broadcast
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -414,7 +422,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -462,10 +470,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/jammy/debian/beagle-flasher b/bb-beagle-flasher/suite/jammy/debian/beagle-flasher
index 16cf2cd8930c7a73a5d4e107ae180408be79e959..0f2ccd0c06ca93be2dfa8ddf5535134c940f06be 100755
--- a/bb-beagle-flasher/suite/jammy/debian/beagle-flasher
+++ b/bb-beagle-flasher/suite/jammy/debian/beagle-flasher
@@ -208,6 +208,14 @@ check_running_system () {
fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -409,7 +417,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -457,10 +465,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/jammy/debian/beagle-flasher-boot-emmc-rootfs-nvme b/bb-beagle-flasher/suite/jammy/debian/beagle-flasher-boot-emmc-rootfs-nvme
index 106fe5af07bbbe635a815ebc45444f43cf296705..c4e464eadb4233e03851178bb373d841d1030e9e 100755
--- a/bb-beagle-flasher/suite/jammy/debian/beagle-flasher-boot-emmc-rootfs-nvme
+++ b/bb-beagle-flasher/suite/jammy/debian/beagle-flasher-boot-emmc-rootfs-nvme
@@ -203,8 +203,19 @@ check_running_system () {
/usr/sbin/update-initramfs -c -k $(uname -r) || true
message="--------------------------------------------------------------------------------" ; broadcast
fi
+ if [ -f /boot/firmware/initrd.img ] ; then
+ cp -v /boot/initrd.img-$(uname -r) /boot/firmware/initrd.img
+ fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -339,15 +350,13 @@ partition_drive () {
message="--------------------------------------------------------------------------------" ; broadcast
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="1"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="1"
fi
-
copy_rootfs
-
if [ "x${extlinux}" != "x" ] ; then
if [ -f ${extlinux} ] ; then
message="INFO: [/boot/firmware/extlinux/extlinux.conf]" ; broadcast
@@ -402,10 +411,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/jammy/debian/changelog b/bb-beagle-flasher/suite/jammy/debian/changelog
index 8af48133e1a09d97bb55d23e4ccfc6c86699dc5d..40ddb5292cd5c0ea56b81b7f66ff0d02a0e11e39 100644
--- a/bb-beagle-flasher/suite/jammy/debian/changelog
+++ b/bb-beagle-flasher/suite/jammy/debian/changelog
@@ -1,6 +1,6 @@
-bb-beagle-flasher (1.20230707.2-0~jammy+20230707) jammy; urgency=low
+bb-beagle-flasher (1.20230710.0-0~jammy+20230710) jammy; urgency=low
* Rebuild for repos.rcn-ee.com
- -- Robert Nelson <robertcnelson@gmail.com> Fri, 07 Jul 2023 20:23:32 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Mon, 10 Jul 2023 11:42:15 -0500
diff --git a/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher b/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher
index 6a27fa13e36795d2eaa5a4de328577a638be4aae..09a8edba9305f812bbd6466cdf2b0ba0ac2b7e29 100755
--- a/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher
+++ b/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher
@@ -203,6 +203,14 @@ check_running_system () {
message="INFO: [destination=${destination}] is a valid block device" ; broadcast
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -414,7 +422,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -462,10 +470,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/trixie/debian/beagle-flasher b/bb-beagle-flasher/suite/trixie/debian/beagle-flasher
index 16cf2cd8930c7a73a5d4e107ae180408be79e959..0f2ccd0c06ca93be2dfa8ddf5535134c940f06be 100755
--- a/bb-beagle-flasher/suite/trixie/debian/beagle-flasher
+++ b/bb-beagle-flasher/suite/trixie/debian/beagle-flasher
@@ -208,6 +208,14 @@ check_running_system () {
fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -409,7 +417,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -457,10 +465,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/trixie/debian/beagle-flasher-boot-emmc-rootfs-nvme b/bb-beagle-flasher/suite/trixie/debian/beagle-flasher-boot-emmc-rootfs-nvme
index 106fe5af07bbbe635a815ebc45444f43cf296705..c4e464eadb4233e03851178bb373d841d1030e9e 100755
--- a/bb-beagle-flasher/suite/trixie/debian/beagle-flasher-boot-emmc-rootfs-nvme
+++ b/bb-beagle-flasher/suite/trixie/debian/beagle-flasher-boot-emmc-rootfs-nvme
@@ -203,8 +203,19 @@ check_running_system () {
/usr/sbin/update-initramfs -c -k $(uname -r) || true
message="--------------------------------------------------------------------------------" ; broadcast
fi
+ if [ -f /boot/firmware/initrd.img ] ; then
+ cp -v /boot/initrd.img-$(uname -r) /boot/firmware/initrd.img
+ fi
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -339,15 +350,13 @@ partition_drive () {
message="--------------------------------------------------------------------------------" ; broadcast
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="1"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="1"
fi
-
copy_rootfs
-
if [ "x${extlinux}" != "x" ] ; then
if [ -f ${extlinux} ] ; then
message="INFO: [/boot/firmware/extlinux/extlinux.conf]" ; broadcast
@@ -402,10 +411,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/suite/trixie/debian/changelog b/bb-beagle-flasher/suite/trixie/debian/changelog
index 2d20399d169d6e038fce07a27bb1b9261d749ba3..269b8d4c82638ff9b93f29bd74e748029213b004 100644
--- a/bb-beagle-flasher/suite/trixie/debian/changelog
+++ b/bb-beagle-flasher/suite/trixie/debian/changelog
@@ -1,6 +1,6 @@
-bb-beagle-flasher (1.20230707.2-0~trixie+20230707) trixie; urgency=low
+bb-beagle-flasher (1.20230710.0-0~trixie+20230710) trixie; urgency=low
* Rebuild for repos.rcn-ee.com
- -- Robert Nelson <robertcnelson@gmail.com> Fri, 07 Jul 2023 20:23:32 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Mon, 10 Jul 2023 11:42:15 -0500
diff --git a/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher b/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher
index 6a27fa13e36795d2eaa5a4de328577a638be4aae..09a8edba9305f812bbd6466cdf2b0ba0ac2b7e29 100755
--- a/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher
+++ b/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher
@@ -203,6 +203,14 @@ check_running_system () {
message="INFO: [destination=${destination}] is a valid block device" ; broadcast
fi
flush_cache
+
+ if [ -f /etc/default/generic-sys-mods ] ; then
+ message="INFO: [cat /etc/default/generic-sys-mods]" ; broadcast
+ cat /etc/default/generic-sys-mods
+ . /etc/default/generic-sys-mods
+ src_rfs_part=${ROOT_PARTITION}
+ message="--------------------------------------------------------------------------------" ; broadcast
+ fi
}
format_boot () {
@@ -414,7 +422,7 @@ partition_drive () {
message="INFO: Formatting: ${destination} complete" ; broadcast
message="--------------------------------------------------------------------------------" ; broadcast
- src_rfs_part="1"
+ src_rfs_part=${src_rfs_part:-"1"}
dest_rfs_part="1"
copy_rootfs
elif [ "x${rfs_partition}" = "xdual" ] ; then
@@ -462,10 +470,10 @@ partition_drive () {
flush_cache
if [ "x${rfs_swap_size_mb}" != "x" ] ; then
- src_rfs_part="3"
+ src_rfs_part=${src_rfs_part:-"3"}
dest_rfs_part="3"
else
- src_rfs_part="2"
+ src_rfs_part=${src_rfs_part:-"2"}
dest_rfs_part="2"
fi
diff --git a/bb-beagle-flasher/version.sh b/bb-beagle-flasher/version.sh
index ac7da6acc90eb440c43be6c475daaac4a03008c0..265d69ef6a3307fe45feac5a2d99e036d707c361 100644
--- a/bb-beagle-flasher/version.sh
+++ b/bb-beagle-flasher/version.sh
@@ -2,7 +2,7 @@
package_name="bb-beagle-flasher"
debian_pkg_name="${package_name}"
-package_version="1.20230707.2"
+package_version="1.20230710.0"
package_source=""
src_dir=""
@@ -17,7 +17,7 @@ debian_patch=""
clear_changelog="enable"
-bullseye_version="~bullseye+20230707"
-bookworm_version="~bookworm+20230707"
-trixie_version="~trixie+20230707"
-jammy_version="~jammy+20230707"
+bullseye_version="~bullseye+20230710"
+bookworm_version="~bookworm+20230710"
+trixie_version="~trixie+20230710"
+jammy_version="~jammy+20230710"