diff --git a/archbootcd-lowmem.conf b/archbootcd-lowmem.conf index df93651dd..bac5fdf0f 100644 --- a/archbootcd-lowmem.conf +++ b/archbootcd-lowmem.conf @@ -22,6 +22,7 @@ BOOTMESSAGE="" APPENDBOOTMESSAGE="/etc/archboot/etc/append-message" APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux" APPENDBOOTMESSAGE_SYSLINUX_LOWMEM="/etc/archboot/etc/append-message-syslinux-lowmem" +APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" # menu.lst or isolinux.cfg files to use ISOLINUXCFG="/etc/archboot/etc/isolinux-lowmem.cfg" diff --git a/archbootcd.conf b/archbootcd.conf index b165b509b..17f6270a3 100644 --- a/archbootcd.conf +++ b/archbootcd.conf @@ -21,6 +21,7 @@ BOOTMESSAGE="" # append this file to the default bootmessage APPENDBOOTMESSAGE="/etc/archboot/etc/append-message" APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux" +APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" # menu.lst or isolinux.cfg files to use ISOLINUXCFG="/etc/archboot/etc/isolinux.cfg" diff --git a/archpxelinux.conf b/archpxelinux.conf index 56eb1907a..2ff841487 100644 --- a/archpxelinux.conf +++ b/archpxelinux.conf @@ -19,6 +19,11 @@ KERNEL="/boot/vmlinuz26" # blank by default arch-bootmessage hook will create it by default BOOTMESSAGE="" +# append this file to the default bootmessage +APPENDBOOTMESSAGE="/etc/archboot/etc/append-message" +APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux" +APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" + # Prompt on boot, defaulted to yes, 1=yes 0=no PROMPT="1" diff --git a/archsyslinux.conf b/archsyslinux.conf index 8d6d06ded..5bec9f9f3 100644 --- a/archsyslinux.conf +++ b/archsyslinux.conf @@ -19,6 +19,11 @@ KERNEL="/boot/vmlinuz26" # blank by default arch-bootmessage hook will create it by default BOOTMESSAGE="" +# append this file to the default bootmessage +APPENDBOOTMESSAGE="/etc/archboot/etc/append-message" +APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux" +APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" + # Prompt on boot, defaulted to yes, 1=yes 0=no PROMPT="1" diff --git a/base/etc/fstab b/base/etc/fstab new file mode 100644 index 000000000..3539796c3 --- /dev/null +++ b/base/etc/fstab @@ -0,0 +1,10 @@ +# +# /etc/fstab: static file system information +# +# +none /dev/pts devpts defaults 0 0 +none /dev/shm tmpfs defaults 0 0 + +/dev/cdrom /media/cd auto ro,user,noauto,unhide 0 0 +/dev/dvd /media/dvd auto ro,user,noauto,unhide 0 0 +/dev/fd0 /media/fl auto user,noauto 0 0 diff --git a/etc/group b/base/etc/group similarity index 91% rename from etc/group rename to base/etc/group index 11f5e18f4..e4c919f4d 100644 --- a/etc/group +++ b/base/etc/group @@ -1,4 +1,4 @@ -root:x:0: +root:x:0:root bin:x:1:root,bin,daemon daemon:x:2:root,bin,daemon sys:x:3:root,bin @@ -9,6 +9,7 @@ lp:x:7:daemon mem:x:8: kmem:x:9: wheel:x:10:root +uucp:x:14: network:x:90: video:x:91: audio:x:92: diff --git a/etc/host.conf b/base/etc/host.conf similarity index 100% rename from etc/host.conf rename to base/etc/host.conf diff --git a/base/etc/hosts b/base/etc/hosts new file mode 100644 index 000000000..e802d7121 --- /dev/null +++ b/base/etc/hosts @@ -0,0 +1,8 @@ +# +# /etc/hosts: static lookup table for host names +# + +# +127.0.0.1 localhost.localdomain localhost + +# End of file \ No newline at end of file diff --git a/etc/inittab b/base/etc/inittab similarity index 92% rename from etc/inittab rename to base/etc/inittab index 7775a86da..7c39e057d 100644 --- a/etc/inittab +++ b/base/etc/inittab @@ -13,6 +13,7 @@ id:2:initdefault: rc::sysinit:/etc/rc.sysinit rh:06:wait:/etc/rc.shutdown +# -8 options fixes umlauts problem on login #c0:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 9600 ttyS0 linux c1:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 38400 vc/1 linux c2:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 38400 vc/2 linux diff --git a/etc/inputrc b/base/etc/inputrc similarity index 93% rename from etc/inputrc rename to base/etc/inputrc index 6333881bf..6ad9dd966 100644 --- a/etc/inputrc +++ b/base/etc/inputrc @@ -20,6 +20,8 @@ $if mode=emacs "\e[5D": backward-word "\e\e[C": forward-word "\e\e[D": backward-word +"\e[1;5C": forward-word +"\e[1;5D": backward-word # for rxvt "\e[8~": end-of-line diff --git a/etc/login.sh b/base/etc/login.sh similarity index 100% rename from etc/login.sh rename to base/etc/login.sh diff --git a/etc/mke2fs.conf b/base/etc/mke2fs.conf similarity index 59% rename from etc/mke2fs.conf rename to base/etc/mke2fs.conf index 9e59123e9..92464e3b4 100644 --- a/etc/mke2fs.conf +++ b/base/etc/mke2fs.conf @@ -1,15 +1,19 @@ [defaults] - base_features = sparse_super,filetype,resize_inode,dir_index + base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr blocksize = 4096 - inode_ratio = 8192 + inode_size = 128 + inode_ratio = 16384 [fs_types] small = { blocksize = 1024 + inode_size = 128 inode_ratio = 4096 } floppy = { blocksize = 1024 + inode_size = 128 + inode_ratio = 8192 } news = { inode_ratio = 4096 diff --git a/base/etc/nanorc b/base/etc/nanorc new file mode 100644 index 000000000..328a47e09 --- /dev/null +++ b/base/etc/nanorc @@ -0,0 +1,110 @@ +set autoindent +set const +set historylog +set nowrap +set smooth +set regexp +set fill 72 +# set multibuffer +set suspend + +syntax "pkgbuild" "^.*PKGBUILD$" +color green start="^" end="$" +color cyan "^.*(pkgname|pkgver|pkgrel|pkgdesc|force|url|license|install|source|md5sums|groups|backup|depends|makedepends|conflicts|provides|replaces).*=.*$" +color brightcyan "\<(pkgname|pkgver|pkgrel|pkgdesc|force|url|license|install|source|md5sums|groups|backup|depends|makedepends|conflicts|provides|replaces)\>" +color cyan "\.install" +color brightwhite "=" "'" "\(" "\)" "\"" "#.*$" "\," "\{" "\}" +color brightcyan "(\$|\$\{|\$\()(pkgname|pkgver|pkgrel|pkgdesc|force|url|license|install|source|md5sums|groups|backup|depends|makedepends|conflicts|provides|replaces|startdir)(|\}|\))" +color brightred "build\(\)" +color brightred "\<(configure|make)\>" +color red "\<(DESTDIR|PREFIX|prefix|sysconfdir|datadir|libdir|includedir|mandir)\>" + +syntax "c-file" "\.(c|h)$" +color red "\<[A-Z_]{2,}\>" +color green "\<(float|char|int|void|static|const|struct)\>" +color brightyellow "\<(if|while|do|else|case|switch)\>" +color brightcyan "^#( )*(define|include|ifn?def|endif|elif|else|if)" + +syntax "php" "\.php[2345s~]?$" +color brightblue "(.*)\(" +color blue "\$[a-zA-Z_0-9$]*|[=!<>]" +color green "(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|@|while)\s" +color green "[.,{}();]" +color red "('.*')|(\".*\")" +color brightyellow "(#.*|//.*)$" +color brightyellow start="/\*" end="\*/" +color brightblue "(<\?(php)?|\?>)" +color white start="\?>" end="<\?(php)?" + +syntax "HTML" "\.html$" +color blue start="<" end=">" +color red "&[^; ]*;" + +syntax "patch" "\.(patch|diff)$" +color brightgreen "^\+.*" +color green "^\+\+\+.*" +color brightblue "^ .*" +color brightred "^-.*" +color red "^---.*" +color brightyellow "^@@.*" +color magenta "^diff.*" + +syntax "Java source" "\.java$" +color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>" +color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>" +color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>" +color red ""[^\"]*"" +color yellow "\<(true|false|null)\>" +color blue "//.*" +color blue start="/\*" end="\*/" +color brightblue start="/\*\*" end="\*/" +color brightgreen,green " +$" + +syntax "ml" ".*\.([jrs]?html?|xml|sgml?)$" +color white "^.+$" +color green start="<" end=">" +color cyan "<[^> ]+" +color cyan ">" +color yellow start="" +color yellow start="" +color red "&[^;]*;" + +## syntax highlighting in xorg.conf +## +syntax "xorg" "xorg\.conf$" +color brightwhite "(Section|EndSection|Sub[sS]ection|EndSub[sS]ection)" +# keywords +color yellow "[^A-Za-z0-9](Identifier|Screen|InputDevice|Option|RightOf|LeftOf|Driver|RgbPath|FontPath|ModulePath|Load|VendorName|ModelName|BoardName|BusID|Device|Monitor|DefaultDepth|View[pP]ort|Depth|Virtual|Modes|Mode|DefaultColorDepth|Modeline|\+vsync|\+hsync|HorizSync|VertRefresh)[^A-Za-z0-9]" +# numbers +color magenta "[0-9]" +# strings +color green ""(\\.|[^\"])*"" +# comments +color white "#.*" + + +# Generic conf/rc/sh file syntax highlighting +############################################# +syntax "conf/rc/sh" "conf$|rc$|sh$" +color white ".+" +color green "^#.*" + +# .nanorc syntax highlighting +############################# +syntax "nanorc" "[\.]*nanorc$" +color white "^ *(set|unset).*$" +color cyan "^ *(set|unset) (autoindent|backup|const|cut|fill|keypad|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|regexp|smooth|speller|suspend|tabsize|tempfile|historylog|view)" +color brightwhite "^ *syntax [^ ]*" +color brightblue "^ *set\>" "^ *unset\>" "^ *syntax\>" +color white "^ *color\>.*" +color yellow "^ *color (bright)?(black|blue|cyan|green|magenta|red|white|yellow)\>" +color magenta "^ *color\>" +color green "^#.*$" + +# grub.conf syntax highlighting +############################### +syntax "grub.conf" "grub\.conf" +color cyan "(^default.+|^timeout.+)" +color red "^title.+" +color yellow "(initrd.+|kernel.+|root.+)" +color green "^#.*" diff --git a/etc/nsswitch.conf b/base/etc/nsswitch.conf similarity index 100% rename from etc/nsswitch.conf rename to base/etc/nsswitch.conf diff --git a/base/etc/pacman.conf b/base/etc/pacman.conf new file mode 100644 index 000000000..f16db97d6 --- /dev/null +++ b/base/etc/pacman.conf @@ -0,0 +1,64 @@ +# +# /etc/pacman.conf +# +# See the pacman manpage for option directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# Testing is disabled by default. To enable, uncomment the following +# two lines. You can add preferred servers immediately after the header, +# and they will be used before the default mirrors. +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +# Add your preferred servers here, they will be used first +Include = /etc/pacman.d/mirrorlist + +[extra] +# Add your preferred servers here, they will be used first +Include = /etc/pacman.d/mirrorlist + +[community] +# Add your preferred servers here, they will be used first +Include = /etc/pacman.d/mirrorlist + +# Unstable is disabled by default. To enable, uncomment the following +# two lines. You can add preferred servers immediately after the header, +# and they will be used before the default mirrors. +#[unstable] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/etc/passwd b/base/etc/passwd similarity index 100% rename from etc/passwd rename to base/etc/passwd diff --git a/etc/profile b/base/etc/profile similarity index 100% rename from etc/profile rename to base/etc/profile diff --git a/base/etc/protocols b/base/etc/protocols new file mode 100644 index 000000000..becf37f11 --- /dev/null +++ b/base/etc/protocols @@ -0,0 +1,147 @@ +# $NetBSD: protocols,v 1.12.4.1 2006/12/02 12:58:19 bouyer Exp $ +# +# Internet (IP) protocols +# +# originally from: @(#)protocols 8.1 (Berkeley) 6/9/93 +# see http://www.iana.org/assignments/protocol-numbers +# +ip 0 IP # internet protocol, pseudo protocol number +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'') +st 5 ST # ST datagram mode +tcp 6 TCP # transmission control protocol +cbt 7 CBT +egp 8 EGP # exterior gateway protocol +igp 9 IGP # any private interior gateway protocol +bbn-rcc-mon 10 BBN-RCC-MON # BBN RCC Monitoring +nvp-ii 11 NVP-II # Network Voice Protocol +pup 12 PUP # PARC universal packet protocol +argus 13 ARGUS +emcon 14 EMCON +xnet 15 XNET # Cross net debugger +chaos 16 CHAOS # Chaos +udp 17 UDP # user datagram protocol +mux 18 MUX # Multiplexing +dcn-meas 19 DCN-MEAS # DCN Measurement Subsystems +hmp 20 HMP # host monitoring protocol +prm 21 PRM # Packet Radio Measurement +xns-idp 22 XNS-IDP # Xerox NS IDP +trunk-1 23 TRUNK-1 +trunk-2 24 TRUNK-2 +leaf-1 25 LEAF-1 +leaf-2 26 LEAF-2 +rdp 27 RDP # reliable data protocol +irtp 28 IRTP # Internet Reliable Transaction +iso-tp4 29 ISO-TP4 # ISO Transport Protocol Class 4 +netblt 30 NETBLT # Bulk Data Transfer Protocol +mfe-nsp 31 MFE-NSP # MFE Network Services Protocol +merit-inp 32 MERIT-INP # MERIT Internodal Protocol +sep 33 SEP # Sequential Exchange Protocol +3pc 34 3PC # Third Party Connect Protocol +idpr 35 IDPR # Inter-Domain Policy Routing Protocol +xtp 36 XTP # Xpress Transfer Protocol +ddp 37 DDP # Datagram Delivery Protocol +idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport +tp++ 39 TP++ # TP++ Transport Protocol +il 40 IL # IL Transport Protocol +ipv6 41 IPv6 # Internet Protocol, version 6 +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 +idrp 45 IDRP # Inter-Domain Routing Protocol +rsvp 46 RSVP # Resource ReSerVation Protocol +gre 47 GRE # General Routing Encapsulation +mhrp 48 MHRP # Mobile Host Routing Protocol +bna 49 BNA +esp 50 ESP # Encapsulating Security Payload +ah 51 AH # Authentication Header +i-nlsp 52 I-NLSP # Integrated Net Layer Security +swipe 53 SWIPE # IP with Encryption +narp 54 NARP # NBMA Address Resolution Protocol +mobile 55 MOBILE # IP Mobility (IP tunneling) +tlsp 56 TLSP # Transport Layer Security Protocol +skip 57 SKIP +ipv6-icmp 58 IPv6-ICMP icmp6 # ICMP version 6 +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 +sat-expak 64 SAT-expak # SATNET and Backroom EXPAK +kryptolan 65 KRYPTOLAN # Kryptolan +rvd 66 RVD # MIT Remote Virtual Disk Protocol +ippc 67 IPPC # Internet Pluribus Packet Core +# 68 # any distributed file system +sat-mon 69 SAT-MON # SATNET Monitoring +visa 70 VISA # VISA Protocol +ipcv 71 IPCV # Internet Packet Core Utility +cpnx 72 CPNX # Computer Protocol Network Executive +cphb 73 CPHB # Computer Protocol Heart Beat +wsn 74 WSN # Wang Span Network +pvp 75 PVP # Packet Video Protocol +br-sat-mon 76 BR-SAT-MON # Backroom SATNET Monitoring +sun-nd 77 SUN-ND # SUN ND PROTOCOL-Temporary +wb-mon 78 WB-MON # WIDEBAND Monitoring +wb-expak 79 WB-EXPAK # WIDEBAND EXPAK +iso-ip 80 ISO-IP # ISO Internet Protocol +vmtp 81 VMTP # Versatile Message Transport +secure-vmtp 82 SECURE-VMTP # SECURE-VMTP +vines 83 VINES +ttp 84 TTP +nsfnet-igp 85 NSFNET-IGP +dgp 86 DGP # Dissimilar Gateway Protocol +tcf 87 TCF +eigrp 88 EIGRP # Enhanced Inter-Gateway Routing Protocol +ospf 89 OSPFIGP # Open Shortest Path First IGP +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 +micp 95 MICP # Mobile Internetworking Control Pro. +scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro. +etherip 97 ETHERIP # Ethernet-within-IP Encapsulation +encap 98 ENCAP # RFC1241 encapsulation +# 99 # any private encryption scheme +gmtp 100 GMTP +ifmp 101 IFMP # Ipsilon Flow Management Protocol +pnni 102 PNNI # PNNI over IP +pim 103 PIM # Protocol Independent Multicast +aris 104 ARIS +scps 105 SCPS +qnx 106 QNX +a/n 107 A/N # Active Networks +ipcomp 108 IPCOMP # IP Payload Compression Protocol +snp 109 SNP # Sitara Networks Protocol +compaq-peer 110 Compaq-Peer # Compaq Peer Protocol +ipx-in-ip 111 IPX-in-IP # IPX in IP +carp 112 CARP vrrp # Virtual Router Redundancy Protocol +pgm 113 PGM # PGM Reliable Transport Protocol +# 114 # any 0-hop protocol +l2tp 115 L2TP # Layer Two Tunneling Protocol +ddx 116 DDX # D-II Data Exchange (DDX) +iatp 117 IATP # Interactive Agent Transfer Protocol +stp 118 STP # Schedule Transfer Protocol +srp 119 SRP # SpectraLink Radio Protocol +uti 120 UTI +smp 121 SMP # Simple Message Protocol +sm 122 SM +ptp 123 PTP # Performance Transparency Protocol +isis 124 ISIS # IS-IS over IPv4 +fire 125 FIRE +crtp 126 CRTP # Combat Radio Transport Protocol +crudp 127 CRUDP # Combat Radio User Datagram +sscopmce 128 SSCOPMCE +iplt 129 IPLT +sps 130 SPS # Secure Packet Shield +pipe 131 PIPE # Private IP Encapsulation within IP +sctp 132 SCTP # Stream Control Transmission Protocol +fc 133 FC # Fibre Channel +rsvp-e2e-ignore 134 RSVP-E2E-IGNORE +mobility-header 135 MOBILITY-HEADER # Mobility Header +udplite 136 UDPLite +mpls-in-ip 137 MPLS-in-IP # MPLS in IP +# 138-254 # Unassigned +# 255 # Reserved diff --git a/etc/rc.conf b/base/etc/rc.conf similarity index 100% rename from etc/rc.conf rename to base/etc/rc.conf diff --git a/base/etc/rc.local b/base/etc/rc.local new file mode 100755 index 000000000..58dca28ef --- /dev/null +++ b/base/etc/rc.local @@ -0,0 +1,5 @@ +#!/bin/sh +# +# /etc/rc.local: Local multi-user startup script. +# +# End of file diff --git a/etc/rc.shutdown b/base/etc/rc.shutdown similarity index 100% rename from etc/rc.shutdown rename to base/etc/rc.shutdown diff --git a/etc/rc.sysinit b/base/etc/rc.sysinit similarity index 100% rename from etc/rc.sysinit rename to base/etc/rc.sysinit diff --git a/etc/securetty b/base/etc/securetty similarity index 100% rename from etc/securetty rename to base/etc/securetty diff --git a/base/etc/services b/base/etc/services new file mode 100644 index 000000000..19f3bfd9d --- /dev/null +++ b/base/etc/services @@ -0,0 +1,387 @@ +# $NetBSD: services,v 1.84 2007/02/10 19:39:02 reed Exp $ +# +# Network services, Internet style +# +# Note that it is presently the policy of IANA to assign a single well-known +# port number for both TCP and UDP; hence, most entries here have two entries +# even if the protocol doesn't support UDP operations. +# Updated from RFC 1340, ``Assigned Numbers'' (July 1992). Not all ports +# are included, only the more common ones. +# The latest IANA list is available from: +# http://www.iana.org/assignments/port-numbers +# +# from: @(#)services 8.2 (Berkeley) 3/26/95 +# +tcpmux 1/tcp # TCP port multiplexer (RFC1078) +echo 7/tcp +echo 7/udp +discard 9/tcp sink null +discard 9/udp sink null +systat 11/tcp users +daytime 13/tcp +daytime 13/udp +netstat 15/tcp +qotd 17/tcp quote +msp 18/tcp # message send protocol +msp 18/udp +chargen 19/tcp ttytst source +chargen 19/udp ttytst source +ftp-data 20/tcp # default ftp data port +ftp 21/tcp # File Transfer Protocol +ssh 22/tcp # Secure Shell +ssh 22/udp +telnet 23/tcp +# 24 - private +smtp 25/tcp mail +# 26 - unassigned +time 37/tcp timserver +time 37/udp timserver +rlp 39/udp resource # resource location +nameserver 42/tcp name # IEN 116 +whois 43/tcp nicname +tacacs 49/tcp # Login Host Protocol (TACACS) +tacacs 49/udp # Login Host Protocol (TACACS) +domain 53/tcp # name-domain server +domain 53/udp +mtp 57/tcp # deprecated +bootps 67/tcp # BOOTP server +bootps 67/udp +bootpc 68/tcp # BOOTP client +bootpc 68/udp +tftp 69/udp # Trivial File Transfer Protocol +gopher 70/tcp # Internet Gopher +gopher 70/udp +rje 77/tcp netrjs +finger 79/tcp +http 80/tcp www www-http # WorldWideWeb HTTP +http 80/udp www www-http # HyperText Transfer Protocol +link 87/tcp ttylink +kerberos 88/tcp krb5 # Kerberos v5 +kerberos 88/udp +supdup 95/tcp +# 100 - reserved +hostnames 101/tcp hostname # usually from sri-nic +iso-tsap 102/tcp tsap # part of ISODE. +csnet-ns 105/tcp cso-ns # also used by CSO name server +csnet-ns 105/udp cso-ns +poppass 106/tcp poppassd +rtelnet 107/tcp # Remote Telnet +rtelnet 107/udp +pop2 109/tcp postoffice # POP version 2 +pop2 109/udp +pop3 110/tcp # POP version 3 +pop3 110/udp +sunrpc 111/tcp rpcbind # Remote Procedure Call +sunrpc 111/udp rpcbind +auth 113/tcp authentication tap ident +sftp 115/tcp +uucp-path 117/tcp +sqlserv 118/tcp # SQL Services +nntp 119/tcp readnews untp # USENET News Transfer Protocol +erpc 121/udp # Encore Expedited Remote Pro.Call +ntp 123/tcp +ntp 123/udp # Network Time Protocol +netbios-ns 137/tcp # NETBIOS Name Service +netbios-ns 137/udp +netbios-dgm 138/tcp # NETBIOS Datagram Service +netbios-dgm 138/udp +netbios-ssn 139/tcp # NETBIOS session service +netbios-ssn 139/udp +imap 143/tcp imap2 imap4 # Internet Message Access Protocol +imap 143/udp imap2 imap4 +snmp 161/udp # Simple Net Mgmt Proto +snmp-trap 162/udp snmptrap # Traps for SNMP +cmip-man 163/tcp # ISO mgmt over IP (CMOT) +cmip-man 163/udp +cmip-agent 164/tcp +cmip-agent 164/udp +mailq 174/tcp # zmailer MTA +xdmcp 177/tcp # X Display Mgr. Control Proto +xdmcp 177/udp +nextstep 178/tcp NeXTStep NextStep # NeXTStep window +nextstep 178/udp NeXTStep NextStep # server +bgp 179/tcp # Border Gateway Proto. +bgp 179/udp +prospero 191/tcp # Cliff Neuman's Prospero +prospero 191/udp +irc 194/tcp # Internet Relay Chat +irc 194/udp +smux 199/tcp # SNMP Unix Multiplexer +smux 199/udp +at-rtmp 201/tcp # AppleTalk routing +at-rtmp 201/udp +at-nbp 202/tcp # AppleTalk name binding +at-nbp 202/udp +at-echo 204/tcp # AppleTalk echo +at-echo 204/udp +at-zis 206/tcp # AppleTalk zone information +at-zis 206/udp +z3950 210/tcp wais # NISO Z39.50 database +z3950 210/udp wais +ipx 213/tcp # IPX +ipx 213/udp +imap3 220/tcp # Interactive Mail Access +imap3 220/udp # Protocol v3 +rsh-spx 222/tcp # Berkeley rshd with SPX auth +ulistserv 372/tcp # UNIX Listserv +ulistserv 372/udp +nip 376/tcp # Amiga Envoy Net Inquiry Prot. +nip 376/udp # Amiga Envoy Net Inquiry Prot. +ldap 389/tcp # Lightweight Directory Access Protocol +ldap 389/udp # Lightweight Directory Access Protocol +imsp 406/tcp # Interactive Mail Support Protocol +imsp 406/udp # Interactive Mail Support Protocol +microsoft-ds 445/tcp # Microsoft-DS +microsoft-ds 445/udp # Microsoft-DS +isakmp 500/tcp # IPsec Key Management (ISAKMP/Oakley) +isakmp 500/udp # IPsec Key Management (ISAKMP/Oakley) +ripng 521/tcp # RIP for IPv6 +ripng 521/udp # RIP for IPv6 +submission 587/tcp # Message Submission +submission 587/udp # Message Submission +acap 674/tcp # Application Configuration Access Protocol +acap 674/udp # Application Configuration Access Protocol +silc 706/tcp # Secure Internet Live Conferencing +silc 706/udp # Secure Internet Live Conferencing +iscsi-rfc 860/tcp # RFC port used by iSCSI targets + +# +# UNIX specific services +# +exec 512/tcp # Remote execution +biff 512/udp comsat # Biff the dog +login 513/tcp # Remote login +who 513/udp whod # Remote who +shell 514/tcp cmd # Remote command shell +syslog 514/udp # System logger +printer 515/tcp spooler # line printer spooler +talk 517/udp # Talk protocols +ntalk 518/udp +route 520/udp router routed # RIP +timed 525/udp timeserver +tempo 526/tcp newdate +courier 530/tcp rpc +conference 531/tcp chat +netnews 532/tcp +netwall 533/udp # -for emergency broadcasts +uucp 540/tcp uucpd # uucp daemon +rdist 541/tcp rdistd # rdist daemon +afpovertcp 548/tcp # AppleshareIP protocol +afpovertcp 548/udp # AppleshareIP protocol +remotefs 556/tcp rfs_server rfs # Brunhoff remote filesystem +# +webster 765/tcp # Network dictionary +webster 765/udp +rsync 873/tcp # rsync +rsync 873/udp # rsync + +# +# Various SSL services +# +https 443/tcp # http protocol over TLS/SSL +https 443/udp # http protocol over TLS/SSL +smtps 465/tcp # smtp protocol over TLS/SSL +smtps 465/udp # smtp protocol over TLS/SSL +nntps 563/tcp # nntp protocol over TLS/SSL (was snntp) +nntps 563/udp # nntp protocol over TLS/SSL (was snntp) +ldaps 636/tcp # ldap protocol over TLS/SSL (was sldap) +ldaps 636/udp # ldap protocol over TLS/SSL (was sldap) +ftps-data 989/tcp # ftp protocol, data, over TLS/SSL +ftps-data 989/udp # ftp protocol, data, over TLS/SSL +ftps 990/tcp # ftp protocol, control, over TLS/SSL +ftps 990/udp # ftp protocol, control, over TLS/SSL +telnets 992/tcp # telnet protocol over TLS/SSL +telnets 992/udp # telnet protocol over TLS/SSL +imaps 993/tcp # imap4 protocol over TLS/SSL +imaps 993/udp # imap4 protocol over TLS/SSL +ircs 994/tcp # irc protocol over TLS/SSL +ircs 994/udp # irc protocol over TLS/SSL +pop3s 995/tcp # pop3 protocol over TLS/SSL (was spop3) +pop3s 995/udp # pop3 protocol over TLS/SSL (was spop3) + +# +# From ``Assigned Numbers'': +# +#> The Registered Ports are not controlled by the IANA and on most systems +#> can be used by ordinary user processes or programs executed by ordinary +#> users. +# +#> Ports are used in the TCP [45,106] to name the ends of logical +#> connections which carry long term conversations. For the purpose of +#> providing services to unknown callers, a service contact port is +#> defined. This list specifies the port used by the server process as its +#> contact port. While the IANA can not control uses of these ports it +#> does register or list uses of these ports as a convenience to the +#> community. +# +ingreslock 1524/tcp +ingreslock 1524/udp +prospero-np 1525/tcp # Prospero non-privileged +prospero-np 1525/udp +radius 1812/tcp +radius 1812/udp +radius-acct 1813/tcp radacct +radius-acct 1813/udp radacct +cvspserver 2401/tcp +cvspserver 2401/udp +isns 3205/tcp # iSNS server port +isns 3205/udp # iSNS server port +iscsi 3260/tcp # Draft port used by iSCSI targets + # Will be moved to 860 after RFC + # is published +iscsi-target 3260/tcp # Draft port used by iSCSI targets +mysql 3306/tcp # MySQL +mysql 3306/udp # MySQL +svn 3690/tcp # Subversion +svn 3690/udp # Subversion +rfe 5002/tcp # Radio Free Ethernet +rfe 5002/udp # Actually uses UDP only +sip 5060/tcp # SIP +sip 5060/udp # SIP +postgresql 5432/tcp # PostgreSQL Database +postgresql 5432/udp # PostgreSQL Database + +# +# Kerberos (Project Athena/MIT) services +# (note that kerberos @ port 88 is sorted in the list above) +# +kpasswd 464/udp # Kerberos password changing protocol +kpasswd 464/tcp # Kerberos password changing protocol +klogin 543/tcp # Kerberos `rlogin' +kshell 544/tcp krcmd # Kerberos `rsh' +ekshell 545/tcp # Encrypted kshell +kerberos-adm 749/tcp # Kerberos `kadmin' (v5) +kerberos-iv 750/udp kdc kerberos4 # Kerberos (server) udp +kerberos-iv 750/tcp kdc kerberos4 # Kerberos (server) tcp +kerberos-master 751/udp # Kerberos admin server udp +kerberos-master 751/tcp # Kerberos admin server tcp +hprop 754/tcp # Heimdal KDC database propagation +krbupdate 760/tcp kreg # BSD Kerberos registration +kpwd 761/tcp # old BSD Kerberos `passwd' + # (formerly `kpasswd') +kpop 1109/tcp # Kerberos POP server +eklogin 2105/tcp # Kerberos encrypted `rlogin' +ekshell2 2106/tcp # Encrypted kshell - UColorado, Boulder +krb524 4444/udp # krb5 -> krb4 ticket conversion + +# +# AFS services +# +# IANA has these registered as both UDP and TCP, but only the UDP +# ports are used by the protocol +# +afs3-fileserver 7000/tcp # file server itself +afs3-fileserver 7000/udp # file server itself +afs3-callback 7001/tcp # callbacks to cache managers +afs3-callback 7001/udp # callbacks to cache managers +afs3-prserver 7002/tcp # users & groups database +afs3-prserver 7002/udp # users & groups database +afs3-vlserver 7003/tcp # volume location database +afs3-vlserver 7003/udp # volume location database +afs3-kaserver 7004/tcp # AFS/Kerberos authentication service +afs3-kaserver 7004/udp # AFS/Kerberos authentication service +afs3-volser 7005/tcp # volume management server +afs3-volser 7005/udp # volume management server +afs3-errors 7006/tcp # error interpretation service +afs3-errors 7006/udp # error interpretation service +afs3-bos 7007/tcp # basic overseer process +afs3-bos 7007/udp # basic overseer process +afs3-update 7008/tcp # server-to-server updater +afs3-update 7008/udp # server-to-server updater +afs3-rmtsys 7009/tcp # remote cache manager service +afs3-rmtsys 7009/udp # remote cache manager service +afs3-resserver 7010/tcp # MR-AFS residence server +afs3-resserver 7010/udp # MR-AFS residence server +afs3-remio 7011/tcp # MR-AFS remote IO server +afs3-remio 7011/udp # MR-AFS remote IO server + +# +# Unofficial but necessary (for NetBSD) services +# +supfilesrv 871/tcp # SUP server +supfiledbg 1127/tcp # SUP debugging + +# +# other common ports +# +swat 901/tcp # Samba Web Administration Tool +sieve 2000/tcp # RFC3028 +lmtp 2003/tcp # Local Mail Transfer Protocol +nfs 2049/udp nfsd # Sun NFS +nfs 2049/tcp nfsd # Sun NFS +suucp 4031/tcp # UUCP over SSL +suucp 4031/udp # UUCP over SSL +fud 4201/udp # Cyrus IMAP finger-like service +X11 6000/tcp # X Window System +ircd 6667/tcp # Often used IRC port (also see 194) +sstp-2 9801/tcp # Sakura Script Transfer Protocol-2 +sstp-2 9801/udp # Sakura Script Transfer Protocol-2 +amanda 10080/udp # Amanda +kamanda 10081/udp # Amanda with Kerberos +amandaidx 10082/tcp # Amanda index server +amidxtape 10083/tcp # Amanda dump image server +italk 12345/tcp # Italk Chat System +italk 12345/udp # Italk Chat System +hunt 26740/udp # multi-player/multi-host maze-wars + +# +# Netatalk (in-kernel Appletalk) services +# Note: The running kernel must be configured with "options NETATALK" +# and software not included in NetBSD, such as Netatalk version 1.4b2 +# or later, must be used to take advantage of these services. +# +rtmp 1/ddp # Routing Table Maintenance Protocol +nbp 2/ddp # Name Binding Protocol +echo 4/ddp # AppleTalk Echo Protocol +zip 6/ddp # Zone Information Protocol + +# Iana registered Coda filesystem port numbers +rpc2portmap 369/tcp +rpc2portmap 369/udp # Coda portmapper +codaauth2 370/tcp +codaauth2 370/udp # Coda authentication server + +# Iana registered dict port numbers +dict 2628/tcp # DICT +dict 2628/udp + +venus 2430/tcp # codacon port +venus 2430/udp # Venus callback/wbc interface +venus-se 2431/tcp # tcp side effects +venus-se 2431/udp # udp sftp side effect +codasrv 2432/tcp # not used +codasrv 2432/udp # server port +codasrv-se 2433/tcp # tcp side effects +codasrv-se 2433/udp # udp sftp side effect + +# Iana registered ports commonly found in security logs +epmap 135/tcp # DCE endpoint resolution +epmap 135/udp # DCE endpoint resolution +rtsp 554/tcp # Real Time Stream Control Protocol +rtsp 554/udp # Real Time Stream Control Protocol +socks 1080/tcp # Socks +socks 1080/udp # Socks +kazaa 1214/tcp # KAZAA +kazaa 1214/udp # KAZAA +ms-sql-s 1433/tcp # Microsoft-SQL-Server +ms-sql-s 1433/udp # Microsoft-SQL-Server +ms-sql-m 1434/tcp # Microsoft-SQL-Monitor +ms-sql-m 1434/udp # Microsoft-SQL-Monitor +ms-wbt-server 3389/tcp # MS WBT Server +ms-wbt-server 3389/udp # MS WBT Server +terabase 4000/tcp icq # used for both Terabase and ICQ +terabase 4000/udp icq # used for both Terabase and ICQ +radmin-port 4899/tcp # RAdmin Port +radmin-port 4899/udp # RAdmin Port +mdns 5353/tcp # Multicast DNS +mdns 5353/udp # Multicast DNS +http-alt 8080/tcp # HTTP Alternate (see port 80) +http-alt 8080/udp # HTTP Alternate (see port 80) + +# Zephyr services +zephyr-clt 2103/udp # Zephyr serv-hm connection +zephyr-hm 2104/udp # Zephyr hostmanager +zephyr-hm-srv 2105/udp # Zephyr hm-serv connection + +# sane daemon support +sane-port 6566/tcp # SANE network scanner daemon \ No newline at end of file diff --git a/etc/shadow b/base/etc/shadow similarity index 100% rename from etc/shadow rename to base/etc/shadow diff --git a/etc/shells b/base/etc/shells similarity index 83% rename from etc/shells rename to base/etc/shells index fe8a43701..ff9e38348 100644 --- a/etc/shells +++ b/base/etc/shells @@ -4,6 +4,6 @@ /bin/sh /bin/bash - +/bin/dash # End of file diff --git a/etc/syslog-ng.conf b/base/etc/syslog-ng.conf similarity index 100% rename from etc/syslog-ng.conf rename to base/etc/syslog-ng.conf diff --git a/etc/virc b/base/etc/virc similarity index 90% rename from etc/virc rename to base/etc/virc index 24fdf2f87..e0af3346a 100644 --- a/etc/virc +++ b/base/etc/virc @@ -1,7 +1,7 @@ " An example for a vimrc file. " " Maintainer: Bram Moolenaar -" Last change: 2002 Sep 19 +" Last change: 2006 Nov 16 " " To use it, copy it to " for Unix and OS/2: ~/.vimrc @@ -32,10 +32,6 @@ set incsearch " do incremental searching " Don't use Ex mode, use Q for formatting map Q gq -" This is an alternative that also works in block mode, but the deleted -" text is lost and it only works for putting the current register. -"vnoremap p "_dp - " Switch syntax highlighting on, when the terminal has colors " Also switch on highlighting the last used search pattern. if &t_Co > 2 || has("gui_running") @@ -64,7 +60,7 @@ if has("autocmd") " (happens when dropping a file on gvim). autocmd BufReadPost * \ if line("'\"") > 0 && line("'\"") <= line("$") | - \ exe "normal g`\"" | + \ exe "normal! g`\"" | \ endif augroup END @@ -74,3 +70,4 @@ else set autoindent " always set autoindenting on endif " has("autocmd") + diff --git a/etc/init b/base/init similarity index 75% rename from etc/init rename to base/init index 2c3de1f3a..49a51d2f5 100755 --- a/etc/init +++ b/base/init @@ -20,24 +20,16 @@ export kinit_params="" export root="" echo "/sbin/modprobe" > /proc/sys/kernel/modprobe -for cmd in $CMDLINE; do - case "$cmd" in +for cmd in ${CMDLINE}; do + case "${cmd}" in \#*) break ;; # ignore everything after a # in the commandline - [0123456Ss]) export runlevel="$cmd" ;; + [0123456Ss]) export runlevel="${cmd}" ;; single) export runlevel="S" ;; #some people use 'single' - # replace can cause problems for the following entries - # These should only be applied to the lefthand side of the expression - # until we find a fix hardcode the stuff here. - root=*) export "${cmd}";; - md=*) export "${cmd}" ;; - crypto=*) export "${cmd}" ;; - resume2=*) export "${cmd}" ;; - ip=*) export "${cmd}" ;; - nfsaddrs=*) export "${cmd}" ;; - nfsroot=*) export "${cmd}" ;; + #Allow "init=X" to pass-through + init=*) kinit_params="${kinit_params} ${cmd}" ;; # only export stuff that does work with dash :) - *=*) cmd="$(replace "${cmd}" '.' '_')" - cmd="$(replace "${cmd}" '-' '_')" + *=*) cmd="$(replace -s= "${cmd}" '.' '_')" + cmd="$(replace -s= "${cmd}" '-' '_')" export "${cmd}" ;; *) cmd="$(replace "${cmd}" '.' '_')" @@ -47,42 +39,42 @@ for cmd in $CMDLINE; do esac done -if [ "x${disablehooks}" != "x" ]; then +if [ -n "${disablehooks}" ]; then for d in $(replace "${disablehooks}" ','); do export "hook_${d}=disabled" done fi -if [ "x${disablemodules}" != "x" ]; then +if [ -n "${disablemodules}" ]; then for d in $(replace "${disablemodules}" ','); do export "mod_${d}=disabled" done fi -if [ "x${earlymodules}" != "x" ]; then +if [ -n "${earlymodules}" ]; then for m in $(replace "${earlymodules}" ','); do - /sbin/modprobe -q $m > /dev/null 2>&1 + /sbin/modprobe -q ${m} > /dev/null 2>&1 done fi . /config -for m in $MODULES; do +for m in ${MODULES}; do TST="" eval "TST=\$mod_${m}" if [ "${TST}" != "disabled" ]; then - /bin/modprobe -q $m > /dev/null 2>&1 + /bin/modprobe -q ${m} > /dev/null 2>&1 fi done if [ -e "/hooks" ]; then - for h in $HOOKS; do + for h in ${HOOKS}; do TST="" eval "TST=\$hook_${h}" if [ "${TST}" != "disabled" ]; then - run_hook () { msg "$h: no run function defined"; } - if [ -e "/hooks/$h" ]; then - . /hooks/$h + run_hook () { msg "${h}: no run function defined"; } + if [ -e "/hooks/${h}" ]; then + . /hooks/${h} msg ":: Running Hook [${h}]" run_hook fi @@ -118,7 +110,7 @@ else eval $(/bin/parseblock "${root}") if [ "${BLOCKNAME}" = "unknown" ]; then echo "ERROR: Failed to parse block device name for '${root}'" - elif [ "x${BLOCKDEVICE}" = "x" ]; then + elif [ -z "${BLOCKDEVICE}" ]; then echo "ERROR: Failed to parse block device ids for '${root}'" else export root="${BLOCKNAME}" @@ -144,8 +136,8 @@ else fi #Special handling is udev is running udevpid=$(/bin/minips -C udevd -o pid=) - if [ "x${udevpid}" != "x" ]; then - /bin/kill -9 $udevpid + if [ -n "${udevpid}" ]; then + /bin/kill -9 ${udevpid} /bin/sleep 0.01 fi exec /bin/kinit -- "root=${root}" ${kinit_params} "${runlevel}" > /dev/null 2>&1 diff --git a/etc/capi4k/capi.conf b/capi4k/etc/capi.conf similarity index 100% rename from etc/capi4k/capi.conf rename to capi4k/etc/capi.conf diff --git a/etc/conf.d/cpufreq_conf.d b/cpufreq/etc/conf.d/cpufreq similarity index 100% rename from etc/conf.d/cpufreq_conf.d rename to cpufreq/etc/conf.d/cpufreq diff --git a/etc/append-message-syslinux b/etc/append-message-syslinux index 448d07ddf..b01e0da7d 100644 --- a/etc/append-message-syslinux +++ b/etc/append-message-syslinux @@ -1,9 +1,5 @@ Available boot options (no input will boot the install/rescue system): - 'arch ' to boot the install/rescue system. - 'arch root=/dev/??? ' to boot into an existing system. -- If you have trouble with IDE drives, use the "ide-legacy" boot option -- If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp may be useful - 'memtest' to start the memory test program memtest86+. - - +- For troubleshooting and other options press the F2 key. diff --git a/etc/append-message-syslinux-lowmem b/etc/append-message-syslinux-lowmem index 98e3681f8..2b59c26f0 100644 --- a/etc/append-message-syslinux-lowmem +++ b/etc/append-message-syslinux-lowmem @@ -4,9 +4,5 @@ Available boot options (no input will boot the install/rescue system): - 'lowmem ' to boot the 64MB RAM install system. - 'lowmem root=/dev/??? ' to boot into an existing 64MB RAM system. -- If you have trouble with IDE drives, use the "ide-legacy" boot option. -- If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp may be useful. - 'memtest' to start the memory test program memtest86+. - - +- For troubleshooting and other options press the F2 key. diff --git a/etc/append-options b/etc/append-options new file mode 100644 index 000000000..2e365f2aa --- /dev/null +++ b/etc/append-options @@ -0,0 +1,4 @@ +Arch Linux options and troubleshooting: +- If you have trouble with IDE drives, use the "ide-legacy" boot option +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp may be useful. diff --git a/etc/conf.d/nfs_conf.d b/etc/conf.d/nfs_conf.d deleted file mode 100644 index 56c18a969..000000000 --- a/etc/conf.d/nfs_conf.d +++ /dev/null @@ -1,12 +0,0 @@ -# Number of servers to be started up by default -NFSD_OPTS=8 - -# Options to pass to rpc.mountd -# e.g. MOUNTDOPTS="-p 32767" -MOUNTD_OPTS="--no-nfs-version 1 --no-nfs-version 2" -# Options to pass to rpc.statd -# e.g. STATDOPTS="-p 32765 -o 32766" -STATD_OPTS="" -# Options to pass to rpc.rquotad -# e.g. RQUOTADOPTS="-p 32764" -RQUOTAD_OPTS="" diff --git a/etc/fstab b/etc/fstab deleted file mode 100644 index 354cbc51d..000000000 --- a/etc/fstab +++ /dev/null @@ -1,5 +0,0 @@ -none /proc proc defaults 0 0 -none /sys sysfs defaults 0 0 -none /dev/pts devpts defaults 0 0 -none /dev/shm tmpfs defaults 0 0 - diff --git a/etc/hosts b/etc/hosts deleted file mode 100644 index 74be5f94a..000000000 --- a/etc/hosts +++ /dev/null @@ -1,4 +0,0 @@ - -# For loopbacking. -127.0.0.1 localhost.localdomain localhost - diff --git a/etc/iptables/simple_firewall.rules b/etc/iptables/simple_firewall.rules deleted file mode 100644 index 27edc16c7..000000000 --- a/etc/iptables/simple_firewall.rules +++ /dev/null @@ -1,6 +0,0 @@ -*filter -:INPUT DROP [0:0] -:FORWARD DROP [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -i eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT -COMMIT diff --git a/etc/isolinux-lowmem.cfg b/etc/isolinux-lowmem.cfg index 5096f9e3b..6fd6d4e3e 100644 --- a/etc/isolinux-lowmem.cfg +++ b/etc/isolinux-lowmem.cfg @@ -1,6 +1,8 @@ prompt @@PROMPT@@ timeout @@TIMEOUT@@ display boot.msg +F1 boot.msg +F2 options.msg default arch label arch kernel vmlinuz diff --git a/etc/isolinux.cfg b/etc/isolinux.cfg index 4e03fe8a6..9bf630173 100644 --- a/etc/isolinux.cfg +++ b/etc/isolinux.cfg @@ -1,6 +1,8 @@ prompt @@PROMPT@@ timeout @@TIMEOUT@@ display boot.msg +F1 boot.msg +F2 options.msg default arch label arch kernel vmlinuz diff --git a/etc/nanorc b/etc/nanorc deleted file mode 100644 index f1f7c60cf..000000000 --- a/etc/nanorc +++ /dev/null @@ -1,35 +0,0 @@ -set autoindent -set const -set historylog -set nowrap -set smooth -set regexp -set fill 72 -#set multibuffer -set suspend - -# Generic conf/rc/sh file syntax highlighting -############################################# -syntax "conf/rc/sh" "conf$|rc$|sh$" -color white ".+" -color green "^#.*" - -# .nanorc syntax highlighting -############################# -syntax "nanorc" "[\.]*nanorc$" -color white "^ *(set|unset).*$" -color cyan "^ *(set|unset) (autoindent|backup|const|cut|fill|keypad|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|regexp|smooth|speller|suspend|tabsize|tempfile|historylog|view)" -color brightwhite "^ *syntax [^ ]*" -color brightblue "^ *set\>" "^ *unset\>" "^ *syntax\>" -color white "^ *color\>.*" -color yellow "^ *color (bright)?(black|blue|cyan|green|magenta|red|white|yellow)\>" -color magenta "^ *color\>" -color green "^#.*$" - -# grub.conf syntax highlighting -############################### -syntax "grub.conf" "grub\.conf" -color cyan "(^default.+|^timeout.+)" -color red "^title.+" -color yellow "(initrd.+|kernel.+|root.+)" -color green "^#.*" diff --git a/etc/pacman/community.pacman b/etc/pacman/community.pacman deleted file mode 100644 index 425c5ddca..000000000 --- a/etc/pacman/community.pacman +++ /dev/null @@ -1,69 +0,0 @@ -# -# The Community tree. These are community-maintained packages from the -# Arch User Repository (http://aur.archlinux.org) - -[community] -# North America -Server = ftp://ftp.archlinux.org/community/os/i686 -Server = ftp://ftp.nethat.com/pub/linux/archlinux/community/os/i686 -Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/community/os/i686 -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/community/os/i686 -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/community/os/i686 -Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/community/os/i686 - -# Europe -# -Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/community/os/i686 -# - Belgium -Server = ftp://ftp.belnet.be/packages/archlinux/community/os/i686 -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/community/os/i686 -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/community/os/i686 -# - France -Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/community/os/i686 -Server = ftp://mir1.archlinuxfr.org/archlinux/community/os/i686 -Server = ftp://mir2.archlinuxfr.org/archlinux/community/os/i686 -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/community/os/i686 -Server = http://mirrors.jakimowicz.com/archlinux/community/os/i686 -# - Germany -Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/community/os/i686 -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/community/os/i686 -# - Great Britain -Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/community/os/i686 -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/community/os/i686 -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/community/os/i686 -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/community/os/i686 -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/community/os/i686 -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/community/os/i686 -# - Norway -Server= ftp://mirror.djzradio.net/archlinux/community/os/i686 -# - Poland -Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/community/os/i686 -Server = ftp://mirror.icis.pcz.pl/archlinux/community/os/i686 -# - Portugal -Server = ftp://gul.est.ips.pt/repos/archlinux/community/os/i686 -Server = ftp://cesium.di.uminho.pt/pub/archlinux/community/os/i686 -Server = http://darkstar.ist.utl.pt/archlinux/community/os/i686 -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/community/os/i686 -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/linux/distributions/archlinux/community/os/i686 -Server = ftp://ftp.gigabit.nu/community/os/i686 -# - Switzerland -Server = ftp://archlinux.puzzle.ch/community/os/i686 -# - Ukraine -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/community/os/i686 - -# Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/community/os/i686 - -# Asia -Server = ftp://cle.linux.org.tw/pub/ArchLinux/community/os/i686 -Server = http://mirror.vxmatrix.net/ArchLinux/community/os/i686 -Server = http://dxmirror.vxmatrix.net/ArchLinux/community/os/i686 -Server = http://cncmirror.vxmatrix.net/ArchLinux/community/os/i686 diff --git a/etc/pacman/core.pacman b/etc/pacman/core.pacman deleted file mode 100644 index 709d2c20f..000000000 --- a/etc/pacman/core.pacman +++ /dev/null @@ -1,68 +0,0 @@ -# -# core: Arch Linux core repository -# -[core] -# North America -Server = ftp://ftp.archlinux.org/core/os/i686 -Server = ftp://ftp.nethat.com/pub/linux/archlinux/core/os/i686 -Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/core/os/i686 -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/core/os/i686 -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/core/os/i686 -Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/core/os/i686 - -# Europe -# -Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/core/os/i686 -# - Belgium -Server = ftp://ftp.belnet.be/packages/archlinux/core/os/i686 -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/core/os/i686 -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/core/os/i686 -# - France -Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/core/os/i686 -Server = ftp://mir1.archlinuxfr.org/archlinux/core/os/i686 -Server = ftp://mir2.archlinuxfr.org/archlinux/core/os/i686 -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/core/os/i686 -Server = http://mirrors.jakimowicz.com/archlinux/core/os/i686 -# - Germany -Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/core/os/i686 -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/core/os/i686 -# - Great Britain -Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/core/os/i686 -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/core/os/i686 -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/core/os/i686 -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/core/os/i686 -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/core/os/i686 -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/core/os/i686 -# - Norway -Server= ftp://mirror.djzradio.net/archlinux/core/os/i686 -# - Poland -Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/core/os/i686 -Server = ftp://mirror.icis.pcz.pl/archlinux/core/os/i686 -# - Portugal -Server = ftp://gul.est.ips.pt/repos/archlinux/core/os/i686 -Server = ftp://cesium.di.uminho.pt/pub/archlinux/core/os/i686 -Server = http://darkstar.ist.utl.pt/archlinux/core/os/i686 -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/core/os/i686 -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/linux/distributions/archlinux/core/os/i686 -Server = ftp://ftp.gigabit.nu/core/os/i686 -# - Switzerland -Server = ftp://archlinux.puzzle.ch/core/os/i686 -# - Ukraine -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/core/os/i686 - -# Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/core/os/i686 - -# Asia -Server = ftp://cle.linux.org.tw/pub/ArchLinux/core/os/i686 -Server = http://mirror.vxmatrix.net/ArchLinux/core/os/i686 -Server = http://dxmirror.vxmatrix.net/ArchLinux/core/os/i686 -Server = http://cncmirror.vxmatrix.net/ArchLinux/core/os/i686 \ No newline at end of file diff --git a/etc/pacman/current.pacman b/etc/pacman/current.pacman deleted file mode 100644 index f96e96abd..000000000 --- a/etc/pacman/current.pacman +++ /dev/null @@ -1,68 +0,0 @@ -# -# CURRENT: Arch Linux core repository -# -[current] -# North America -Server = ftp://ftp.archlinux.org/current/os/i686 -Server = ftp://ftp.nethat.com/pub/linux/archlinux/current/os/i686 -Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/current/os/i686 -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/current/os/i686 -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/current/os/i686 -Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/current/os/i686 - -# Europe -# -Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/current/os/i686 -# - Belgium -Server = ftp://ftp.belnet.be/packages/archlinux/current/os/i686 -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/current/os/i686 -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/current/os/i686 -# - France -Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/current/os/i686 -Server = ftp://mir1.archlinuxfr.org/archlinux/current/os/i686 -Server = ftp://mir2.archlinuxfr.org/archlinux/current/os/i686 -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/current/os/i686 -Server = http://mirrors.jakimowicz.com/archlinux/current/os/i686 -# - Germany -Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/current/os/i686 -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/current/os/i686 -# - Great Britain -Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/current/os/i686 -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/current/os/i686 -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/current/os/i686 -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/current/os/i686 -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/current/os/i686 -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/current/os/i686 -# - Norway -Server= ftp://mirror.djzradio.net/archlinux/current/os/i686 -# - Poland -Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/current/os/i686 -Server = ftp://mirror.icis.pcz.pl/archlinux/current/os/i686 -# - Portugal -Server = ftp://gul.est.ips.pt/repos/archlinux/current/os/i686 -Server = ftp://cesium.di.uminho.pt/pub/archlinux/current/os/i686 -Server = http://darkstar.ist.utl.pt/archlinux/current/os/i686 -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/current/os/i686 -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/linux/distributions/archlinux/current/os/i686 -Server = ftp://ftp.gigabit.nu/current/os/i686 -# - Switzerland -Server = ftp://archlinux.puzzle.ch/current/os/i686 -# - Ukraine -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/current/os/i686 - -# Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/current/os/i686 - -# Asia -Server = ftp://cle.linux.org.tw/pub/ArchLinux/current/os/i686 -Server = http://mirror.vxmatrix.net/ArchLinux/current/os/i686 -Server = http://dxmirror.vxmatrix.net/ArchLinux/current/os/i686 -Server = http://cncmirror.vxmatrix.net/ArchLinux/current/os/i686 \ No newline at end of file diff --git a/etc/pacman/extra.pacman b/etc/pacman/extra.pacman deleted file mode 100644 index f00dadc57..000000000 --- a/etc/pacman/extra.pacman +++ /dev/null @@ -1,68 +0,0 @@ -# -# EXTRA: Arch Linux secondary repository -# -[extra] -# North America -Server = ftp://ftp.archlinux.org/extra/os/i686 -Server = ftp://ftp.nethat.com/pub/linux/archlinux/extra/os/i686 -Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/extra/os/i686 -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/extra/os/i686 -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/extra/os/i686 -Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/extra/os/i686 - -# Europe -# -Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/extra/os/i686 -# - Belgium -Server = ftp://ftp.belnet.be/packages/archlinux/extra/os/i686 -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/extra/os/i686 -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/extra/os/i686 -# - France -Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/extra/os/i686 -Server = ftp://mir1.archlinuxfr.org/archlinux/extra/os/i686 -Server = ftp://mir2.archlinuxfr.org/archlinux/extra/os/i686 -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/extra/os/i686 -Server = http://mirrors.jakimowicz.com/archlinux/extra/os/i686 -# - Germany -Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/extra/os/i686 -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/extra/os/i686 -# - Great Britain -Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/extra/os/i686 -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/extra/os/i686 -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/extra/os/i686 -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/extra/os/i686 -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/extra/os/i686 -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/extra/os/i686 -# - Norway -Server= ftp://mirror.djzradio.net/archlinux/extra/os/i686 -# - Poland -Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/extra/os/i686 -Server = ftp://mirror.icis.pcz.pl/archlinux/extra/os/i686 -# - Portugal -Server = ftp://gul.est.ips.pt/repos/archlinux/extra/os/i686 -Server = ftp://cesium.di.uminho.pt/pub/archlinux/extra/os/i686 -Server = http://darkstar.ist.utl.pt/archlinux/extra/os/i686 -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/extra/os/i686 -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/linux/distributions/archlinux/extra/os/i686 -Server = ftp://ftp.gigabit.nu/extra/os/i686 -# - Switzerland -Server = ftp://archlinux.puzzle.ch/extra/os/i686 -# - Ukraine -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/extra/os/i686 - -# Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/extra/os/i686 - -# Asia -Server = ftp://cle.linux.org.tw/pub/ArchLinux/extra/os/i686 -Server = http://mirror.vxmatrix.net/ArchLinux/extra/os/i686 -Server = http://dxmirror.vxmatrix.net/ArchLinux/extra/os/i686 -Server = http://cncmirror.vxmatrix.net/ArchLinux/extra/os/i686 diff --git a/etc/pacman/pacman.conf.pacman b/etc/pacman/pacman.conf.pacman deleted file mode 100644 index 9939cec44..000000000 --- a/etc/pacman/pacman.conf.pacman +++ /dev/null @@ -1,52 +0,0 @@ -# -# /etc/pacman.conf -# -# NOTE: If you find a mirror that is geographically close to you, please -# move it to the top of the server list, so pacman will choose it -# first. -# -# To re-sort your mirror lists by ping/traceroute results, use the -# /usr/bin/sortmirrors script. It requires the "netselect" package. -# - -# See the pacman manpage for option directives - -# -# GENERAL OPTIONS -# -[options] -LogFile = /var/log/pacman.log -HoldPkg = pacman glibc -XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here. -# - local/custom mirrors can be added here or in separate files -# - -#[testing] -#Server = ftp://ftp.archlinux.org/testing/os/i686 - -[core] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/core - -[extra] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/extra - -#[unstable] -# Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/unstable - -#[community] -# Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/community - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#Server = file:///home/custompkgs - diff --git a/etc/pacman/release.pacman b/etc/pacman/release.pacman deleted file mode 100644 index 3dd4e6733..000000000 --- a/etc/pacman/release.pacman +++ /dev/null @@ -1,73 +0,0 @@ -# -# The Release tree. This tree is a snapshot view of the Current (core) -# repository as it was when the last ISO was released. -# -# If you use the RELEASE tree, you should disable the CURRENT -# tree to avoid conflicts. -# - -[release] -# North America -Server = ftp://ftp.archlinux.org/release/os/i686 -Server = ftp://ftp.nethat.com/pub/linux/archlinux/release/os/i686 -Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/release/os/i686 -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/release/os/i686 -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/release/os/i686 -Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/release/os/i686 - -# Europe -# -Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/release/os/i686 -# - Belgium -Server = ftp://ftp.belnet.be/packages/archlinux/release/os/i686 -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/release/os/i686 -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/release/os/i686 -# - France -Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/release/os/i686 -Server = ftp://mir1.archlinuxfr.org/archlinux/release/os/i686 -Server = ftp://mir2.archlinuxfr.org/archlinux/release/os/i686 -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/release/os/i686 -Server = http://mirrors.jakimowicz.com/archlinux/release/os/i686 -# - Germany -Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/release/os/i686 -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/release/os/i686 -# - Great Britain -Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/release/os/i686 -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/release/os/i686 -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/release/os/i686 -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/release/os/i686 -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/release/os/i686 -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/release/os/i686 -# - Norway -Server= ftp://mirror.djzradio.net/archlinux/release/os/i686 -# - Poland -Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/release/os/i686 -Server = ftp://mirror.icis.pcz.pl/archlinux/release/os/i686 -# - Portugal -Server = ftp://gul.est.ips.pt/repos/archlinux/release/os/i686 -Server = ftp://cesium.di.uminho.pt/pub/archlinux/release/os/i686 -Server = http://darkstar.ist.utl.pt/archlinux/release/os/i686 -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/release/os/i686 -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/linux/distributions/archlinux/release/os/i686 -Server = ftp://ftp.gigabit.nu/release/os/i686 -# - Switzerland -Server = ftp://archlinux.puzzle.ch/release/os/i686 -# - Ukraine -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/release/os/i686 - -# Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/release/os/i686 - -# Asia -Server = ftp://cle.linux.org.tw/pub/ArchLinux/release/os/i686 -Server = http://mirror.vxmatrix.net/ArchLinux/release/os/i686 -Server = http://dxmirror.vxmatrix.net/ArchLinux/release/os/i686 -Server = http://cncmirror.vxmatrix.net/ArchLinux/release/os/i686 diff --git a/etc/pacman/unstable.pacman b/etc/pacman/unstable.pacman deleted file mode 100644 index d34f71d8f..000000000 --- a/etc/pacman/unstable.pacman +++ /dev/null @@ -1,68 +0,0 @@ -# -# UNSTABLE: Development/Unstable branches of software -# -[unstable] -# North America -Server = ftp://ftp.archlinux.org/unstable/os/i686 -Server = ftp://ftp.nethat.com/pub/linux/archlinux/unstable/os/i686 -Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/unstable/os/i686 -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/unstable/os/i686 -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/unstable/os/i686 -Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/unstable/os/i686 - -# Europe -# -Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/unstable/os/i686 -# - Belgium -Server = ftp://ftp.belnet.be/packages/archlinux/unstable/os/i686 -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/unstable/os/i686 -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/unstable/os/i686 -# - France -Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/unstable/os/i686 -Server = ftp://mir1.archlinuxfr.org/archlinux/unstable/os/i686 -Server = ftp://mir2.archlinuxfr.org/archlinux/unstable/os/i686 -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/unstable/os/i686 -Server = http://mirrors.jakimowicz.com/archlinux/unstable/os/i686 -# - Germany -Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/unstable/os/i686 -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/unstable/os/i686 -# - Great Britain -Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/unstable/os/i686 -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/unstable/os/i686 -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/unstable/os/i686 -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/unstable/os/i686 -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/unstable/os/i686 -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/unstable/os/i686 -# - Norway -Server= ftp://mirror.djzradio.net/archlinux/unstable/os/i686 -# - Poland -Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/unstable/os/i686 -Server = ftp://mirror.icis.pcz.pl/archlinux/unstable/os/i686 -# - Portugal -Server = ftp://gul.est.ips.pt/repos/archlinux/unstable/os/i686 -Server = ftp://cesium.di.uminho.pt/pub/archlinux/unstable/os/i686 -Server = http://darkstar.ist.utl.pt/archlinux/unstable/os/i686 -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/unstable/os/i686 -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/linux/distributions/archlinux/unstable/os/i686 -Server = ftp://ftp.gigabit.nu/unstable/os/i686 -# - Switzerland -Server = ftp://archlinux.puzzle.ch/unstable/os/i686 -# - Ukraine -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/unstable/os/i686 - -# Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/unstable/os/i686 - -# Asia -Server = ftp://cle.linux.org.tw/pub/ArchLinux/unstable/os/i686 -Server = http://mirror.vxmatrix.net/ArchLinux/unstable/os/i686 -Server = http://dxmirror.vxmatrix.net/ArchLinux/unstable/os/i686 -Server = http://cncmirror.vxmatrix.net/ArchLinux/unstable/os/i686 diff --git a/etc/protocols b/etc/protocols deleted file mode 100644 index e6463f1a9..000000000 --- a/etc/protocols +++ /dev/null @@ -1,18 +0,0 @@ -# -# protocols This file describes the various protocols that are -# available from the TCP/IP subsystem. It should be -# consulted instead of using the numbers in the ARPA -# include files, or, worse, just guessing them. -# - -ip 0 IP # internet protocol, pseudo protocol number -icmp 1 ICMP # internet control message protocol -igmp 2 IGMP # internet group multicast protocol -ggp 3 GGP # gateway-gateway protocol -tcp 6 TCP # transmission control protocol -pup 12 PUP # PARC universal packet protocol -udp 17 UDP # user datagram protocol -idp 22 IDP # WhatsThis? -raw 255 RAW # RAW IP interface - -# End. diff --git a/etc/rc.local b/etc/rc.local deleted file mode 100755 index 0b0fdaacd..000000000 --- a/etc/rc.local +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -# /etc/rc.local: Local startup script. -# -# End of file diff --git a/etc/remote/exports b/etc/remote/exports deleted file mode 100644 index c9f93c6a8..000000000 --- a/etc/remote/exports +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/exports -# -# See exports(5) for a description. - -# use exportfs -arv to reread -#/export 192.168.1.10(rw,no_root_squash) - - diff --git a/etc/services b/etc/services deleted file mode 100644 index 4dd12453d..000000000 --- a/etc/services +++ /dev/null @@ -1,182 +0,0 @@ -# -# Network services, Internet style -# -# Note that it is presently the policy of IANA to assign a single well-known -# port number for both TCP and UDP; hence, most entries here have two entries -# even if the protocol doesn't support UDP operations. -# Updated from RFC 1340, ``Assigned Numbers'' (July 1992). Not all ports -# are included, only the more common ones. -# -# from: @(#)services 5.8 (Berkeley) 5/9/91 -# $Id$ -# -tcpmux 1/tcp # TCP port service multiplexer -echo 7/tcp -echo 7/udp -discard 9/tcp sink null -discard 9/udp sink null -systat 11/tcp users -daytime 13/tcp -daytime 13/udp -netstat 15/tcp -qotd 17/tcp quote -msp 18/tcp # message send protocol -msp 18/udp # message send protocol -chargen 19/tcp ttytst source -chargen 19/udp ttytst source -ftp 21/tcp -# 22 - unassigned -telnet 23/tcp -# 24 - private -smtp 25/tcp mail -# 26 - unassigned -time 37/tcp timserver -time 37/udp timserver -rlp 39/udp resource # resource location -nameserver 42/tcp name # IEN 116 -whois 43/tcp nicname -domain 53/tcp nameserver # name-domain server -domain 53/udp nameserver -mtp 57/tcp # deprecated -bootps 67/tcp # BOOTP server -bootps 67/udp -bootpc 68/tcp # BOOTP client -bootpc 68/udp -tftp 69/udp -gopher 70/tcp # Internet Gopher -gopher 70/udp -rje 77/tcp netrjs -finger 79/tcp -www 80/tcp http # WorldWideWeb HTTP -www 80/udp # HyperText Transfer Protocol -link 87/tcp ttylink -kerberos 88/tcp krb5 # Kerberos v5 -kerberos 88/udp -supdup 95/tcp -# 100 - reserved -hostnames 101/tcp hostname # usually from sri-nic -iso-tsap 102/tcp tsap # part of ISODE. -csnet-ns 105/tcp cso-ns # also used by CSO name server -csnet-ns 105/udp cso-ns -rtelnet 107/tcp # Remote Telnet -rtelnet 107/udp -pop2 109/tcp postoffice # POP version 2 -pop2 109/udp -pop3 110/tcp # POP version 3 -pop3 110/udp -sunrpc 111/tcp -sunrpc 111/udp -auth 113/tcp tap ident authentication -sftp 115/tcp -uucp-path 117/tcp -nntp 119/tcp readnews untp # USENET News Transfer Protocol -ntp 123/tcp -ntp 123/udp # Network Time Protocol -netbios-ns 137/tcp # NETBIOS Name Service -netbios-ns 137/udp -netbios-dgm 138/tcp # NETBIOS Datagram Service -netbios-dgm 138/udp -netbios-ssn 139/tcp # NETBIOS session service -netbios-ssn 139/udp -imap2 143/tcp # Interim Mail Access Proto v2 -imap2 143/udp -snmp 161/udp # Simple Net Mgmt Proto -snmp-trap 162/udp snmptrap # Traps for SNMP -cmip-man 163/tcp # ISO mgmt over IP (CMOT) -cmip-man 163/udp -cmip-agent 164/tcp -cmip-agent 164/udp -xdmcp 177/tcp # X Display Mgr. Control Proto -xdmcp 177/udp -nextstep 178/tcp NeXTStep NextStep # NeXTStep window -nextstep 178/udp NeXTStep NextStep # server -bgp 179/tcp # Border Gateway Proto. -bgp 179/udp -prospero 191/tcp # Cliff Neuman's Prospero -prospero 191/udp -irc 194/tcp # Internet Relay Chat -irc 194/udp -smux 199/tcp # SNMP Unix Multiplexer -smux 199/udp -at-rtmp 201/tcp # AppleTalk routing -at-rtmp 201/udp -at-nbp 202/tcp # AppleTalk name binding -at-nbp 202/udp -at-echo 204/tcp # AppleTalk echo -at-echo 204/udp -at-zis 206/tcp # AppleTalk zone information -at-zis 206/udp -z3950 210/tcp wais # NISO Z39.50 database -z3950 210/udp wais -ipx 213/tcp # IPX -ipx 213/udp -imap3 220/tcp # Interactive Mail Access -imap3 220/udp # Protocol v3 -ulistserv 372/tcp # UNIX Listserv -ulistserv 372/udp -# -# UNIX specific services -# -exec 512/tcp -biff 512/udp comsat -login 513/tcp -who 513/udp whod -shell 514/tcp cmd # no passwords used -syslog 514/udp -printer 515/tcp spooler # line printer spooler -talk 517/udp -ntalk 518/udp -route 520/udp router routed # RIP -timed 525/udp timeserver -tempo 526/tcp newdate -courier 530/tcp rpc -conference 531/tcp chat -netnews 532/tcp readnews -netwall 533/udp # -for emergency broadcasts -uucp 540/tcp uucpd # uucp daemon -remotefs 556/tcp rfs_server rfs # Brunhoff remote filesystem -klogin 543/tcp # Kerberized `rlogin' (v5) -kshell 544/tcp # Kerberized `rsh' (v5) -kerberos-adm 749/tcp # Kerberos `kadmin' (v5) -# -webster 765/tcp # Network dictionary -webster 765/udp -# -# From ``Assigned Numbers'': -# -#> The Registered Ports are not controlled by the IANA and on most systems -#> can be used by ordinary user processes or programs executed by ordinary -#> users. -# -#> Ports are used in the TCP [45,106] to name the ends of logical -#> connections which carry long term conversations. For the purpose of -#> providing services to unknown callers, a service contact port is -#> defined. This list specifies the port used by the server process as its -#> contact port. While the IANA can not control uses of these ports it -#> does register or list uses of these ports as a convienence to the -#> community. -# -ingreslock 1524/tcp -ingreslock 1524/udp -prospero-np 1525/tcp # Prospero non-privileged -prospero-np 1525/udp -rfe 5002/tcp # Radio Free Ethernet -rfe 5002/udp # Actually uses UDP only -# -# -# Kerberos (Project Athena/MIT) services -# Note that these are for Kerberos v4, and are unofficial. Sites running -# v4 should uncomment these and comment out the v5 entries above. -# -#kerberos 750/udp kdc # Kerberos (server) udp -#kerberos 750/tcp kdc # Kerberos (server) tcp -krbupdate 760/tcp kreg # Kerberos registration -kpasswd 761/tcp kpwd # Kerberos "passwd" -#klogin 543/tcp # Kerberos rlogin -eklogin 2105/tcp # Kerberos encrypted rlogin -#kshell 544/tcp krcmd # Kerberos remote shell -# -# Unofficial but necessary (for NetBSD) services -# -supfilesrv 871/tcp # SUP server -supfiledbg 1127/tcp # SUP debugging diff --git a/etc/udev.rules b/etc/udev.rules deleted file mode 100644 index 8855f2fae..000000000 --- a/etc/udev.rules +++ /dev/null @@ -1,391 +0,0 @@ -# Udev rules for Archlinux by Tobias Powalowski -# -# This ruleset should provide a DevFS-compatible device tree. -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# - -##################################### -# Early rules - begin -##################################### -# wait for sysfs -ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" -##################################### -# Early rules -end -##################################### - -##################################### -###### Hotplug rules - begin -##################################### - -# Modaliases to load -ACTION=="add", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" -# SCSI addon modules -ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod" -ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="14", RUN+="/lib/udev/load-modules.sh sd_mod" -ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[45]", RUN+="/lib/udev/load-modules.sh sr_mod" -ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst" -ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st" -ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st" -ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[23689]", RUN+="/lib/udev/load-modules.sh sg" -ACTION=="add", SUBSYSTEM=="mmc", RUN+="/lib/udev/load-modules.sh mmc_block" - -LABEL="hotplug_driver_loaded" - -# fix ide cdrom detection on old proliant servers -ACTION=="add", SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" - -# FIRMWARE -ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="?*", RUN+="/lib/udev/firmware.sh" -##################################### -##### Hotplug rules - end -##################################### - -##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="/lib/udev/cdrom_id --export $tempnode" -ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="/lib/udev/cdrom_id --export $tempnode" -ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="/lib/udev/cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvd-%b" -ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="/lib/udev/cdsymlinks.sh" -ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="/lib/udev/cdsymlinks.sh" -ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="/lib/udev/cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="/lib/udev/cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="/lib/udev/cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="/lib/udev/cdsymlinks.sh" -##################################### -###### CD/DVD symlinks - end -##################################### - -##################################### -##### PCMCIA rules - begin -##################################### -# PCMCIA devices: -# - -# Very few CIS firmware entries (which we use for matching) -# are so broken that we need to read out random bytes of it -# instead of the manufactor, card or product ID. Then the -# matching is done in userspace. -ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/sbin/pcmcia-check-broken-cis" - -# However, the "weak" matching by func_id is only allowed _after_ modprobe -# returns, so that "strong" matches have a higher priority. -ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'" - -# PCMCIA sockets: -# -# modprobe the pcmcia bus module so that 16-bit PCMCIA devices work -ACTION=="add", SUBSYSTEM=="pcmcia_socket", RUN+="/lib/udev/load-modules.sh pcmcia" - -# if this is a PCMCIA socket which needs a resource database, -# pcmcia-socket-startup sets it up -ACTION=="add", SUBSYSTEM=="pcmcia_socket", RUN+="/sbin/pcmcia-socket-startup" -##################################### -##### PCMCIA rules - end -##################################### - -##################################### -# Permissions and Symlinks - begin -##################################### -# default permissions for all block devices -SUBSYSTEM=="block", GROUP="disk" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for IDE floppy devices -SUBSYSTEMS=="ide", KERNEL=="hd*", ATTRS{media}=="floppy*", NAME{all_partitions}="%k", GROUP="floppy" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="0", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# pty and tty legacy devices -KERNEL=="pty[a-z][a-z,0-9]*", NAME="legacy/%k", OPTIONS="last_rule -KERNEL=="tty[a-z][a-z,0-9]*", NAME="legacy/%k", OPTIONS="last_rule - -# md block devices -KERNEL=="md[0-9]*", NAME="md%n", SYMLINK+="md/%n" - -# device-mapper -KERNEL=="device-mapper", NAME="mapper/control" - -# floppy devices -KERNEL=="fd[0-9]*", NAME="fd%n", SYMLINK+="floppy/%n fd%nu1440 fd%nu720 fd%nh1200 fd%nu360", GROUP="floppy" - -# tty devices -SUBSYSTEM=="tty", GROUP="tty" -KERNEL=="tty[0-9]*", NAME="vc/%n", SYMLINK+="%k" -KERNEL=="ttyS[0-9]*", NAME="tts/%n", SYMLINK+="ttyS%n" -KERNEL=="ttyUSB[0-9]*", NAME="tts/USB%n" - -# vc devices -KERNEL=="vcs", NAME="vcc/0", OPTIONS="last_rule" -KERNEL=="vcs[0-9]*", NAME="vcc/%n", OPTIONS="last_rule" -KERNEL=="vcsa", NAME="vcc/a0", OPTIONS="last_rule" -KERNEL=="vcsa[0-9]*", NAME="vcc/a%n", OPTIONS="last_rule" -KERNEL=="ptmx", MODE="0666", OPTIONS="last_rule -KERNEL=="tty", MODE="0666", OPTIONS="last_rule - -# video devices -SUBSYSTEM=="video4linux", GROUP="video" -KERNEL=="dvb*", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; A=$${K%%%%.*}; D=$${K#*.}; echo dvb/adapter$$A/$$D'", \ - NAME="%c", GROUP="video" -### xorg resets those permissions, adjust your xorg.conf! -KERNEL=="nvidia*", GROUP="video" -KERNEL=="card[0-9]*", NAME="dri/%k", GROUP="video" -KERNEL=="3dfx*", GROUP="video" - -# v4l devices -KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="%k", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="radio[0-9]*", NAME="v4l/radio%n", SYMLINK+="radio%n", GROUP="video" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK+="%k", GROUP="video" -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", SYMLINK+="%k", GROUP="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# i2c devices -KERNEL=="i2c-[0-9]*", NAME="i2c/%n", SYMLINK+="%k" - -# loop devices -KERNEL=="loop[0-9]*", NAME="loop/%n", SYMLINK+="%k" - -# ramdisks -KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k" - -# framebuffer devices -KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video" - -# misc -KERNEL=="rtc*", NAME="misc/%k", SYMLINK+="%k", GROUP="audio", MODE="0664" -KERNEL=="rtc0", SYMLINK+="rtc" -KERNEL=="nvram", NAME="misc/%k", SYMLINK+="%k" -KERNEL=="psaux", NAME="misc/%k", SYMLINK+="%k" -KERNEL=="agpgart", NAME="misc/%k", SYMLINK+="%k" GROUP="video" -KERNEL=="uinput", NAME="misc/%k", SYMLINK+="%k" -KERNEL=="random", MODE="0666" -KERNEL=="urandom", MODE="0666" -KERNEL=="mem", MODE="0640", GROUP="kmem" -KERNEL=="kmem", MODE="0640", GROUP="kmem" -KERNEL=="port", MODE="0640", GROUP="kmem" -KERNEL=="full", MODE="0666" -KERNEL=="null", MODE="0666" -KERNEL=="zero", MODE="0666" -KERNEL=="sgi_fetchop", MODE="0666" -KERNEL=="sonypi", MODE="0666" -KERNEL=="inotify", NAME="misc/%k", SYMLINK+="%k", MODE="0666" -KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid", SYMLINK="%k" -KERNEL=="msr[0-9]*", NAME="cpu/%n/msr", SYMLINK="%k" - -# sound devices -# alsa devices -SUBSYSTEM=="sound", GROUP="audio" -KERNEL=="controlC[0-9]*", NAME="snd/%k" -KERNEL=="hw[CD0-9]*", NAME="snd/%k" -KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k" -KERNEL=="midi[CD0-9]*", NAME="snd/%k" -KERNEL=="timer", NAME="snd/%k" -KERNEL=="seq", NAME="snd/%k" -# oss devices -KERNEL=="audio*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="dmmidi*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="admmidi*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="dsp*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="adsp*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="midi*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="amidi*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="mixer*", NAME="sound/%k", SYMLINK+="%k" -KERNEL=="sequencer*", NAME="sound/%k", SYMLINK+="%k" - -# input devices -KERNEL=="mice", NAME="input/%k", MODE="0644" -KERNEL=="mouse*", NAME="input/%k", MODE="0644" -KERNEL=="event*", NAME="input/%k" -KERNEL=="js*", NAME="input/%k", MODE="0664" -KERNEL=="ts*", NAME="input/%k" -KERNEL=="uinput", NAME="input/%k" - -# USB devices -KERNEL=="hiddev*", NAME="usb/%k" -KERNEL=="auer*", NAME="usb/%k" -KERNEL=="legousbtower*", NAME="usb/%k", MODE="0666" -KERNEL=="dabusb*", NAME="usb/%k" -SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k", GROUP="lp" -SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", ATTRS{product}=="Palm Handheld*", SYMLINK+="pilot" -SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", ATTRS{product}=="palmOne Handheld*", SYMLINK+="pilot" -SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", ATTRS{product}=="Handspring Visor*", SYMLINK+="pilot" - -# printer devices -SUBSYSTEM=="printer", GROUP="lp" - -# netlink devices -KERNEL=="route", NAME="netlink/%k" -KERNEL=="skip", NAME="netlink/%k" -KERNEL=="usersock", NAME="netlink/%k" -KERNEL=="fwmonitor", NAME="netlink/%k" -KERNEL=="tcpdiag", NAME="netlink/%k" -KERNEL=="nflog", NAME="netlink/%k" -KERNEL=="xfrm", NAME="netlink/%k" -KERNEL=="arpd", NAME="netlink/%k" -KERNEL=="route6", NAME="netlink/%k" -KERNEL=="ip6_fw", NAME="netlink/%k" -KERNEL=="dnrtmsg", NAME="netlink/%k" -### ! breaks device creation ! -#KERNEL=="tap*", NAME="netlink/%k" - -# CAPI devices -KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" -KERNEL=="capi*", NAME="capi/%n" - -# Network devices -KERNEL=="tun", NAME="net/%k" - -# IEEE1394 (firewire) devices -KERNEL=="raw1394", NAME="%k", GROUP="video" -KERNEL=="dv1394*", NAME="dv1394/%n", GROUP="video" -KERNEL=="video1394*", NAME="video1394/%n", GROUP="video" - -# raw devices -KERNEL=="raw[0-9]*", NAME="raw/%k" - -# kbd devices -KERNEL=="kbd", MODE="0664" - -# packet devices -KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="optical", MODE="0660" -KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/pktcdvd%n", GROUP="optical", MODE="0660" - -# usbfs-like device nodes, libusb device access -SUBSYSTEM=="usb_device", ACTION=="add", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev};printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0664" - -####################################### -# Permissions and Symlinks - end -####################################### - -####################################### -# Persistant block device stuff - begin -####################################### -# persistent storage links: /dev/{disk,tape}/{by-id,by-uuid,by-label,by-path,by-name} -# scheme based on "Linux persistent device names", 2004, Hannes Reinecke - -# needed like this!!! -ACTION!="add|change", GOTO="persistent_storage_end" - -KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode" -KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst" - -# type 8 devices are "Medium Changers" -KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode" -KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}" - -SUBSYSTEM!="block", GOTO="persistent_storage_end" - -# skip rules for inappropriate block devices -# don't add dm-*!!! -KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|md*", GOTO="persistent_storage_end" - -# never access non-cdrom removable ide devices, the drivers are causing event loops on open() -KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" -KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end" - -# ignore partitions that span the entire disk -ATTR{whole_disk}=="", GOTO="persistent_storage_end" - -# for partitions import parent information -KERNEL=="*[0-9]", IMPORT{parent}="ID_*" - -# by-id (hardware serial number) -KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode" -KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}" -KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" - -KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_SUBSYSTEMS}="ieee1394" -KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", SUBSYSTEMS=="usb", IMPORT{program}="/lib/udev/usb_id --export" -KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode" -KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss" -KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" -KERNEL=="sd*[0-9]|cciss*p[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" - -# libata compat (links like hd*) -KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="/lib/udev/ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result" -KERNEL=="sd*[!0-9]|sr*", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}" -KERNEL=="sd*[0-9]", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}-part%n" - -KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}" -KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" - -# by-path (shortest physical path) -KERNEL=="*[!0-9]|sr*|cciss?c[0-9]d[0-9]", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}" -KERNEL=="*[0-9]|cciss*p[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" -KERNEL=="st*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}" -KERNEL=="sr*|st*", GOTO="persistent_storage_end" - -# by-label/by-uuid (filesystem properties) -KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end" -IMPORT{program}="/lib/udev/vol_id --export $tempnode" -ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" -ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" - -# BIOS Enhanced Disk Device -KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode" -KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}" -KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n" - -LABEL="persistent_storage_end" - -# md links hook into "change" events, when the array becomes available -KERNEL!="md[0-9]*", GOTO="md_end" -ACTION!="add|change", GOTO="md_end" - -ATTR{md/array_state}=="|clear|inactive", GOTO="md_end" -IMPORT{program}="/lib/udev/vol_id --export $tempnode" -OPTIONS="link_priority=100" -ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" -ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" -LABEL="md_end" -# Persistant block device stuff - end -##################################### -# Persistant block device stuff - end -##################################### diff --git a/etc/yaboot/yaboot.conf b/etc/yaboot/yaboot.conf deleted file mode 100644 index 0d6d5a144..000000000 --- a/etc/yaboot/yaboot.conf +++ /dev/null @@ -1,86 +0,0 @@ -## Example yaboot.conf for ybin and yaboot >= 0.6 -## see man yaboot.conf for more details. - -## Change `unconfigured' to your bootstrap partition eg: /dev/hda2 -boot=unconfigured - -## device is the OpenFirmware device path to the disk containing -## kernel images. if your disk is /dev/hda you can find the -## OpenFirmware path by running the command: ofpath /dev/hda DO NOT -## specify a partition number for this! On IBM hardware you can -## generally comment this out. - -device=hd: - -## partition is the partition number where the kernel images are -## located. The kernel images should be on your root filesystem, so -## this is usually the same partition number as your root filesystem. -## so if root = /dev/hda3 (the 3rd partition) then you should have -## partition=3 This *MUST* be set correct or yaboot won't boot! This -## option can be either set globally as shown here, or per image in -## the image= sections - -partition=3 - -## delay is the amount of time in seconds the dual boot menu (if one -## is configured, by the presense of macos, macosx, etc options here) -## will wait before choosing the default OS (GNU/Linux or the value of -## defaultos=). If you omit this then the value of timeout= -## (converted to seconds) will be used. - -delay=10 - -## timeout is the amount of time in tenths of a second that yaboot -## will wait before booting the default kernel image (the first image= -## section in this config file or the value of default=). - -timeout=40 -install=/usr/lib/yaboot/yaboot -magicboot=/usr/lib/yaboot/ofboot - -## Change the default colors, fgcolor is the text color, bgcolor is -## the screen background color. (default: fgcolor=white, bgcolor=black) -#fgcolor=black -#bgcolor=green - -## Password supplied in plaintext, required for yaboot to boot, unless -## restricted is also present (see below). Be sure to -## chmod 600 /etc/yaboot.conf if you set this! - -#password=secret - -## Password supplied as an md5 hash, see above - -#password=$1$saltstrg$HnJ/gcM3oKhNbnzUPgXTD/ - -## A password is only required to boot an image specified here if -## parameters are specified on the command line or if the user enters -## an image is not specified in the configuration file at all (ie. -## arbitrary file load). restricted can also be placed in an image -## section in that case any image not including the restricted keyword -## will be fully password protected. - -#restricted - -## image is the kernel itself, commonly kept in / but also commonly -## found in /boot. Note that /boot should generally not be its own -## partition on powerpcs, its not necessary and complicates things. -## Make sure /boot is on the partition specified by partition= see -## above. /boot should never be an HFS filesystem. You may point -## image= to a symbolic link so long as the symlink does not cross -## partition boundries. - -image=/boot/vmlinux26 - label=Linux - root=/dev/hda3 - initrd=/boot/kernel26.img - append="video=ofonly" - read-only - -image=/boot/vmlinux26 - label=arch-fallback - root=/dev/sda3 - initrd=/boot/kernel26-fallback.img - read-only - - diff --git a/etc/grub/menu.lst b/grub/boot/grub/menu.lst similarity index 100% rename from etc/grub/menu.lst rename to grub/boot/grub/menu.lst diff --git a/hooks/arch_addons b/hooks/arch_addons index 38db2b36c..82a1952d6 100644 --- a/hooks/arch_addons +++ b/hooks/arch_addons @@ -50,8 +50,5 @@ run_hook () echo "Place external addon packages in /packages directory." echo "Place external configs in /config directory." echo "------------------" - echo "Message is displayed 10 seconds ..." - echo "" - sleep 10 fi } diff --git a/hooks/arch_base b/hooks/arch_base index de7ff71b9..835a8f57d 100644 --- a/hooks/arch_base +++ b/hooks/arch_base @@ -11,4 +11,6 @@ run_hook () ln -s /usr/bin/netcat /usr/bin/nc # fix depmod link ln -s /sbin/depmod /bin/depmod + # fix permission on /var/lock + chmod 1777 /var/lock } diff --git a/hooks/arch_base_lowmem b/hooks/arch_base_lowmem index de7ff71b9..835a8f57d 100644 --- a/hooks/arch_base_lowmem +++ b/hooks/arch_base_lowmem @@ -11,4 +11,6 @@ run_hook () ln -s /usr/bin/netcat /usr/bin/nc # fix depmod link ln -s /sbin/depmod /bin/depmod + # fix permission on /var/lock + chmod 1777 /var/lock } diff --git a/hooks/arch_intel_wireless b/hooks/arch_intel_wireless index 15cd4f669..b5b2ca4d8 100644 --- a/hooks/arch_intel_wireless +++ b/hooks/arch_intel_wireless @@ -27,7 +27,5 @@ run_hook () echo "/lib/firmware/LICENSE.ipw2100-fw" echo "By appending intel-wireless to boot prompt you accept those licenses!" echo "--------------------" - echo "Message is displayed 15 seconds ..." - sleep 15 fi } diff --git a/hooks/arch_tiacx_wireless b/hooks/arch_tiacx_wireless new file mode 100644 index 000000000..64d1f6805 --- /dev/null +++ b/hooks/arch_tiacx_wireless @@ -0,0 +1,10 @@ +run_hook () +{ + echo "ARCH_TIACX_WIRELESS USAGE:" + echo "--------------------" + echo " The firmware files for ACX100/111 devices are installed in" + echo " /usr/share/tiacx. Please identify the correct file(s) for your" + echo " device and copy them to /lib/firmware." + echo " See http://acx100.sourceforge.net/wiki/Firmware for details." + echo "--------------------" +} diff --git a/install-lowmem.conf b/install-lowmem.conf index a465c3812..f8de935ee 100644 --- a/install-lowmem.conf +++ b/install-lowmem.conf @@ -14,7 +14,7 @@ FILES="" # # Please change the other hooks only if you know what you are doing. # hooks for lowmem image -HOOKS="arch_lowmem_install arch_acpi arch_bootmessage_lowmem arch_motd_lowmem arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_hwdetect arch_udev ide pata scsi sata usb usbinput arch_raid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses" +HOOKS="arch_lowmem_install arch_acpi arch_bootmessage_lowmem arch_motd_lowmem arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_hwdetect arch_udev ide pata scsi sata usb usbinput arch_raid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses arch_dmraid" # # adding pxelinux hook if mkpxelinux is used. if [ "${RUNPROGRAM}" = "mkpxelinux" ]; then diff --git a/install.conf b/install.conf index 82e769d10..878bf1b13 100644 --- a/install.conf +++ b/install.conf @@ -13,7 +13,7 @@ FILES="" # default is set to ftp install media # # Please change the other hooks only if you know what you are doing. -HOOKS="arch_ftp_install arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_hwdetect arch_udev ide pata scsi sata arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput fw arch_floppy arch_raid arch_lvm2 arch_encrypt arch_filesystems arch_keymap arch_remote arch_cpufreq arch_fb arch_links arch_naim arch_pacman arch_addons arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_intel_wireless" +HOOKS="arch_ftp_install arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_hwdetect arch_udev ide pata scsi sata arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput fw arch_floppy arch_raid arch_lvm2 arch_encrypt arch_filesystems arch_keymap arch_remote arch_cpufreq arch_fb arch_links arch_naim arch_pacman arch_addons arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_intel_wireless arch_dmraid arch_linux_atm arch_tiacx_wireless arch_netcfg" # # adding pxelinux hook if mkpxelinux is used. if [ "${RUNPROGRAM}" = "mkpxelinux" ]; then diff --git a/install/arch_acpi b/install/arch_acpi index 404ebdcff..a68f9e3d6 100644 --- a/install/arch_acpi +++ b/install/arch_acpi @@ -6,7 +6,7 @@ install () BINARIES="" FILES="" - SCRIPT="arch_acpi" + SCRIPT="" } help () diff --git a/install/arch_addons b/install/arch_addons index 143cc9abb..c5d5824ed 100644 --- a/install/arch_addons +++ b/install/arch_addons @@ -6,6 +6,11 @@ install () BINARIES="" FILES="" SCRIPT="arch_addons" + echo "- ARCH_ADDONS USAGE:" >> ${OPTIONSBOOTMESSAGE} + echo " In order to load external addon packages or configs" >> ${OPTIONSBOOTMESSAGE} + echo " into install environment, please append arch-addons to boot prompt." >> ${OPTIONSBOOTMESSAGE} + echo " Place external addon packages in /packages directory." >> ${OPTIONSBOOTMESSAGE} + echo " Place external configs in /config directory." >> ${OPTIONSBOOTMESSAGE} } help () diff --git a/install/arch_base b/install/arch_base index eea0c98ab..606328776 100644 --- a/install/arch_base +++ b/install/arch_base @@ -7,7 +7,12 @@ install () add_dir "/sys" add_dir "/dev" add_dir "/mnt" + add_dir "/media" + add_dir "/media/cdrom" + add_dir "/media/dvd" + add_dir "/media/floppy" add_dir "/tmp" + add_dir "/tmp/install" add_dir "/var/run" add_dir "/var/log" add_dir "/addons" @@ -38,7 +43,7 @@ install () add_file "/sbin/halt" add_file "/sbin/telinit" add_file "/bin/awk" - add_file "/etc/archboot/etc/init" "/init" + add_file "/etc/archboot/base/init" "/init" add_file "/usr/bin/vi" add_file "/bin/dir" add_file "/usr/share/terminfo/l/linux" @@ -58,11 +63,11 @@ install () add_file "/usr/share/vim/syntax/fstab.vim" add_file "/usr/share/vim/filetype.vim" add_file "/etc/rc.d/functions" - add_file "/etc/archboot/etc/rc.conf" "/etc/rc.conf" + add_file "/etc/archboot/base/etc/rc.conf" "/etc/rc.conf" add_file "/etc/rc.d/syslog-ng" ### adding config files of installation system - for i in $(find /etc/archboot/etc/ -maxdepth 1 ! -type d ! -name 'init' ! -name "udev.rules" ! -name "menu.lst" ! -name "isolinux.cfg" ! -name "append-message*"); do + for i in $(find /etc/archboot/base/etc/*); do add_file "$i" "/etc/$(basename $i)" done diff --git a/install/arch_base_lowmem b/install/arch_base_lowmem index fec7472e0..a8c29857a 100644 --- a/install/arch_base_lowmem +++ b/install/arch_base_lowmem @@ -7,7 +7,12 @@ install () add_dir "/sys" add_dir "/dev" add_dir "/mnt" + add_dir "/media" + add_dir "/media/cdrom" + add_dir "/media/dvd" + add_dir "/media/floppy" add_dir "/tmp" + add_dir "/tmp/install" add_dir "/var/run" add_dir "/var/log" add_dir "/addons" @@ -38,15 +43,15 @@ install () add_file "/sbin/halt" add_file "/sbin/telinit" add_file "/bin/awk" - add_file "/etc/archboot/etc/init" "/init" + add_file "/etc/archboot/base/init" "/init" add_file "/bin/dir" add_file "/usr/share/terminfo/l/linux" add_file "/etc/rc.d/functions" - add_file "/etc/archboot/etc/rc.conf" "/etc/rc.conf" + add_file "/etc/archboot/base/etc/rc.conf" "/etc/rc.conf" add_file "/etc/rc.d/syslog-ng" ### adding config files of installation system - for i in $(find /etc/archboot/etc/ -maxdepth 1 ! -type d ! -name 'init' ! -name "udev.rules" ! -name "menu.lst" ! -name "isolinux.cfg" ! -name "append-message*"); do + for i in $(find /etc/archboot/base/etc/*); do add_file "$i" "/etc/$(basename $i)" done diff --git a/install/arch_bootmessage b/install/arch_bootmessage index eb1ddde77..e7b4e55ab 100644 --- a/install/arch_bootmessage +++ b/install/arch_bootmessage @@ -14,6 +14,7 @@ install () echo "Arch Linux" >> ${BOOTMESSAGE} echo "http://www.archlinux.org" >> ${BOOTMESSAGE} echo "Copyright 2002 - 2007 Judd Vinet " >> ${BOOTMESSAGE} + echo "Copyright 2007 - 2008 Aaron Griffin " >> ${BOOTMESSAGE} echo "Distributed under the GNU General Public License (GPL)" >> ${BOOTMESSAGE} echo "" >> ${BOOTMESSAGE} echo "${TITLEMSG} BOOT" >> ${BOOTMESSAGE} @@ -29,6 +30,7 @@ install () [ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE} else [ -s "${APPENDBOOTMESSAGE_SYSLINUX}" ] && cat ${APPENDBOOTMESSAGE_SYSLINUX} >> ${BOOTMESSAGE} + [ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE} fi } diff --git a/install/arch_bootmessage_lowmem b/install/arch_bootmessage_lowmem index bdc45683b..a48543db5 100644 --- a/install/arch_bootmessage_lowmem +++ b/install/arch_bootmessage_lowmem @@ -14,6 +14,7 @@ install () echo "Arch Linux" >> ${BOOTMESSAGE} echo "http://www.archlinux.org" >> ${BOOTMESSAGE} echo "Copyright 2002 - 2007 Judd Vinet " >> ${BOOTMESSAGE} + echo "Copyright 2007 - 2008 Aaron Griffin " >> ${BOOTMESSAGE} echo "Distributed under the GNU General Public License (GPL)" >> ${BOOTMESSAGE} echo "" >> ${BOOTMESSAGE} echo "${TITLEMSG} BOOT" >> ${BOOTMESSAGE} @@ -29,6 +30,7 @@ install () [ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE} else [ -s "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && cat ${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM} >> ${BOOTMESSAGE} + [ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE} fi } diff --git a/install/arch_capi4k b/install/arch_capi4k index e5ed39850..5b08e8dab 100644 --- a/install/arch_capi4k +++ b/install/arch_capi4k @@ -10,7 +10,7 @@ install () add_file "$i" done add_file "/etc/rc.d/capiinit" - add_file "/etc/archboot/etc/capi4k/capi.conf" "/etc/capi.conf" + add_file "/etc/archboot/capi4k/etc/capi.conf" "/etc/capi.conf" } help () diff --git a/install/arch_core_install b/install/arch_core_install index 6874d34c5..d24d6f66a 100644 --- a/install/arch_core_install +++ b/install/arch_core_install @@ -77,8 +77,8 @@ install () for COPY in ${SEARCHCVS};do if ! [ "$(echo ${COPY} | awk -F/ '{print $3}')" = "" ]; then source "${COPY}/PKGBUILD" - cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz ${TEMPDIR}/core/pkg/ - echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz" >> ${TEMPDIR}/core/pkg/packages.txt + cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz ${TEMPDIR}/core/pkg/ + echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz" >> ${TEMPDIR}/core/pkg/packages.txt fi done # generate packages.txt @@ -130,10 +130,10 @@ install () if ! [ "${LOCALSETUP}" = "yes" ]; then if ! [ "${TEMPDIR}" = "" ]; then cp ${GIT_INSTALLER_TREE}/installer/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt - cd ${TEMPDIR}/arch/pkg/setup/ + #cd ${TEMPDIR}/arch/pkg/setup/ #wget ${FTPSERVER}/$(uname -m)/setup/pacman.pkg.tar.gz cd ${TEMPDIR}/core/pkg/ - wget ${FTPSERVER}/$(uname -m)/core.db.tar.gz + snarf ${FTPSERVER}/$(uname -m)/core.db.tar.gz fi else if ! [ "${TEMPDIR}" = "" ]; then diff --git a/install/arch_cpufreq b/install/arch_cpufreq index 992be234f..09291d7e0 100644 --- a/install/arch_cpufreq +++ b/install/arch_cpufreq @@ -7,7 +7,7 @@ install () BINARIES="cpufreq-info cpufreq-set" FILES="" SCRIPT="" - add_file "/etc/archboot/etc/conf.d/cpufreq_conf.d" "/etc/conf.d/cpufreq" + add_file "/etc/archboot/cpufreq/etc/conf.d/cpufreq" "/etc/conf.d/cpufreq" add_file "/etc/rc.d/cpufreq" } diff --git a/install/arch_dmraid b/install/arch_dmraid new file mode 100644 index 000000000..a00f21a81 --- /dev/null +++ b/install/arch_dmraid @@ -0,0 +1,18 @@ +# Created by Tobias Powalowski + +install () +{ + MODULES="" + BINARIES="dmraid" + FILES="" + SCRIPT="" + add_dir "/var/lock/dmraid" + +} + +help () +{ +cat<> ${OPTIONSBOOTMESSAGE} + echo " In order to use those drivers you have to agree to intel's licenses" >> ${OPTIONSBOOTMESSAGE} + echo " and append intel-wireless to boot prompt." >> ${OPTIONSBOOTMESSAGE} + echo " License files for the drivers are located here:" >> ${OPTIONSBOOTMESSAGE} + echo " /usr/share/licenses/iwlwifi-4965-ucode/LICENSE" >> ${OPTIONSBOOTMESSAGE} + echo " /usr/share/licenses/iwlwifi-3945-ucode/LICENSE" >> ${OPTIONSBOOTMESSAGE} + echo " /lib/firmware/LICENSE.ipw2200-fw" >> ${OPTIONSBOOTMESSAGE} + echo " /lib/firmware/LICENSE.ipw2100-fw" >> ${OPTIONSBOOTMESSAGE} + echo " By appending intel-wireless to boot prompt you accept those licenses!" >> ${OPTIONSBOOTMESSAGE} } help () diff --git a/install/arch_iptables b/install/arch_iptables index 8aea89cd4..5f7acceb4 100644 --- a/install/arch_iptables +++ b/install/arch_iptables @@ -8,9 +8,9 @@ install () SCRIPT="" add_file "/etc/rc.d/iptables" add_file "/etc/rc.d/ip6tables" - add_file "/etc/archboot/etc/conf.d/iptables_conf.d" "/etc/conf.d/iptables" - add_file "/etc/archboot/etc/iptables/empty.rules" "/etc/iptables/empty.rules" - add_file "/etc/archboot/etc/iptables/simple_firewall.rules" "/etc/iptables/simple_firewall.rules" + add_file "/etc/archboot/iptables/etc/conf.d/iptables" "/etc/conf.d/iptables" + add_file "/etc/archboot/iptables/etc/iptables/empty.rules" "/etc/iptables/empty.rules" + add_file "/etc/archboot/iptables/etc/iptables/simple_firewall.rules" "/etc/iptables/simple_firewall.rules" } diff --git a/install/arch_isdn b/install/arch_isdn index af9fc1036..1f9805648 100644 --- a/install/arch_isdn +++ b/install/arch_isdn @@ -7,12 +7,12 @@ install () BINARIES="hisaxctrl icnctrl imon imontty ipppd ipppstats isdnctrl isdnlog mkzonedb pcbitctl isdnconf isdnrate isdnrep" FILES="" SCRIPT="" - add_file "/etc/archboot/etc/isdn/callerid.conf" "/etc/isdn/callerid.conf" - add_file "/etc/archboot/etc/isdn/isdn.conf" "/etc/isdn/isdn.conf" - add_file "/etc/archboot/etc/isdn/isdnlog.isdnctrl0.options" "/etc/isdn/isdnlog.isdnctrl0.options" - add_file "/etc/archboot/etc/isdn/isdnlog.users" "/etc/isdn/isdnlog.users" - add_file "/etc/archboot/etc/isdn/rate.conf" "/etc/isdn/rate.conf" - add_file "/etc/archboot/etc/isdn/stop" "/etc/isdn/stop" + add_file "/etc/archboot/isdn/etc/isdn/callerid.conf" "/etc/isdn/callerid.conf" + add_file "/etc/archboot/isdn/etc/isdn/isdn.conf" "/etc/isdn/isdn.conf" + add_file "/etc/archboot/isdn/etc/isdn/isdnlog.isdnctrl0.options" "/etc/isdn/isdnlog.isdnctrl0.options" + add_file "/etc/archboot/isdn/etc/isdn/isdnlog.users" "/etc/isdn/isdnlog.users" + add_file "/etc/archboot/isdn/etc/isdn/rate.conf" "/etc/isdn/rate.conf" + add_file "/etc/archboot/isdn/etc/isdn/stop" "/etc/isdn/stop" } help () diff --git a/install/arch_kexec b/install/arch_kexec index f674cd564..8a37a2cee 100644 --- a/install/arch_kexec +++ b/install/arch_kexec @@ -7,7 +7,7 @@ install () FILES="" SCRIPT="" add_file "/etc/rc.d/kexec" - add_file "/etc/archboot/etc/conf.d/kexec_conf.d" "/etc/conf.d/kexec" + add_file "/etc/archboot/kexec/etc/conf.d/kexec" "/etc/conf.d/kexec" } help () diff --git a/install/arch_lilo b/install/arch_lilo index 28380ea23..880a63034 100644 --- a/install/arch_lilo +++ b/install/arch_lilo @@ -6,7 +6,7 @@ install () BINARIES="lilo" FILES="" SCRIPT="" - add_file "/etc/archboot/etc/lilo/lilo.conf" "/etc/lilo.conf" + add_file "/etc/archboot/lilo/etc/lilo.conf" "/etc/lilo.conf" } help () diff --git a/install/arch_linux_atm b/install/arch_linux_atm new file mode 100644 index 000000000..cc25d8acc --- /dev/null +++ b/install/arch_linux_atm @@ -0,0 +1,18 @@ +# Created by Tobias Powalowski + +install () +{ + MODULES="" + BINARIES="aread atmdiag atmdump awrite saaldump sonetdiag ttcp_atm atmaddr atmarp atmarpd atmloop atmsigd atmtcp bus enitune esi ilmid lecs les mpcd zeppelin zntune" + FILES="" + SCRIPT="" + add_dir "/etc/ppp/peers/plugins" + add_file "/etc/archboot/linux_atm/etc/atmsigd.conf" "/etc/atmsigd.conf" +} + +help () +{ +cat< + +install () +{ + MODULES="" + BINARIES="" + FILES="" + SCRIPT="" + for i in /usr/lib/network/*; do + add_file $i + done + add_dir "/var/run/network/interfaces" + add_dir "/var/run/network/profiles" + add_file "/usr/bin/netcfg-auto-wireless" + add_file "/usr/bin/netcfg-menu" + add_files "usr/bin/netcfg2" + for i in /etc/network.d/examples/*; do + add_file $i + done + add_file "/etc/rc.d/net-profiles" + add_file "/etc/rc.d/net-rename" + add_file "/etc/archboot/netcfg/etc/iftab" "/etc/iftab" +} + +help () +{ +cat< + +install () +{ + MODULES="" + + BINARIES="" + FILES="" + SCRIPT="arch_tiacx_wireless" + # add firmware files + for i in $(find /usr/share/tiacx/ ! -type d); do + add_file $i + done + echo "- ARCH_TIACX_WIRELESS USAGE:" >> ${OPTIONSBOOTMESSAGE} + echo " The firmware files for ACX100/111 devices are installed in" >> ${OPTIONSBOOTMESSAGE} + echo " /usr/share/tiacx. Please identify the correct file(s) for your" >> ${OPTIONSBOOTMESSAGE} + echo " device and copy them to /lib/firmware." >> ${OPTIONSBOOTMESSAGE} + echo " See http://acx100.sourceforge.net/wiki/Firmware for details." >> ${OPTIONSBOOTMESSAGE} +} + +help () +{ +cat< server +# STATD_OPTS="-p 32765 -o 32766" -> client +STATD_OPTS="" + +# Options to pass to sm-notify +# e.g. SMNOTIFY_OPTS="-p 32764" +SMNOTIFY_OPTS="" + diff --git a/remote/etc/conf.d/sshd b/remote/etc/conf.d/sshd new file mode 100644 index 000000000..5ce7c0079 --- /dev/null +++ b/remote/etc/conf.d/sshd @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sshd +# +SSHD_ARGS="" diff --git a/etc/exports b/remote/etc/exports similarity index 100% rename from etc/exports rename to remote/etc/exports diff --git a/etc/remote/hosts.allow b/remote/etc/hosts.allow similarity index 100% rename from etc/remote/hosts.allow rename to remote/etc/hosts.allow diff --git a/etc/remote/hosts.deny b/remote/etc/hosts.deny similarity index 70% rename from etc/remote/hosts.deny rename to remote/etc/hosts.deny index db6c8a96e..efcce18ea 100644 --- a/etc/remote/hosts.deny +++ b/remote/etc/hosts.deny @@ -2,6 +2,6 @@ # /etc/hosts.deny # -ALL: ALL: DENY +ALL: ALL: DENY # End of file diff --git a/etc/remote/screen_pam b/remote/etc/pam.d/screen similarity index 100% rename from etc/remote/screen_pam rename to remote/etc/pam.d/screen diff --git a/etc/remote/sshd_pam b/remote/etc/pam.d/sshd similarity index 100% rename from etc/remote/sshd_pam rename to remote/etc/pam.d/sshd diff --git a/etc/remote/rsyncd.conf b/remote/etc/rsyncd.conf similarity index 100% rename from etc/remote/rsyncd.conf rename to remote/etc/rsyncd.conf diff --git a/etc/remote/screenrc b/remote/etc/screenrc similarity index 100% rename from etc/remote/screenrc rename to remote/etc/screenrc diff --git a/etc/remote/moduli_ssh b/remote/etc/ssh/moduli similarity index 100% rename from etc/remote/moduli_ssh rename to remote/etc/ssh/moduli diff --git a/etc/remote/ssh_config_ssh b/remote/etc/ssh/ssh_config similarity index 89% rename from etc/remote/ssh_config_ssh rename to remote/etc/ssh/ssh_config index 95c6b5ca5..bda9663dc 100644 --- a/etc/remote/ssh_config_ssh +++ b/remote/etc/ssh/ssh_config @@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $ +# $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for @@ -38,9 +38,10 @@ Host * # Protocol 2,1 # Cipher 3des # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc +# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 # EscapeChar ~ # Tunnel no # TunnelDevice any:any # PermitLocalCommand no HashKnownHosts yes -StrictHostKeyChecking ask \ No newline at end of file +StrictHostKeyChecking ask diff --git a/etc/remote/sshd_config_ssh b/remote/etc/ssh/sshd_config similarity index 92% rename from etc/remote/sshd_config_ssh rename to remote/etc/ssh/sshd_config index 97fa20ca6..994b27676 100644 --- a/etc/remote/sshd_config_ssh +++ b/remote/etc/ssh/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.74 2006/07/19 13:07:10 dtucker Exp $ +# $OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -11,11 +11,15 @@ # default value. #Port 22 -#Protocol 2,1 #AddressFamily any ListenAddress 0.0.0.0 #ListenAddress :: +# Disable legacy (protocol version 1) support in the server for new +# installations. In future the default will change to require explicit +# activation of protocol 1 +Protocol 2 + # HostKey for protocol version 1 #HostKey /etc/ssh/ssh_host_key # HostKeys for protocol version 2 diff --git a/etc/remote/xinetd.conf b/remote/etc/xinetd.conf similarity index 100% rename from etc/remote/xinetd.conf rename to remote/etc/xinetd.conf diff --git a/etc/remote/rsync_xinetd b/remote/etc/xinetd.d/rsync similarity index 100% rename from etc/remote/rsync_xinetd rename to remote/etc/xinetd.d/rsync diff --git a/etc/remote/servers_xinetd b/remote/etc/xinetd.d/servers similarity index 100% rename from etc/remote/servers_xinetd rename to remote/etc/xinetd.d/servers diff --git a/etc/remote/services_xinetd b/remote/etc/xinetd.d/services similarity index 100% rename from etc/remote/services_xinetd rename to remote/etc/xinetd.d/services diff --git a/etc/remote/telnet_xinetd b/remote/etc/xinetd.d/telnet similarity index 100% rename from etc/remote/telnet_xinetd rename to remote/etc/xinetd.d/telnet diff --git a/scripts/check-files.sh b/scripts/check-files.sh new file mode 100755 index 000000000..919933842 --- /dev/null +++ b/scripts/check-files.sh @@ -0,0 +1,9 @@ +#! /bin/bash +cd .. +for i in base capi4k cpufreq grub iptables isdn kexec lilo naim net openvpn pacman pam ppp pppoe pptpclient remote shadow udev vpnc wireless; do + cd $i + for k in $(find ! -type d); do + diff -u $k /$k >/dev/null || (echo Changes found $i: $k) + done + cd .. +done diff --git a/scripts/config/686.conf b/scripts/config/686.conf index f278dfc5c..9fbd7f5cc 100644 --- a/scripts/config/686.conf +++ b/scripts/config/686.conf @@ -2,5 +2,3 @@ VERSION="" ARCH="i686" PACKAGES="/home/ftp/core/os/${ARCH}/packages.txt" PACKAGEDIR="/home/ftp/core/os/${ARCH}" -###not used atm! -#KERNELDIR="" diff --git a/etc/shadow-config/login.defs b/shadow/etc/login.defs similarity index 98% rename from etc/shadow-config/login.defs rename to shadow/etc/login.defs index 4f86e27e7..8650448cb 100644 --- a/etc/shadow-config/login.defs +++ b/shadow/etc/login.defs @@ -1,7 +1,7 @@ # # /etc/login.defs - Configuration control definitions for the login package. # -# $Id$ +# $Id: login.defs,v 1.1.1.1 2007/02/22 22:46:50 kth5 Exp $ # # Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. # If unspecified, some arbitrary (and possibly incorrect) value will @@ -115,7 +115,7 @@ TTYPERM 0600 # ERASECHAR 0177 KILLCHAR 025 -UMASK 022 +UMASK 077 # # Password aging controls: diff --git a/etc/shadow-config/pam.d/chage b/shadow/etc/pam.d/chage similarity index 100% rename from etc/shadow-config/pam.d/chage rename to shadow/etc/pam.d/chage diff --git a/etc/shadow-config/pam.d/chfn b/shadow/etc/pam.d/chfn similarity index 100% rename from etc/shadow-config/pam.d/chfn rename to shadow/etc/pam.d/chfn diff --git a/etc/shadow-config/pam.d/chgpasswd b/shadow/etc/pam.d/chgpasswd similarity index 100% rename from etc/shadow-config/pam.d/chgpasswd rename to shadow/etc/pam.d/chgpasswd diff --git a/etc/shadow-config/pam.d/chpasswd b/shadow/etc/pam.d/chpasswd similarity index 100% rename from etc/shadow-config/pam.d/chpasswd rename to shadow/etc/pam.d/chpasswd diff --git a/etc/shadow-config/pam.d/groupadd b/shadow/etc/pam.d/groupadd similarity index 100% rename from etc/shadow-config/pam.d/groupadd rename to shadow/etc/pam.d/groupadd diff --git a/etc/shadow-config/pam.d/groupdel b/shadow/etc/pam.d/groupdel similarity index 100% rename from etc/shadow-config/pam.d/groupdel rename to shadow/etc/pam.d/groupdel diff --git a/etc/shadow-config/pam.d/groupmems b/shadow/etc/pam.d/groupmems similarity index 100% rename from etc/shadow-config/pam.d/groupmems rename to shadow/etc/pam.d/groupmems diff --git a/etc/shadow-config/pam.d/groupmod b/shadow/etc/pam.d/groupmod similarity index 100% rename from etc/shadow-config/pam.d/groupmod rename to shadow/etc/pam.d/groupmod diff --git a/etc/shadow-config/pam.d/login b/shadow/etc/pam.d/login similarity index 95% rename from etc/shadow-config/pam.d/login rename to shadow/etc/pam.d/login index 7c44e5c45..5d4ceeb1d 100644 --- a/etc/shadow-config/pam.d/login +++ b/shadow/etc/pam.d/login @@ -1,5 +1,5 @@ #%PAM-1.0 -auth requisite pam_securetty.so +auth required pam_securetty.so auth requisite pam_nologin.so auth required pam_unix.so nullok auth required pam_tally.so onerr=succeed file=/var/log/faillog diff --git a/etc/shadow-config/pam.d/newusers b/shadow/etc/pam.d/newusers similarity index 100% rename from etc/shadow-config/pam.d/newusers rename to shadow/etc/pam.d/newusers diff --git a/etc/shadow-config/pam.d/passwd b/shadow/etc/pam.d/passwd similarity index 100% rename from etc/shadow-config/pam.d/passwd rename to shadow/etc/pam.d/passwd diff --git a/etc/shadow-config/pam.d/shadow b/shadow/etc/pam.d/shadow similarity index 100% rename from etc/shadow-config/pam.d/shadow rename to shadow/etc/pam.d/shadow diff --git a/etc/shadow-config/pam.d/useradd b/shadow/etc/pam.d/useradd similarity index 100% rename from etc/shadow-config/pam.d/useradd rename to shadow/etc/pam.d/useradd diff --git a/etc/shadow-config/pam.d/userdel b/shadow/etc/pam.d/userdel similarity index 100% rename from etc/shadow-config/pam.d/userdel rename to shadow/etc/pam.d/userdel diff --git a/etc/shadow-config/pam.d/usermod b/shadow/etc/pam.d/usermod similarity index 100% rename from etc/shadow-config/pam.d/usermod rename to shadow/etc/pam.d/usermod diff --git a/etc/load-modules.sh b/udev/etc/load-modules.sh similarity index 76% rename from etc/load-modules.sh rename to udev/etc/load-modules.sh index ed9d798cb..a4cbacbe4 100755 --- a/etc/load-modules.sh +++ b/udev/etc/load-modules.sh @@ -23,13 +23,6 @@ if [ -s /tmp/.ide-blacklist ]; then j="$j $l" done fi -# blacklist framebuffer modules -for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*/*fb*); do - j="$j $(/usr/bin/basename $x .ko)" -done -for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*fb*); do - j="$j $(/usr/bin/basename $x .ko)" -done if [ "${j}" != "" ] ; then for n in ${i}; do diff --git a/etc/start_udev b/udev/etc/start_udev similarity index 98% rename from etc/start_udev rename to udev/etc/start_udev index 7f6a8afa0..5f0459eb8 100755 --- a/etc/start_udev +++ b/udev/etc/start_udev @@ -31,7 +31,7 @@ udev_root="/dev" trigger_device_events () { - /sbin/udevtrigger + /sbin/udevadm trigger } wait_for_queue () @@ -42,7 +42,7 @@ wait_for_queue () # sleep 0.1; # loop=$(($loop - 1)) #done - /sbin/udevsettle + /sbin/udevadm settle } make_extra_nodes () diff --git a/etc/vpnc/default.conf b/vpnc/etc/vpnc/default.conf similarity index 100% rename from etc/vpnc/default.conf rename to vpnc/etc/vpnc/default.conf diff --git a/etc/vpnc/vpnc-script b/vpnc/etc/vpnc/vpnc-script similarity index 63% rename from etc/vpnc/vpnc-script rename to vpnc/etc/vpnc/vpnc-script index 93de44951..6af73e1a0 100755 --- a/etc/vpnc/vpnc-script +++ b/vpnc/etc/vpnc/vpnc-script @@ -16,8 +16,33 @@ #* CISCO_SPLIT_INC_%d_SPORT -- source port (often just 0) #* CISCO_SPLIT_INC_%d_DPORT -- destination port (often just 0) +# FIXMEs: + +# Section A: route handling + +# 1) The 3 values CISCO_SPLIT_INC_%d_PROTOCOL/SPORT/DPORT are currently being ignored +# In order to use them, we'll probably need os specific solutions +# * Linux: iptables -t mangle -I PREROUTING -j ROUTE --oif $TUNDEV +# This would be an *alternative* to changing the routes (and thus 2) and 3) +# shouldn't be relevant at all) +# 2) There are two different functions to set routes: generic routes and the +# default route. Why isn't the defaultroute handled via the generic route case? +# 3) In the split tunnel case, all routes but the default route might get replaced +# without getting restored later. We should explicitely check and save them just +# like the defaultroute +# 4) Replies to a dhcp-server should never be sent into the tunnel + +# Section B: Split DNS handling + +# 1) Maybe dnsmasq can do something like that +# 2) Parse dns packets going out via tunnel and redirect them to original dns-server + #set -x +# =========== script (variable) setup ==================================== + +PATH=/sbin:/usr/sbin:$PATH + OS="`uname -s`" VPNC_WIN_SCRIPT=/etc/vpnc/vpnc-script-win @@ -33,10 +58,12 @@ esac DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup +FULL_SCRIPTNAME=/usr/local/sbin/vpnc +SCRIPTNAME=`basename $FULL_SCRIPTNAME` # some systems, eg. Darwin & FreeBSD, prune /var/run on boot if ! [ -d "/var/run/vpnc" ]; then - mkdir -p /var/run/vpnc + mkdir -p /var/run/vpnc fi # stupid SunOS: no blubber in /usr/local/bin ... (on stdout) @@ -54,57 +81,18 @@ else route_syntax_netmask="-netmask" fi -#### +if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo + MODIFYRESOLVCONF=modify_resolvconf_manager + RESTORERESOLVCONF=restore_resolvconf_manager +elif [ -x /sbin/modify_resolvconf ]; then # Mandatory tool on Suse + MODIFYRESOLVCONF=modify_resolvconf_suse + RESTORERESOLVCONF=restore_resolvconf_suse +else # Generic for any OS + MODIFYRESOLVCONF=modify_resolvconf_generic + RESTORERESOLVCONF=restore_resolvconf_generic +fi -kernel_is_2_6_or_above() { - case `uname -r` in - 1.*|2.[012345]*) - return 1 - ;; - *) - return 0 - ;; - esac -} - -do_pre_init() { - if [ "$OS" = "Linux" ]; then - if (exec 6<> /dev/net/tun) > /dev/null 2>&1 ; then - : - else # can't open /dev/net/tun - test -e /proc/sys/kernel/modprobe && `cat /proc/sys/kernel/modprobe` tun 2>/dev/null - # fix for broken devfs in kernel 2.6.x - if [ "`readlink /dev/net/tun`" = misc/net/tun \ - -a ! -e /dev/net/misc/net/tun -a -e /dev/misc/net/tun ] ; then - ln -sf /dev/misc/net/tun /dev/net/tun - fi - # make sure tun device exists - if [ ! -e /dev/net/tun ]; then - mkdir -p /dev/net - mknod -m 0640 /dev/net/tun c 10 200 - fi - # workaround for a possible latency caused by udev, sleep max. 10s - if kernel_is_2_6_or_above ; then - for x in `seq 100` ; do - (exec 6<> /dev/net/tun) > /dev/null 2>&1 && break; - sleep 0.1 - done - fi - fi - elif [ "$OS" = "FreeBSD" ]; then - if [ ! -e /dev/tun ]; then - kldload if_tun - fi - elif [ "$OS" = "NetBSD" ]; then - : - elif [ "$OS" = "OpenBSD" ]; then - : - elif [ "$OS" = "SunOS" ]; then - : - elif [ "$OS" = "Darwin" ]; then - : - fi -} +# =========== tunnel interface handling ==================================== do_ifconfig() { ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu 1412 up @@ -118,6 +106,8 @@ destroy_tun_device() { esac } +# =========== route handling ==================================== + if [ -n "$IPROUTE" ]; then fix_ip_get_output () { sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' @@ -135,8 +125,7 @@ if [ -n "$IPROUTE" ]; then set_default_route() { $IPROUTE route | grep '^default' | fix_ip_get_output > "$DEFAULT_ROUTE_FILE" - $IPROUTE route $route_syntax_del default - $IPROUTE route add default dev "$TUNDEV" + $IPROUTE route replace default dev "$TUNDEV" $IPROUTE route flush cache } @@ -144,30 +133,31 @@ if [ -n "$IPROUTE" ]; then NETWORK="$1" NETMASK="$2" NETMASKLEN="$3" - $IPROUTE route add "$NETWORK/$NETMASKLEN" dev "$TUNDEV" + $IPROUTE route replace "$NETWORK/$NETMASKLEN" dev "$TUNDEV" $IPROUTE route flush cache } reset_default_route() { - $IPROUTE route $route_syntax_del default > /dev/null 2>&1 - $IPROUTE route add `cat "$DEFAULT_ROUTE_FILE"` - $IPROUTE route flush cache + if [ -s "$DEFAULT_ROUTE_FILE" ]; then + $IPROUTE route replace `cat "$DEFAULT_ROUTE_FILE"` + $IPROUTE route flush cache + rm -f -- "$DEFAULT_ROUTE_FILE" + fi } del_network_route() { - # linux deletes routes automatically if the device is shut down - return - #NETWORK="$1" - #NETMASK="$2" - #NETMASKLEN="$3" - #$IPROUTE route $route_syntax_del "$NETWORK/$NETMASKLEN" dev "$TUNDEV" - #$IPROUTE route flush cache + NETWORK="$1" + NETMASK="$2" + NETMASKLEN="$3" + $IPROUTE route $route_syntax_del "$NETWORK/$NETMASKLEN" dev "$TUNDEV" + $IPROUTE route flush cache } -else +else # use route command get_default_gw() { # isn't -n supposed to give --numeric output? # apperently not... - netstat -r -n | sed 's/default/0.0.0.0/' | grep '^0.0.0.0' | awk '{print $2}' + # Get rid of lines containing IPv6 addresses (':') + netstat -r -n | sed 's/default/0.0.0.0/' | sed 's/^.*:.*$//' | grep '^0.0.0.0' | awk '{print $2}' } set_vpngateway_route() { @@ -181,7 +171,7 @@ else set_default_route() { DEFAULTGW="`get_default_gw`" echo "$DEFAULTGW" > "$DEFAULT_ROUTE_FILE" - route $route_syntax_del default "$DEFAULTGW" + route $route_syntax_del default route add default $route_syntax_gw "$INTERNAL_IP4_ADDRESS" } @@ -189,12 +179,16 @@ else NETWORK="$1" NETMASK="$2" NETMASKLEN="$3" + del_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" route add -net "$NETWORK" $route_syntax_netmask "$NETMASK" $route_syntax_gw "$INTERNAL_IP4_ADDRESS" } reset_default_route() { - route $route_syntax_del default - route add default $route_syntax_gw `cat "$DEFAULT_ROUTE_FILE"` + if [ -s "$DEFAULT_ROUTE_FILE" ]; then + route $route_syntax_del default + route add default $route_syntax_gw `cat "$DEFAULT_ROUTE_FILE"` + rm -f -- "$DEFAULT_ROUTE_FILE" + fi } del_network_route() { @@ -211,15 +205,21 @@ else } fi -write_resolvconf() { +# =========== resolv.conf handling ==================================== + +# =========== resolv.conf handling for any OS ========================= + +modify_resolvconf_generic() { grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 || cp -- /etc/resolv.conf "$RESOLV_CONF_BACKUP" NEW_RESOLVCONF="#@VPNC_GENERATED@ -- this file is generated by vpnc # and will be overwritten by vpnc # as long as the above mark is intact" + # Remember the original value of CISCO_DEF_DOMAIN we need it later + CISCO_DEF_DOMAIN_ORIG="$CISCO_DEF_DOMAIN" # Don't step on INTERNAL_IP4_DNS value, use a temporary variable INTERNAL_IP4_DNS_TEMP="$INTERNAL_IP4_DNS" - exec 6< /etc/resolv.conf + exec 6< "$RESOLV_CONF_BACKUP" while read LINE <&6 ; do case "$LINE" in nameserver*) @@ -261,51 +261,53 @@ search $CISCO_DEF_DOMAIN" ;; # 10.4 and later require use of scutil for DNS to work properly *) - scutil >/dev/null 2>&1 <<-EOF - open - d.init - d.add ServerAddresses * $INTERNAL_IP4_DNS - set State:/Network/Service/$TUNDEV/DNS - get State:/Network/Global/IPv4 - d.remove PrimaryService - d.remove PrimaryInterface - d.add Addresses * $INTERNAL_IP4_ADDRESS - d.add SubnetMasks * 255.255.255.255 - d.add InterfaceName $TUNDEV - set State:/Network/Service/$TUNDEV/IPv4 - close - EOF - if [ -n "$CISCO_DEF_DOMAIN" ]; then - scutil >/dev/null 2>&1 <<-EOF - open - get State:/Network/Service/$TUNDEV/DNS - d.add DomainName $CISCO_DEF_DOMAIN - d.add SearchDomains * $CISCO_DEF_DOMAIN - d.add SupplementalMatchDomains * $CISCO_DEF_DOMAIN - set State:/Network/Service/$TUNDEV/DNS - close - EOF + OVERRIDE_PRIMARY="" + if [ -n "$CISCO_SPLIT_INC" ]; then + if [ $CISCO_SPLIT_INC -lt 1 ]; then + # Must override for correct default route + # Cannot use multiple DNS matching in this case + OVERRIDE_PRIMARY='d.add OverridePrimary # 1' + fi fi # Uncomment the following if/fi pair to use multiple # DNS matching when available. When multiple DNS matching # is present, anything reading the /etc/resolv.conf file # directly will probably not work as intended. - #if [ -z "$CISCO_DEF_DOMAIN" ]; then + #if [ -z "$CISCO_DEF_DOMAIN_ORIG" ]; then # Cannot use multiple DNS matching without a domain + OVERRIDE_PRIMARY='d.add OverridePrimary # 1' + #fi + scutil >/dev/null 2>&1 <<-EOF + open + d.init + d.add ServerAddresses * $INTERNAL_IP4_DNS + set State:/Network/Service/$TUNDEV/DNS + d.init + d.add Router $INTERNAL_IP4_ADDRESS + d.add Addresses * $INTERNAL_IP4_ADDRESS + d.add SubnetMasks * 255.255.255.255 + d.add InterfaceName $TUNDEV + $OVERRIDE_PRIMARY + set State:/Network/Service/$TUNDEV/IPv4 + close + EOF + if [ -n "$CISCO_DEF_DOMAIN_ORIG" ]; then scutil >/dev/null 2>&1 <<-EOF open - get State:/Network/Service/$TUNDEV/IPv4 - d.add OverridePrimary # 1 - set State:/Network/Service/$TUNDEV/IPv4 + get State:/Network/Service/$TUNDEV/DNS + d.add DomainName $CISCO_DEF_DOMAIN_ORIG + d.add SearchDomains * $CISCO_DEF_DOMAIN_ORIG + d.add SupplementalMatchDomains * $CISCO_DEF_DOMAIN_ORIG + set State:/Network/Service/$TUNDEV/DNS close EOF - #fi + fi ;; esac fi } -reset_resolvconf() { +restore_resolvconf_generic() { if [ ! -e "$RESOLV_CONF_BACKUP" ]; then return fi @@ -329,6 +331,99 @@ reset_resolvconf() { esac fi } +# === resolv.conf handling via /sbin/modify_resolvconf (Suse) ===================== + +# Suse provides a script that modifies resolv.conf. Use it because it will +# restart/reload all other services that care about it (e.g. lwresd). + +modify_resolvconf_suse() +{ + RESOLV_OPTS='' + test -n "$INTERNAL_IP4_DNS" && RESOLV_OPTS="-n \"$INTERNAL_IP4_DNS\"" + test -n "$CISCO_DEF_DOMAIN" && RESOLV_OPTS="$RESOLV_OPTS -d $CISCO_DEF_DOMAIN" + test -n "$RESOLV_OPTS" && eval /sbin/modify_resolvconf modify -s $SCRIPTNAME -p $SCRIPTNAME -f $FULL_SCRIPTNAME -e $TUNDEV $RESOLV_OPTS -t \"This file was created by $SCRIPTNAME\" +} + +# Restore resolv.conf to old contents on Suse +restore_resolvconf_suse() +{ + /sbin/modify_resolvconf restore -s vpnc -p $SCRIPTNAME -f $FULL_SCRIPTNAME -e $TUNDEV +} + +# === resolv.conf handling via /sbin/resolvconf (Debian, Ubuntu, Gentoo)) ========= + +modify_resolvconf_manager() { + NEW_RESOLVCONF="" + for i in $INTERNAL_IP4_DNS; do + NEW_RESOLVCONF="$NEW_RESOLVCONF +nameserver $i" + done + if [ -n "$CISCO_DEF_DOMAIN" ]; then + NEW_RESOLVCONF="$NEW_RESOLVCONF +domain $CISCO_DEF_DOMAIN" + fi + echo "$NEW_RESOLVCONF" | /sbin/resolvconf -a $TUNDEV +} + +restore_resolvconf_manager() { + /sbin/resolvconf -d $TUNDEV +} + +# ========= Toplevel state handling ======================================= + +kernel_is_2_6_or_above() { + case `uname -r` in + 1.*|2.[012345]*) + return 1 + ;; + *) + return 0 + ;; + esac +} + +do_pre_init() { + if [ "$OS" = "Linux" ]; then + if (exec 6<> /dev/net/tun) > /dev/null 2>&1 ; then + : + else # can't open /dev/net/tun + test -e /proc/sys/kernel/modprobe && `cat /proc/sys/kernel/modprobe` tun 2>/dev/null + # fix for broken devfs in kernel 2.6.x + if [ "`readlink /dev/net/tun`" = misc/net/tun \ + -a ! -e /dev/net/misc/net/tun -a -e /dev/misc/net/tun ] ; then + ln -sf /dev/misc/net/tun /dev/net/tun + fi + # make sure tun device exists + if [ ! -e /dev/net/tun ]; then + mkdir -p /dev/net + mknod -m 0640 /dev/net/tun c 10 200 + fi + # workaround for a possible latency caused by udev, sleep max. 10s + if kernel_is_2_6_or_above ; then + for x in `seq 100` ; do + (exec 6<> /dev/net/tun) > /dev/null 2>&1 && break; + sleep 0.1 + done + fi + fi + elif [ "$OS" = "FreeBSD" ]; then + if [ ! -e /dev/tun ]; then + kldload if_tun + fi + elif [ "$OS" = "GNU/kFreeBSD" ]; then + if [ ! -e /dev/tun ]; then + kldload if_tun + fi + elif [ "$OS" = "NetBSD" ]; then + : + elif [ "$OS" = "OpenBSD" ]; then + : + elif [ "$OS" = "SunOS" ]; then + : + elif [ "$OS" = "Darwin" ]; then + : + fi +} do_connect() { if [ -n "$CISCO_BANNER" ]; then @@ -345,7 +440,11 @@ do_connect() { eval NETWORK="\${CISCO_SPLIT_INC_${i}_ADDR}" eval NETMASK="\${CISCO_SPLIT_INC_${i}_MASK}" eval NETMASKLEN="\${CISCO_SPLIT_INC_${i}_MASKLEN}" - set_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" + if [ $NETWORK != "0.0.0.0" ]; then + set_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" + else + set_default_route + fi i=`expr $i + 1` done for i in $INTERNAL_IP4_DNS ; do @@ -356,7 +455,7 @@ do_connect() { fi if [ -n "$INTERNAL_IP4_DNS" ]; then - write_resolvconf + $MODIFYRESOLVCONF fi } @@ -368,27 +467,30 @@ do_disconnect() { eval NETWORK="\${CISCO_SPLIT_INC_${i}_ADDR}" eval NETMASK="\${CISCO_SPLIT_INC_${i}_MASK}" eval NETMASKLEN="\${CISCO_SPLIT_INC_${i}_MASKLEN}" - del_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" + if [ $NETWORK != "0.0.0.0" ]; then + # FIXME: This doesn't restore previously overwritten + # routes. + del_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" + else + reset_default_route + fi i=`expr $i + 1` done for i in $INTERNAL_IP4_DNS ; do del_network_route "$i" "255.255.255.255" "32" done else - if [ -s "$DEFAULT_ROUTE_FILE" ]; then - reset_default_route - rm -f -- "$DEFAULT_ROUTE_FILE" - fi + reset_default_route fi del_vpngateway_route if [ -n "$INTERNAL_IP4_DNS" ]; then - reset_resolvconf + $RESTORERESOLVCONF fi } -#### +#### Main if [ -z "$reason" ]; then echo "this script must be called from vpnc" 1>&2 diff --git a/etc/conf.d/wireless_conf.d b/wireless/etc/conf.d/wireless similarity index 100% rename from etc/conf.d/wireless_conf.d rename to wireless/etc/conf.d/wireless diff --git a/etc/wlan/prism2_ssf.pda b/wireless/etc/wlan/prism2_ssf.pda similarity index 100% rename from etc/wlan/prism2_ssf.pda rename to wireless/etc/wlan/prism2_ssf.pda diff --git a/etc/wlan/shared b/wireless/etc/wlan/shared similarity index 100% rename from etc/wlan/shared rename to wireless/etc/wlan/shared diff --git a/etc/wlan/shared.prism2 b/wireless/etc/wlan/shared.prism2 similarity index 100% rename from etc/wlan/shared.prism2 rename to wireless/etc/wlan/shared.prism2 diff --git a/etc/wlan/wlan-udev.sh b/wireless/etc/wlan/wlan-udev.sh similarity index 100% rename from etc/wlan/wlan-udev.sh rename to wireless/etc/wlan/wlan-udev.sh diff --git a/etc/wlan/wlan.conf b/wireless/etc/wlan/wlan.conf similarity index 100% rename from etc/wlan/wlan.conf rename to wireless/etc/wlan/wlan.conf diff --git a/etc/wlan/wlancfg-DEFAULT b/wireless/etc/wlan/wlancfg-DEFAULT similarity index 100% rename from etc/wlan/wlancfg-DEFAULT rename to wireless/etc/wlan/wlancfg-DEFAULT diff --git a/etc/wpa_supplicant.conf b/wireless/etc/wpa_supplicant.conf similarity index 99% rename from etc/wpa_supplicant.conf rename to wireless/etc/wpa_supplicant.conf index dd97ed3d9..dce9d8705 100644 --- a/etc/wpa_supplicant.conf +++ b/wireless/etc/wpa_supplicant.conf @@ -246,6 +246,12 @@ fast_reauth=1 # Note: When using wired authentication, eapol_flags must be set to 0 for the # authentication to be completed successfully. # +# mixed_cell: This option can be used to configure whether so called mixed +# cells, i.e., networks that use both plaintext and encryption in the same +# SSID, are allowed when selecting a BSS form scan results. +# 0 = disabled (default) +# 1 = enabled +# # proactive_key_caching: # Enable/disable opportunistic PMKSA caching for WPA2. # 0 = disabled (default)