Hello,

Here is an corrected patch

Samuel

Index: build/config/x86.cfg
===================================================================
--- build/config/x86.cfg        (révision 54981)
+++ build/config/x86.cfg        (copie de travail)
@@ -60,6 +60,11 @@
                                outfile="" ; \
                        fi; \
                fi; \
+               if [ $$outfile = menu.cfg ] && $$MENU_BEEP ] ; then \
+                       addbeep="s/^menu title.*/&/"; \
+               else \
+                       addbeep=""; \
+               fi; \
                if [ "$$outfile" ]; then \
                        cat $(file) \
                        | bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
@@ -70,6 +75,7 @@
                                INITRD_GTK initrdg.gz \
                                VIDEO_MODE $(VIDEO_MODE) \
                                VIDEO_MODE_GTK $(VIDEO_MODE_GTK) \
+                       | sed -e "$$addbeep" \
                        | todos | mcopy -i$(TEMP_BOOT) - ::$$outfile; \
                fi; \
        )
@@ -157,6 +163,11 @@
                        outfile=isolinux.cfg; \
                fi; \
                cat $(file) \
+               if [ $$outfile = menu.cfg ] && $$MENU_BEEP ] ; then \
+                       addbeep="s/^menu title.*/&/"; \
+               else \
+                       addbeep=""; \
+               fi; \
                | bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
                        DEBIAN_VERSION "$(DEBIAN_VERSION)" \
                        BUILD_DATE "$(BUILD_DATE)" \
@@ -165,6 +176,7 @@
                        INITRD_GTK /install/gtk/initrd.gz \
                        VIDEO_MODE $(VIDEO_MODE) \
                        VIDEO_MODE_GTK $(VIDEO_MODE_GTK) \
+               | sed -e "$$addbeep" \
                > $(TEMP_CD_INFO_DIR)/$$outfile; \
        )
 
@@ -213,6 +225,11 @@
                if [ $$outfile = syslinux.cfg ]; then \
                        outfile=isolinux.cfg; \
                fi; \
+               if [ $$outfile = menu.cfg ] && $$MENU_BEEP ] ; then \
+                       addbeep="s/^menu title.*/&/"; \
+               else \
+                       addbeep=""; \
+               fi; \
                cat $(file) \
                | bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
                        DEBIAN_VERSION "$(DEBIAN_VERSION)" \
@@ -222,6 +239,7 @@
                        INITRD_GTK /install/gtk/initrd.gz \
                        VIDEO_MODE $(VIDEO_MODE) \
                        VIDEO_MODE_GTK $(VIDEO_MODE_GTK) \
+               | sed -e "$$addbeep" \
                | todos > $(TEMP_CD_TREE)/$$outfile; \
        )
        
@@ -266,6 +284,11 @@
                if [ `basename $(file)` = syslinux.cfg ]; then \
                        
outfile=$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/pxelinux.cfg/default; \
                fi; \
+               if [ $$outfile = menu.cfg ] && $$MENU_BEEP ] ; then \
+                       addbeep="s/^menu title.*/&/"; \
+               else \
+                       addbeep=""; \
+               fi; \
                cat $(file) \
                | bootvars-subst MEDIA_TYPE "$(MEDIA_TYPE)" \
                        DEBIAN_VERSION "$(DEBIAN_VERSION)" \
@@ -274,6 +297,7 @@
                        KERNEL $(NETBOOT_PATH)/linux \
                        INITRD $(NETBOOT_PATH)/initrd.gz \
                        VIDEO_MODE $(VIDEO_MODE) \
+               | sed -e "$$addbeep" \
                > $$outfile; \
        )
        
Index: build/config/common
===================================================================
--- build/config/common (révision 54981)
+++ build/config/common (copie de travail)
@@ -55,6 +55,9 @@
 # The date the installer is built.
 BUILD_DATE ?= $(shell date -u '+%Y%m%d-%H:%M')
 
+# Produce a beep at boot menu
+MENU_BEEP ?= false
+
 # Filesystem type for the initrd, currently valid values are ext2, cramfs,
 # and initramfs.
 # NOTE: Your kernel must support this filesystem, not just a module. 
Index: build/README
===================================================================
--- build/README        (révision 54981)
+++ build/README        (copie de travail)
@@ -348,6 +348,11 @@
 DOS_VOLUME_LABEL
   Volume ID and label for DOS filesystems.
 
+MENU_BEEP
+  Set to true to produce a beep when the boot menu is ready to accept commands
+  (e.g. extra kernel parameters)
+  This improves accessibility of the image for blind people.
+
 GZIPPED
   Create gzipped images. This works only for the BOOT, ROOT and EXTRA
   targets.
Index: debian/rules
===================================================================
--- debian/rules        (révision 54981)
+++ debian/rules        (copie de travail)
@@ -7,9 +7,11 @@
 ifeq (${SUITE},UNRELEASED)
 USE_UDEBS_FROM=unstable
 TRANSSTATUS=
+MENU_BEEP=false
 else
 USE_UDEBS_FROM=lenny
 TRANSSTATUS=translation-status
+MENU_BEEP=true
 endif
 
 ARCHIVEDIR=debian/tmp/installer-$(ARCH)
@@ -29,7 +31,7 @@
 build-images:
        $(MAKE) -C build all_build stats release \
                USE_UDEBS_FROM=$(USE_UDEBS_FROM) BUILD_DATE=$(DATE) \
-               TRANSSTATUS=$(TRANSSTATUS)
+               TRANSSTATUS=$(TRANSSTATUS) MENU_BEEP=$(MENU_BEEP)
        
 build: build-stamp
 build-stamp:


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to