Bug#1043133: Patch which fixes the bug for me
The following fixes the bug for me. It may need adjusting so that it
can work both for debian 12.0 and previous, and for debian 12.11 where
'firmware-linux' is no longer a separate item.
The patch to binary_rootfs fixes a bug that I reported previously.
diff --git a/./binary_rootfs b/home/tjcw/live-build/binary_rootfs
index af8448d..080ee15 100755
--- a/./binary_rootfs
+++ b/home/tjcw/live-build/binary_rootfs
@@ -106,7 +106,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
dd if=/dev/zero
of=chroot/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0
seek=${REAL_DIM}
FAKE_MTAB=false
- if ! Chroot chroot "test -s /etc/mtab"
+ if ! Chroot chroot "test -e /etc/mtab"
then
Chroot chroot "ln -s
/proc/mounts/mtab /etc/mtab"
FAKE_MTAB=true
diff --git a/./chroot_firmware b/home/tjcw/live-build/chroot_firmware
index e22068f..6272c9e 100755
--- a/./chroot_firmware
+++ b/home/tjcw/live-build/chroot_firmware
@@ -54,10 +54,11 @@ Check_package host /usr/bin/wget wget
FIRMWARE_PACKAGES=""
# Manually add firmware-linux meta package if available
-if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep
"^Package:" | wc -l) -eq 1 ]
-then
- FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
-fi
+# 20230806 tjcw firmware-linux no longer shipped as separate package
+#if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep
"^Package:" | wc -l) -eq 1 ]
+#then
+# FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+#fi
Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}"
"${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
diff --git a/./installer_debian-installer
b/home/tjcw/live-build/installer_debian-installer
index c28b516..edc5edb 100755
--- a/./installer_debian-installer
+++ b/home/tjcw/live-build/installer_debian-installer
@@ -402,10 +402,11 @@ then
FIRMWARE_PACKAGES=""
# Manually add firmware-linux meta package if available
- if [ $(apt-cache show "^firmware-linux$" 2> /dev/null
| grep "^Package:" | wc -l) -eq 1 ]
- then
- FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
- fi
+ # 20230806 tjcw no firmware-linux any more
+ #if [ $(apt-cache show "^firmware-linux$" 2> /dev/null
| grep "^Package:" | wc -l) -eq 1 ]
+ #then
+ # FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+ #fi
Firmware_List_From_Contents
"${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}"
"${LB_PARENT_ARCHIVE_AREAS}"
Reply to: