diff options
author | cperciva <cperciva@FreeBSD.org> | 2015-02-12 05:35:00 +0000 |
---|---|---|
committer | cperciva <cperciva@FreeBSD.org> | 2015-02-12 05:35:00 +0000 |
commit | adc74e8335e897f6af1c55f35bab17b1812210a8 (patch) | |
tree | d4f92a5d2765c93869a3c13c371836babbf3e901 /etc | |
parent | f34d9c4728ee0c482b4ebe78db3e58a668e07185 (diff) | |
download | FreeBSD-src-adc74e8335e897f6af1c55f35bab17b1812210a8.zip FreeBSD-src-adc74e8335e897f6af1c55f35bab17b1812210a8.tar.gz |
Step 1 of eliminating the "games" distribution: Move binaries to /usr/bin;
update paths; and include everything in the "base" distribution.
The "games" distribution being optional made sense when there were more
games and we had small disks; but the "games-like" games were moved into
the ports tree a dozen years ago and the remaining "utility-like" games
occupy less than 0.001% of my laptop's small hard drive. Meanwhile every
new user is confronted by the question "do you want games installed" when
they they try to install FreeBSD.
The next steps will be:
2. Removing punch card (bcd, ppt), phase-of-moon (pom), clock (grdc), and
caesar cipher (caesar, rot13) utilities. I intend to keep fortune, factor,
morse, number, primes, and random, since there is evidence that those are
still being used.
3. Merging src/games into src/usr.bin.
This change will not be MFCed.
Reviewed by: jmg
Discussed at: EuroBSDCon
Approved by: gjb (release-affecting changes)
Diffstat (limited to 'etc')
-rw-r--r-- | etc/login.conf | 2 | ||||
-rw-r--r-- | etc/master.passwd | 2 | ||||
-rw-r--r-- | etc/mtree/BSD.debug.dist | 2 | ||||
-rw-r--r-- | etc/mtree/BSD.usr.dist | 2 | ||||
-rw-r--r-- | etc/root/dot.cshrc | 2 | ||||
-rw-r--r-- | etc/root/dot.login | 2 | ||||
-rw-r--r-- | etc/root/dot.profile | 2 |
7 files changed, 5 insertions, 9 deletions
diff --git a/etc/login.conf b/etc/login.conf index ff98d1c..5481f46 100644 --- a/etc/login.conf +++ b/etc/login.conf @@ -27,7 +27,7 @@ default:\ :copyright=/etc/COPYRIGHT:\ :welcome=/etc/motd:\ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ - :path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\ + :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\ :nologin=/var/run/nologin:\ :cputime=unlimited:\ :datasize=unlimited:\ diff --git a/etc/master.passwd b/etc/master.passwd index af096dd..f2a4523 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -7,7 +7,7 @@ operator:*:2:5::0:0:System &:/:/usr/sbin/nologin bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin -games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin +games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index bf53896..be2f854 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -21,8 +21,6 @@ usr bin .. - games - .. lib clang 3.5.1 diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 7a74ab3..f30ebc0 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -7,8 +7,6 @@ . bin .. - games - .. include .. lib diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc index 3e94371..63bce3b 100644 --- a/etc/root/dot.cshrc +++ b/etc/root/dot.cshrc @@ -15,7 +15,7 @@ alias ll ls -lAF # A righteous umask umask 22 -set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) +set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin) setenv EDITOR vi setenv PAGER more diff --git a/etc/root/dot.login b/etc/root/dot.login index 3a011ea..a849b68 100644 --- a/etc/root/dot.login +++ b/etc/root/dot.login @@ -6,4 +6,4 @@ # # Uncomment to display a random cookie each login: -# if ( -x /usr/games/fortune ) /usr/games/fortune -s +# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s diff --git a/etc/root/dot.profile b/etc/root/dot.profile index 1fca58e..1656b9b 100644 --- a/etc/root/dot.profile +++ b/etc/root/dot.profile @@ -1,6 +1,6 @@ # $FreeBSD$ # -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin export PATH HOME=/root export HOME |