Attachment 1804 Details for Bug 4894 – set TERM to "screen" instead of "linux"

[patch] set TERM to "screen" instead of "linux"

use-screen-terminfo.diff (text/plain), 2.22 KB, created by Thierry Vignaud on 2012-03-19 19:06:42 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2012-03-19 19:06:42 CET

Size: 2.22 KB

patch

obsolete

>diff --git a/images/make_boot_img b/images/make_boot_img
>index b94de01..afdf7c1 100755
>--- a/images/make_boot_img
>+++ b/images/make_boot_img
>@@ -156,6 +156,7 @@ sub initrd {
>     symlink "/proc/mounts", "$tmp_initrd/etc/mtab";
>     symlink "../tmp", "$tmp_initrd/var/run";
>     _ "install -D /usr/share/terminfo/l/linux $tmp_initrd/usr/share/terminfo/l/linux";
>+    _ "install -D /usr/share/terminfo/s/screen $tmp_initrd/usr/share/terminfo/s/screen";
>     foreach ('pcitable', 'usbtable') {
>         _ "install -D /usr/share/ldetect-lst/$_.gz $tmp_initrd/usr/share/ldetect-lst/$_.gz";
>     }
>diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
>index d9af9aa..1b07e71 100644
>--- a/mdk-stage1/init.c
>+++ b/mdk-stage1/init.c
>@@ -75,7 +75,7 @@ char * env[] = {
> #endif
> 	,
> 	"HOME=/",
>-	"TERM=linux",
>+	"TERM=screen",
> 	"TERMINFO=/etc/terminfo",
> 	NULL
> };
>diff --git a/mdk-stage1/rescue-gui.c b/mdk-stage1/rescue-gui.c
>index 5a7e10d..33eed52 100644
>--- a/mdk-stage1/rescue-gui.c
>+++ b/mdk-stage1/rescue-gui.c
>@@ -56,7 +56,7 @@ char * env[] = {
> #endif
> 	,
> 	"HOME=/",
>-	"TERM=linux",
>+	"TERM=screen",
> 	"TERMINFO=/etc/terminfo",
> 	NULL
> };
>diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
>index 8311422..5eb13d5 100644
>--- a/perl-install/install/share/list.xml
>+++ b/perl-install/install/share/list.xml
>@@ -204,6 +204,7 @@
>   /usr/share/usb.ids
>   /usr/share/locale/UTF-8
>   /usr/share/terminfo/l/linux
>+  /usr/share/terminfo/s/screen
>   /bin/brltty
>   /sbin/mount.ntfs-3g 
>   /sbin/blkid
>diff --git a/rescue/list.xml b/rescue/list.xml
>index 0b50d80..c149498 100644
>--- a/rescue/list.xml
>+++ b/rescue/list.xml
>@@ -163,6 +163,7 @@
>   </if>
>   /usr/share/misc/magic.mgc
>   /usr/share/terminfo/l/linux
>+  /usr/share/terminfo/s/screen
>   /usr/share/pci.ids
>   /var/run/utmp
> 
>diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
>index 96d2f7d..5dff731 100755
>--- a/rescue/tree/etc/rc.sysinit
>+++ b/rescue/tree/etc/rc.sysinit
>@@ -65,6 +65,8 @@ echo "Setting local loop"
> # disable the weird echoprt in cooked mode for user interaction:
> stty sane
> 
>+export TERM=screen
>+
> #LANGUAGE (filled by make_rescue_img)
> 
> grep -q noauto /proc/cmdline || drvinst SERIAL_USB

diff --git a/images/make_boot_img b/images/make_boot_img
index b94de01..afdf7c1 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -156,6 +156,7 @@ sub initrd {
     symlink "/proc/mounts", "$tmp_initrd/etc/mtab";
     symlink "../tmp", "$tmp_initrd/var/run";
     _ "install -D /usr/share/terminfo/l/linux $tmp_initrd/usr/share/terminfo/l/linux";
+    _ "install -D /usr/share/terminfo/s/screen $tmp_initrd/usr/share/terminfo/s/screen";
     foreach ('pcitable', 'usbtable') {
         _ "install -D /usr/share/ldetect-lst/$_.gz $tmp_initrd/usr/share/ldetect-lst/$_.gz";
     }
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index d9af9aa..1b07e71 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -75,7 +75,7 @@ char * env[] = {
 #endif
 	,
 	"HOME=/",
-	"TERM=linux",
+	"TERM=screen",
 	"TERMINFO=/etc/terminfo",
 	NULL
 };
diff --git a/mdk-stage1/rescue-gui.c b/mdk-stage1/rescue-gui.c
index 5a7e10d..33eed52 100644
--- a/mdk-stage1/rescue-gui.c
+++ b/mdk-stage1/rescue-gui.c
@@ -56,7 +56,7 @@ char * env[] = {
 #endif
 	,
 	"HOME=/",
-	"TERM=linux",
+	"TERM=screen",
 	"TERMINFO=/etc/terminfo",
 	NULL
 };
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 8311422..5eb13d5 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -204,6 +204,7 @@
   /usr/share/usb.ids
   /usr/share/locale/UTF-8
   /usr/share/terminfo/l/linux
+  /usr/share/terminfo/s/screen
   /bin/brltty
   /sbin/mount.ntfs-3g <!-- cannot be expanded as binary, not executable for all users -->
   /sbin/blkid
diff --git a/rescue/list.xml b/rescue/list.xml
index 0b50d80..c149498 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -163,6 +163,7 @@
   </if>
   /usr/share/misc/magic.mgc
   /usr/share/terminfo/l/linux
+  /usr/share/terminfo/s/screen
   /usr/share/pci.ids
   /var/run/utmp
 
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
index 96d2f7d..5dff731 100755
--- a/rescue/tree/etc/rc.sysinit
+++ b/rescue/tree/etc/rc.sysinit
@@ -65,6 +65,8 @@ echo "Setting local loop"
 # disable the weird echoprt in cooked mode for user interaction:
 stty sane
 
+export TERM=screen
+
 #LANGUAGE (filled by make_rescue_img)
 
 grep -q noauto /proc/cmdline || drvinst SERIAL_USB

Actions: View | Diff

Attachments on bug 4894: 1728 | 1729 | 1804 | 1939