[PATCH] common S70menu
This patch lets rootskel to have a common S70menu on all architectures.
Why there are currently S70menu and S70menu-linux and not only S70menu?
This patch could affect linux-*, but it shouldn't because S70menu is
the same as the deleted S70menu-linux.
Cheers,
Luca Favatella
Index: packages/rootskel/debian/changelog
===================================================================
--- packages/rootskel/debian/changelog (revision 60255)
+++ packages/rootskel/debian/changelog (working copy)
@@ -22,6 +22,7 @@
are Linux specific.
* Add GNU/kFreeBSD /sbin/reopen-console.
* Use a GNU/kFreeBSD specific script to exit the installer.
+ * Use a S70menu common to all architectures.
-- Colin Watson <cjwatson@debian.org> Tue, 14 Jul 2009 15:43:38 +0100
Index: packages/rootskel/src/lib/debian-installer.d/S70menu-linux
===================================================================
--- packages/rootskel/src/lib/debian-installer.d/S70menu-linux (.../trunk) (revision 60241)
+++ packages/rootskel/src/lib/debian-installer.d/S70menu-linux (.../branches/d-i/kfreebsd) (revision 60241)
@@ -1,17 +0,0 @@
-bterm=/usr/bin/bterm
-font=/lib/unifont.bgf
-
-if [ -x "$bterm" ] && [ -e "$font" ] && [ -n "$TERM_UTF8" ] && [ -n "$TERM_FRAMEBUFFER" ] && [ "$DEBIAN_FRONTEND" != gtk ]; then
- TERM=bterm
- export TERM
- set +e
- $bterm -f $font -l $LANG /lib/debian-installer/menu
- EXIT=$?
- set -e
-else
- rm -f $font
- set +e
- /lib/debian-installer/menu
- EXIT=$?
- set -e
-fi
Index: packages/rootskel/src/lib/debian-installer.d/S70menu
===================================================================
--- packages/rootskel/src/lib/debian-installer.d/S70menu (.../trunk) (revision 60241)
+++ packages/rootskel/src/lib/debian-installer.d/S70menu (.../branches/d-i/kfreebsd) (revision 60241)
@@ -1,4 +1,17 @@
-set +e
-/lib/debian-installer/menu
-EXIT=$?
-set -e
+bterm=/usr/bin/bterm
+font=/lib/unifont.bgf
+
+if [ -x "$bterm" ] && [ -e "$font" ] && [ -n "$TERM_UTF8" ] && [ -n "$TERM_FRAMEBUFFER" ] && [ "$DEBIAN_FRONTEND" != gtk ]; then
+ TERM=bterm
+ export TERM
+ set +e
+ $bterm -f $font -l $LANG /lib/debian-installer/menu
+ EXIT=$?
+ set -e
+else
+ rm -f $font
+ set +e
+ /lib/debian-installer/menu
+ EXIT=$?
+ set -e
+fi
Index: packages/rootskel/src/lib/debian-installer.d/Makefile
===================================================================
--- packages/rootskel/src/lib/debian-installer.d/Makefile (revision 60254)
+++ packages/rootskel/src/lib/debian-installer.d/Makefile (working copy)
@@ -18,6 +18,7 @@
S30term \
S60frontend \
S65theme \
+ S70menu \
S72menu-exit
ifeq ($(DEB_HOST_ARCH_CPU),sparc)
@@ -33,11 +34,7 @@
files += \
S20speakup \
- S40term-linux \
- S70menu-linux
-else
- files += \
- S70menu
+ S40term-linux
endif
include ../../../Makefile.inc
Reply to: