| 1 |
Author: vapier |
| 2 |
Date: 2008-03-23 00:55:42 +0000 (Sun, 23 Mar 2008) |
| 3 |
New Revision: 3111 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/etc.Linux/inputrc |
| 7 |
trunk/etc/profile |
| 8 |
trunk/etc/protocols |
| 9 |
trunk/etc/services |
| 10 |
trunk/share.Linux/fstab |
| 11 |
Log: |
| 12 |
merge updates from baselayout-1.12.x |
| 13 |
|
| 14 |
Modified: trunk/etc/profile |
| 15 |
=================================================================== |
| 16 |
--- trunk/etc/profile 2008-03-23 00:35:59 UTC (rev 3110) |
| 17 |
+++ trunk/etc/profile 2008-03-23 00:55:42 UTC (rev 3111) |
| 18 |
@@ -9,6 +9,8 @@ |
| 19 |
if [ -e /etc/profile.env ] ; then |
| 20 |
. /etc/profile.env |
| 21 |
fi |
| 22 |
+export EDITOR=${EDITOR:-/bin/nano} |
| 23 |
+export PAGER=${PAGER:-/usr/bin/less} |
| 24 |
|
| 25 |
# 077 would be more secure, but 022 is generally quite realistic |
| 26 |
umask 022 |
| 27 |
@@ -49,11 +51,7 @@ |
| 28 |
# Setup a bland default prompt. Since this prompt should be useable |
| 29 |
# on color and non-color terminals, as well as shells that don't |
| 30 |
# understand sequences such as \h, don't put anything special in it. |
| 31 |
- if type whoami >/dev/null 2>/dev/null && \ |
| 32 |
- type cut >/dev/null 2>/dev/null && \ |
| 33 |
- type uname >/dev/null 2>/dev/null ; then |
| 34 |
- PS1="`whoami`@`uname -n | cut -f1 -d.` \$ " |
| 35 |
- fi |
| 36 |
+ PS1="${USER:-$(type whoami >/dev/null && whoami)}@$(type uname >/dev/null && uname -n) \$ " |
| 37 |
fi |
| 38 |
|
| 39 |
for sh in /etc/profile.d/*.sh ; do |
| 40 |
|
| 41 |
Modified: trunk/etc/protocols |
| 42 |
=================================================================== |
| 43 |
--- trunk/etc/protocols 2008-03-23 00:35:59 UTC (rev 3110) |
| 44 |
+++ trunk/etc/protocols 2008-03-23 00:55:42 UTC (rev 3111) |
| 45 |
@@ -1,18 +1,18 @@ |
| 46 |
+# /etc/protocols |
| 47 |
# |
| 48 |
-# Internet protocols |
| 49 |
+# Internet (IP) protocols definition file |
| 50 |
# |
| 51 |
-# $FreeBSD: src/etc/protocols,v 1.20 2005/02/22 13:04:02 glebius Exp $ |
| 52 |
-# from: @(#)protocols 5.1 (Berkeley) 4/17/89 |
| 53 |
-# |
| 54 |
+# See protocols(5) for more info |
| 55 |
# See also http://www.iana.org/assignments/protocol-numbers |
| 56 |
# |
| 57 |
+ |
| 58 |
ip 0 IP # internet protocol, pseudo protocol number |
| 59 |
#hopopt 0 HOPOPT # hop-by-hop options for ipv6 |
| 60 |
icmp 1 ICMP # internet control message protocol |
| 61 |
igmp 2 IGMP # internet group management protocol |
| 62 |
ggp 3 GGP # gateway-gateway protocol |
| 63 |
ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') |
| 64 |
-st2 5 ST2 # ST2 datagram mode (RFC 1819) |
| 65 |
+st 5 ST # ST datagram mode |
| 66 |
tcp 6 TCP # transmission control protocol |
| 67 |
cbt 7 CBT # CBT, Tony Ballardie <A.Ballardie@×××××××××.uk> |
| 68 |
egp 8 EGP # exterior gateway protocol |
| 69 |
@@ -48,13 +48,13 @@ |
| 70 |
idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto |
| 71 |
tp++ 39 TP++ # TP++ Transport Protocol |
| 72 |
il 40 IL # IL Transport Protocol |
| 73 |
-ipv6 41 IPV6 # ipv6 |
| 74 |
+ipv6 41 IPv6 # IPv6 |
| 75 |
sdrp 42 SDRP # Source Demand Routing Protocol |
| 76 |
-ipv6-route 43 IPV6-ROUTE # routing header for ipv6 |
| 77 |
-ipv6-frag 44 IPV6-FRAG # fragment header for ipv6 |
| 78 |
+ipv6-route 43 IPv6-Route # Routing Header for IPv6 |
| 79 |
+ipv6-frag 44 IPv6-Frag # Fragment Header for IPv6 |
| 80 |
idrp 45 IDRP # Inter-Domain Routing Protocol |
| 81 |
-rsvp 46 RSVP # Resource ReSerVation Protocol |
| 82 |
-gre 47 GRE # Generic Routing Encapsulation |
| 83 |
+rsvp 46 RSVP # Reservation Protocol |
| 84 |
+gre 47 GRE # General Routing Encapsulation |
| 85 |
mhrp 48 MHRP # Mobile Host Routing Protocol |
| 86 |
bna 49 BNA # BNA |
| 87 |
esp 50 ESP # encapsulating security payload |
| 88 |
@@ -65,9 +65,9 @@ |
| 89 |
mobile 55 MOBILE # IP Mobility |
| 90 |
tlsp 56 TLSP # Transport Layer Security Protocol |
| 91 |
skip 57 SKIP # SKIP |
| 92 |
-ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6 |
| 93 |
-ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 |
| 94 |
-ipv6-opts 60 IPV6-OPTS # destination options for ipv6 |
| 95 |
+ipv6-icmp 58 IPv6-ICMP # ICMP for IPv6 |
| 96 |
+ipv6-nonxt 59 IPv6-NoNxt # No Next Header for IPv6 |
| 97 |
+ipv6-opts 60 IPv6-Opts # Destination Options for IPv6 |
| 98 |
# 61 # any host internal protocol |
| 99 |
cftp 62 CFTP # CFTP |
| 100 |
# 63 # any local network |
| 101 |
@@ -101,7 +101,7 @@ |
| 102 |
larp 91 LARP # Locus Address Resolution Protocol |
| 103 |
mtp 92 MTP # Multicast Transport Protocol |
| 104 |
ax.25 93 AX.25 # AX.25 Frames |
| 105 |
-ipip 94 IPIP # Yet Another IP encapsulation |
| 106 |
+ipip 94 IPIP # IP-within-IP Encapsulation Protocol |
| 107 |
micp 95 MICP # Mobile Internetworking Control Pro. |
| 108 |
scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro. |
| 109 |
etherip 97 ETHERIP # Ethernet-within-IP Encapsulation |
| 110 |
|
| 111 |
Modified: trunk/etc/services |
| 112 |
=================================================================== |
| 113 |
--- trunk/etc/services 2008-03-23 00:35:59 UTC (rev 3110) |
| 114 |
+++ trunk/etc/services 2008-03-23 00:55:42 UTC (rev 3111) |
| 115 |
@@ -914,6 +914,7 @@ |
| 116 |
xgrid 4111/tcp # Mac OS X Server Xgrid |
| 117 |
xgrid 4111/udp |
| 118 |
bzr 4155/tcp # Bazaar Version Control System |
| 119 |
+bzr 4155/udp # Bazaar version control system |
| 120 |
rwhois 4321/tcp # Remote Who Is |
| 121 |
rwhois 4321/udp |
| 122 |
epmd 4369/tcp # Erlang Port Mapper Daemon |
| 123 |
@@ -1177,4 +1178,3 @@ |
| 124 |
|
| 125 |
# Local services |
| 126 |
|
| 127 |
-# vim: set ts=8 : |
| 128 |
|
| 129 |
Modified: trunk/etc.Linux/inputrc |
| 130 |
=================================================================== |
| 131 |
--- trunk/etc.Linux/inputrc 2008-03-23 00:35:59 UTC (rev 3110) |
| 132 |
+++ trunk/etc.Linux/inputrc 2008-03-23 00:55:42 UTC (rev 3111) |
| 133 |
@@ -27,24 +27,37 @@ |
| 134 |
$if mode=emacs |
| 135 |
|
| 136 |
# for linux console and RH/Debian xterm |
| 137 |
+# allow the use of the Home/End keys |
| 138 |
"\e[1~": beginning-of-line |
| 139 |
"\e[4~": end-of-line |
| 140 |
-#"\e[5~": beginning-of-history |
| 141 |
-#"\e[6~": end-of-history |
| 142 |
+# mappings for "page up" and "page down" to step to the beginning/end |
| 143 |
+# of the history |
| 144 |
"\e[5~": history-search-backward |
| 145 |
"\e[6~": history-search-forward |
| 146 |
+# allow the use of the Delete/Insert keys |
| 147 |
"\e[3~": delete-char |
| 148 |
"\e[2~": quoted-insert |
| 149 |
+# # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving |
| 150 |
+"\e[5C": forward-word |
| 151 |
+"\e[5D": backward-word |
| 152 |
+"\e[1;5C": forward-word |
| 153 |
+"\e[1;5D": backward-word |
| 154 |
|
| 155 |
# gnome-terminal (escape + arrow key) |
| 156 |
"\e[5C": forward-word |
| 157 |
"\e[5D": backward-word |
| 158 |
+# gnome-terminal (control + arrow key) |
| 159 |
+"\e[1;5C": forward-word |
| 160 |
+"\e[1;5D": backward-word |
| 161 |
# konsole / xterm / rxvt (escape + arrow key) |
| 162 |
"\e\e[C": forward-word |
| 163 |
"\e\e[D": backward-word |
| 164 |
# konsole (alt + arrow key) |
| 165 |
"\e[1;3C": forward-word |
| 166 |
"\e[1;3D": backward-word |
| 167 |
+# konsole (control + arrow key) |
| 168 |
+"\e[1;3C": forward-word |
| 169 |
+"\e[1;3D": backward-word |
| 170 |
# aterm / eterm (control + arrow key) |
| 171 |
"\eOc": forward-word |
| 172 |
"\eOd": backward-word |
| 173 |
|
| 174 |
Modified: trunk/share.Linux/fstab |
| 175 |
=================================================================== |
| 176 |
--- trunk/share.Linux/fstab 2008-03-23 00:35:59 UTC (rev 3110) |
| 177 |
+++ trunk/share.Linux/fstab 2008-03-23 00:55:42 UTC (rev 3111) |
| 178 |
@@ -10,10 +10,6 @@ |
| 179 |
# |
| 180 |
# See the manpage fstab(5) for more information. |
| 181 |
# |
| 182 |
-# Keep in mind that the boot scripts will ignore many of the core mounts |
| 183 |
-# (like /proc or /dev or /dev/shm) unless you set RC_USE_FSTAB in your |
| 184 |
-# /etc/conf.d/rc file appropriately. |
| 185 |
-# |
| 186 |
|
| 187 |
# <fs> <mountpoint> <type> <opts> <dump/pass> |
| 188 |
|
| 189 |
|
| 190 |
-- |
| 191 |
gentoo-commits@l.g.o mailing list |
Archives