From: David van Moolenbroek Date: Tue, 16 Oct 2012 20:27:03 +0000 (+0200) Subject: Retire checkhier(8) X-Git-Tag: v3.2.1~270 X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=de58c13271982251af6c6902a37dba961546b8ff;p=minix.git Retire checkhier(8) --- diff --git a/commands/Makefile b/commands/Makefile index 1fb9eb675..6517dbba3 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -3,7 +3,7 @@ .include SUBDIR= add_route arp ash at backup banner basename btrace cal \ - cawf cd cdprobe checkhier cpp \ + cawf cd cdprobe cpp \ chmod chown ci cksum cleantmp clear cmp co \ comm compress cp crc cron crontab cut \ dd decomp16 DESCRIBE dev2name devmand devsize df dhcpd \ diff --git a/commands/checkhier/Makefile b/commands/checkhier/Makefile deleted file mode 100644 index 897584cb5..000000000 --- a/commands/checkhier/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPTS= checkhier.sh -MAN= - -.include diff --git a/commands/checkhier/checkhier.sh b/commands/checkhier/checkhier.sh deleted file mode 100644 index 76d3778c4..000000000 --- a/commands/checkhier/checkhier.sh +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh -# -# checkhier 2.7 - check the directory hierarchy Author: Kees J. Bot -# 7 May 1995 - -case "`id`" in -'uid=0('*) ;; -*) echo "$0: must be run by root" >&2 - exit 1 -esac - -# List of all interesting top level files and directories, with mode, -# owner and group. Only the key files are listed, the rest is owned -# by bin, has mode 755 or 644, and is not critical to the operation of -# the system. -{ - cat <<'EOF' -drwxr-xr-x root operator / -drwxr-xr-x bin operator /bin -drwxr-xr-x root operator /dev -drwxr-xr-x root operator /etc --rw-r--r-- root operator /etc/fstab --rw-r--r-- root operator /etc/group --rw-r--r-- root operator /etc/hostname.file --rw-r--r-- root operator /etc/inet.conf --rw-r--r-- root operator /etc/motd --rw-r--r-- root operator /etc/mtab --rw-r--r-- root operator /etc/passwd --rw-r--r-- root operator /etc/profile --rw-r--r-- root operator /etc/protocols --rw-r--r-- root operator /etc/rc --rw-r--r-- root operator /etc/services --rw------- root operator /etc/shadow --rw-r--r-- root operator /etc/termcap --rw-r--r-- root operator /etc/ttytab --rw-r--r-- root operator /etc/utmp -dr-xr-xr-x root operator /mnt -dr-xr-xr-x root operator /root -drwxrwxrwx root operator /tmp -drwxr-xr-x root operator /usr -drwxr-xr-x root operator /usr/adm --rw-r--r-- root operator /usr/adm/lastlog --rw-r--r-- root operator /usr/adm/wtmp -drwxr-xr-x ast other /usr/ast -drwxr-xr-x bin operator /usr/bin -drwxr-xr-x root operator /usr/etc -drwxr-xr-x bin operator /usr/include -drwxr-xr-x bin operator /usr/lib -drwxrwxr-x root operator /usr/local -drwxrwxr-x bin operator /usr/local/bin -drwxrwxr-x bin operator /usr/local/include -drwxrwxr-x bin operator /usr/local/lib -drwxrwxr-x bin operator /usr/local/man -drwxrwxr-x bin operator /usr/local/src -drwxr-xr-x bin operator /usr/man -drwxr-xr-x bin operator /usr/mdec -drwx------ root operator /usr/preserve -drwxr-xr-x root operator /usr/run -drwxr-xr-x root operator /usr/spool -drwx--x--x root operator /usr/spool/at -drwx--x--x root operator /usr/spool/at/past -drwx------ root operator /usr/spool/crontabs -drwxrwxr-x root uucp /usr/spool/locks -drwx------ daemon daemon /usr/spool/lpd -drwxr-xr-x bin operator /usr/src -drwxrwxrwx root operator /usr/tmp --rwsr-xr-x root ? /usr/bin/at --rwsr-xr-x root ? /usr/bin/chfn --rwsr-xr-x root ? /usr/bin/chsh --rwsr-xr-x root ? /usr/bin/elvprsv --rwsr-xr-x root ? /usr/bin/elvrec --rwsr-xr-x root ? /usr/bin/format --rwsr-xr-x root ? /usr/bin/hostaddr --rwsr-xr-x root ? /usr/bin/install --rwsr-xr-x daemon ? /usr/bin/lpd --rwsr-xr-x root ? /usr/bin/mail --rwsr-xr-x root ? /usr/bin/mount --rwsr-xr-x root ? /usr/bin/passwd --rwsr-xr-x root ? /usr/bin/ping --rwxr-sr-x ? kmem /usr/bin/ps --rwsr-xr-- root ? /usr/bin/shutdown --rwsr-xr-x root ? /usr/bin/su --rwxr-sr-x ? uucp /usr/bin/term --rwsr-xr-x root ? /usr/bin/umount --rwxr-sr-x ? tty /usr/bin/write -EOF - -} | { - # Check if each file has the proper attributes. Offer a correction - # if not. - banner="\ -# List of commands to fix the top level hierarchy. Do not apply these -# commands blindly, but check and repair by hand. -" - - while read mode owner group file - do - ( # "fix" a memory leak in set... - - set -$- `ls -ld $file 2>/dev/null` '' '' '' '' - curmode=$1 curowner=$3 curgroup=$4 - test $owner = '?' && curowner=$owner - test $group = '?' && curgroup=$group - - # File types? - if [ x`expr "$mode" : '\\(.\\)'` != \ - x`expr "$curmode" : '\\(.\\)'` ] - then - case $curmode in - ?*) echo "${banner}rm -r $file" - banner= - esac - curmode= curowner= curgroup= - case $mode in - d*) echo "${banner}mkdir $file" - ;; - -*) echo "${banner}> $file" - ;; - *) echo "$0: $mode $file: unknown filetype" >&2 - exit 1 - esac - banner= - fi - - # Mode? - if [ x$mode != x$curmode ] - then - octmode= - m=$mode - for i in u g o - do - r=0 w=0 x=0 - case $m in - ?r??*) r=4 - esac - case $m in - ??w?*) w=2 - esac - case $m in - ???[xst]*) x=1 - esac - octmode=$octmode`expr $r + $w + $x` - m=`expr $m : '...\\(.*\\)'` - done - r=0 w=0 x=0 - case $mode in - ???[sS=]??????) r=4 - esac - case $mode in - ??????[sS=]???) w=2 - esac - case $mode in - ?????????[tT=]) x=1 - esac - case $r$w$x in - 000) ;; - *) octmode=`expr $r + $w + $x`$octmode - esac - - echo "${banner}chmod $octmode $file" - banner= - fi - - # Ownership? - if [ x$owner != x$curowner -o x$group != x$curgroup ] - then - echo "${banner}chown $owner:$group $file" - banner= - fi - - # The Minix shell forgets processes, so wait explicitly. - wait - - case "$banner" in '') exit 1;; *) exit 0;; esac) || banner= - done - case "$banner" in - '') exit 1 - esac - exit 0 -} diff --git a/man/man7/hier.7 b/man/man7/hier.7 index 3d6c7b907..6c225b4af 100644 --- a/man/man7/hier.7 +++ b/man/man7/hier.7 @@ -223,8 +223,7 @@ Contains source and majority of system utilities and files .BR man (1), .BR find (1), .BR grep (1), -.BR mount (1), -.BR checkhier (8). +.BR mount (1). .SH NOTES Not all of the directories and files shown are present. They must be created as needed. diff --git a/man/man8/Makefile b/man/man8/Makefile index b7435f8f3..cbcdb079e 100644 --- a/man/man8/Makefile +++ b/man/man8/Makefile @@ -1,5 +1,5 @@ MAN= add_route.8 backup.8 boot.8 btrace.8 \ - cdprobe.8 checkhier.8 chown.8 cleantmp.8 config.8 cron.8 \ + cdprobe.8 chown.8 cleantmp.8 config.8 cron.8 \ dhcpd.8 diskctl.8 elvprsv.8 fbdctl.8 fdisk.8 fingerd.8 \ getty.8 halt.8 hgfs.8 httpd.8 ifconfig.8 inet.8 init.8 \ intr.8 irdpd.8 loadramdisk.8 MAKEDEV.8 \ diff --git a/man/man8/checkhier.8 b/man/man8/checkhier.8 deleted file mode 100644 index 679c7fb8e..000000000 --- a/man/man8/checkhier.8 +++ /dev/null @@ -1,29 +0,0 @@ -.TH CHECKHIER 8 -.SH NAME -checkhier \- check the directory hierarchy -.SH SYNOPSIS -.B checkhier -.SH DESCRIPTION -.de SP -.if t .sp 0.4 -.if n .sp -.. -.B Checkhier -checks a number of files and directories that make up the top level file -system hierarchy. The output of the command is a script that could be -applied to fix things like bad mode, wrong owner or group, etc. -.PP -The script should never be executed without checking. I might be better to -examine the differences oneself and to fix any problems by hand. -.PP -.B Checkhier -must be run by the superuser. -.SH "SEE ALSO" -.BR chmod (1), -.BR chown (8), -.BR hier (7). -.SH DIAGNOSTICS -The exit code is 0 if all checks out right, otherwise a script is output and -the exit code is 1. -.SH AUTHOR -Kees J. Bot (kjb@cs.vu.nl)