diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-03-23 00:55:42 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-03-23 00:55:42 +0000 |
| commit | 4ab1fd37fc684927177fd1c1ee7fb020f5a4ecb7 (patch) | |
| tree | f89e37cc9022b4a5173f094be72a86dcc32dca14 /etc | |
| parent | finish merging openrc changes (diff) | |
| download | baselayout-4ab1fd37fc684927177fd1c1ee7fb020f5a4ecb7.tar.gz baselayout-4ab1fd37fc684927177fd1c1ee7fb020f5a4ecb7.tar.bz2 baselayout-4ab1fd37fc684927177fd1c1ee7fb020f5a4ecb7.zip | |
merge updates from baselayout-1.12.x
svn path=/trunk/; revision=3111
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/profile | 8 | ||||
| -rw-r--r-- | etc/protocols | 28 | ||||
| -rw-r--r-- | etc/services | 2 |
3 files changed, 18 insertions, 20 deletions
diff --git a/etc/profile b/etc/profile index 233f0d32..1ebaf4f0 100644 --- a/etc/profile +++ b/etc/profile @@ -9,6 +9,8 @@ if [ -e /etc/profile.env ] ; then . /etc/profile.env fi +export EDITOR=${EDITOR:-/bin/nano} +export PAGER=${PAGER:-/usr/bin/less} # 077 would be more secure, but 022 is generally quite realistic umask 022 @@ -49,11 +51,7 @@ else # Setup a bland default prompt. Since this prompt should be useable # on color and non-color terminals, as well as shells that don't # understand sequences such as \h, don't put anything special in it. - if type whoami >/dev/null 2>/dev/null && \ - type cut >/dev/null 2>/dev/null && \ - type uname >/dev/null 2>/dev/null ; then - PS1="`whoami`@`uname -n | cut -f1 -d.` \$ " - fi + PS1="${USER:-$(type whoami >/dev/null && whoami)}@$(type uname >/dev/null && uname -n) \$ " fi for sh in /etc/profile.d/*.sh ; do diff --git a/etc/protocols b/etc/protocols index 798a5c8e..4005d898 100644 --- a/etc/protocols +++ b/etc/protocols @@ -1,18 +1,18 @@ +# /etc/protocols # -# Internet protocols -# -# $FreeBSD: src/etc/protocols,v 1.20 2005/02/22 13:04:02 glebius Exp $ -# from: @(#)protocols 5.1 (Berkeley) 4/17/89 +# Internet (IP) protocols definition file # +# See protocols(5) for more info # See also http://www.iana.org/assignments/protocol-numbers # + ip 0 IP # internet protocol, pseudo protocol number #hopopt 0 HOPOPT # hop-by-hop options for ipv6 icmp 1 ICMP # internet control message protocol igmp 2 IGMP # internet group management protocol ggp 3 GGP # gateway-gateway protocol ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') -st2 5 ST2 # ST2 datagram mode (RFC 1819) +st 5 ST # ST datagram mode tcp 6 TCP # transmission control protocol cbt 7 CBT # CBT, Tony Ballardie <A.Ballardie@cs.ucl.ac.uk> egp 8 EGP # exterior gateway protocol @@ -48,13 +48,13 @@ ddp 37 DDP # Datagram Delivery Protocol idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto tp++ 39 TP++ # TP++ Transport Protocol il 40 IL # IL Transport Protocol -ipv6 41 IPV6 # ipv6 +ipv6 41 IPv6 # IPv6 sdrp 42 SDRP # Source Demand Routing Protocol -ipv6-route 43 IPV6-ROUTE # routing header for ipv6 -ipv6-frag 44 IPV6-FRAG # fragment header for ipv6 +ipv6-route 43 IPv6-Route # Routing Header for IPv6 +ipv6-frag 44 IPv6-Frag # Fragment Header for IPv6 idrp 45 IDRP # Inter-Domain Routing Protocol -rsvp 46 RSVP # Resource ReSerVation Protocol -gre 47 GRE # Generic Routing Encapsulation +rsvp 46 RSVP # Reservation Protocol +gre 47 GRE # General Routing Encapsulation mhrp 48 MHRP # Mobile Host Routing Protocol bna 49 BNA # BNA esp 50 ESP # encapsulating security payload @@ -65,9 +65,9 @@ narp 54 NARP # NBMA Address Resolution Protocol mobile 55 MOBILE # IP Mobility tlsp 56 TLSP # Transport Layer Security Protocol skip 57 SKIP # SKIP -ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6 -ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 -ipv6-opts 60 IPV6-OPTS # destination options for ipv6 +ipv6-icmp 58 IPv6-ICMP # ICMP for IPv6 +ipv6-nonxt 59 IPv6-NoNxt # No Next Header for IPv6 +ipv6-opts 60 IPv6-Opts # Destination Options for IPv6 # 61 # any host internal protocol cftp 62 CFTP # CFTP # 63 # any local network @@ -101,7 +101,7 @@ sprite-rpc 90 Sprite-RPC # Sprite RPC Protocol larp 91 LARP # Locus Address Resolution Protocol mtp 92 MTP # Multicast Transport Protocol ax.25 93 AX.25 # AX.25 Frames -ipip 94 IPIP # Yet Another IP encapsulation +ipip 94 IPIP # IP-within-IP Encapsulation Protocol micp 95 MICP # Mobile Internetworking Control Pro. scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro. etherip 97 ETHERIP # Ethernet-within-IP Encapsulation diff --git a/etc/services b/etc/services index 8ae4e4c2..70b1eb5a 100644 --- a/etc/services +++ b/etc/services @@ -914,6 +914,7 @@ pxc-splr 4007/udp pxc-splr xgrid 4111/tcp # Mac OS X Server Xgrid xgrid 4111/udp bzr 4155/tcp # Bazaar Version Control System +bzr 4155/udp # Bazaar version control system rwhois 4321/tcp # Remote Who Is rwhois 4321/udp epmd 4369/tcp # Erlang Port Mapper Daemon @@ -1177,4 +1178,3 @@ fido 60179/udp # Local services -# vim: set ts=8 : |