oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename mkfs to mkfs.mfs and fsck to fsck.mfs. Add /sbin to root's PATH.

Browse Source
This commit is contained in:
Thomas Veerman 2010-08-05 12:35:00 +00:00
parent 0fc71a1154
commit 5bf3967f26
10 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands/Makefile
View File

@ -11,13 +11,13 @@ SUBDIR= aal add_route adduser advent arp ash at autil awk \
dd de decomp16 DESCRIBE dev2name devsize df dhcpd \ dd de decomp16 DESCRIBE dev2name devsize df dhcpd \
dhrystone diff dirname dis88 du dumpcore easypack \ dhrystone diff dirname dis88 du dumpcore easypack \
ed eject elle elvis env expand factor file \ ed eject elle elvis env expand factor file \
find finger fingerd fix fold format fortune fsck \ find finger fingerd fix fold format fortune fsck.mfs \
fsck1 ftp101 ftpd200 getty grep gomoku head host \ fsck1 ftp101 ftpd200 getty grep gomoku head host \
hostaddr id ifconfig ifdef indent install \ hostaddr id ifconfig ifdef indent install \
intr ipcrm ipcs irdpd isoread join kill last leave \ intr ipcrm ipcs irdpd isoread join kill last leave \
less lex life loadkeys loadramdisk logger login look lp \ less lex life loadkeys loadramdisk logger login look lp \
lpd ls lspci M m4 mail make MAKEDEV man \ lpd ls lspci M m4 mail make MAKEDEV man \
mdb mdocml mesg mined mkdep mkdir mkdist mkfifo mkfs mknod \ mdb mdocml mesg mined mkdep mkdir mkdist mkfifo mkfs.mfs mknod \
mkproto modem mount mt netconf newroot nice acknm nohup \ mkproto modem mount mt netconf newroot nice acknm nohup \
nonamed od packit packman passwd paste patch pax \ nonamed od packit packman passwd paste patch pax \
ping postinstall poweroff pr prep printf printroot \ ping postinstall poweroff pr prep printf printroot \

5
commands/fsck/Makefile → commands/fsck.mfs/Makefile
View File

@ -1,6 +1,7 @@
PROG= fsck PROG= fsck.mfs
SRCS= fsck.c
CPPFLAGS+= -I${MINIXSRCDIR}/servers CPPFLAGS+= -I${MINIXSRCDIR}/servers
BINDIR= /bin BINDIR= /sbin
MAN= MAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

0
commands/fsck/fsck.c → commands/fsck.mfs/fsck.c
View File

4
commands/mkfs/Makefile → commands/mkfs.mfs/Makefile
View File

@ -1,4 +1,6 @@
PROG= mkfs PROG= mkfs.mfs
SRCS= mkfs.c
BINDIR= /sbin
CPPFLAGS+= -I${MINIXSRCDIR}/servers CPPFLAGS+= -I${MINIXSRCDIR}/servers
MAN= MAN=

0
commands/mkfs/mkfs.c → commands/mkfs.mfs/mkfs.c
View File

8
commands/setup/setup.sh
View File

@ -44,7 +44,7 @@ then
exit 1 exit 1
fi fi
PATH=/bin:/usr/bin PATH=/bin:/sbin:/usr/bin
export PATH export PATH
@ -453,19 +453,19 @@ installboot -m /dev/$primary /usr/mdec/masterboot >/dev/null || exit
partition /dev/$primary 1 81:${ROOTSECTS}* 81:$homesize 81:0+ > /dev/null || exit partition /dev/$primary 1 81:${ROOTSECTS}* 81:$homesize 81:0+ > /dev/null || exit
echo "Creating /dev/$root for / .." echo "Creating /dev/$root for / .."
mkfs /dev/$root || exit mkfs.mfs /dev/$root || exit
if [ "$nohome" = 0 ] if [ "$nohome" = 0 ]
then then
if [ ! "$auto" = r ] if [ ! "$auto" = r ]
then echo "Creating /dev/$home for /home .." then echo "Creating /dev/$home for /home .."
mkfs -B $blocksizebytes /dev/$home || exit mkfs.mfs -B $blocksizebytes /dev/$home || exit
fi fi
else echo "Skipping /home" else echo "Skipping /home"
fi fi
echo "Creating /dev/$usr for /usr .." echo "Creating /dev/$usr for /usr .."
mkfs -B $blocksizebytes /dev/$usr || exit mkfs.mfs -B $blocksizebytes /dev/$usr || exit
if [ "$nohome" = 0 ] if [ "$nohome" = 0 ]
then then

2
drivers/ramdisk/Makefile
View File

@ -23,7 +23,7 @@ bintoc: bintoc.c
$(CC) -o $@ bintoc.c $(CC) -o $@ bintoc.c
image: proto.gen mtab rc $(PROGRAMS) $(EXTRA) image: proto.gen mtab rc $(PROGRAMS) $(EXTRA)
mkfs image proto.gen || { rm -f image; false; } mkfs.mfs image proto.gen || { rm -f image; false; }
at_wini: ../at_wini/at_wini at_wini: ../at_wini/at_wini
install -s ../$@/$@ $@ install -s ../$@/$@ $@

2
etc/ast/.ashrc
View File

@ -7,7 +7,7 @@ umask 022
# Favourite editor and pager, search path for binaries, etc. # Favourite editor and pager, search path for binaries, etc.
export EDITOR=vi export EDITOR=vi
export PAGER=more export PAGER=more
export PATH=$HOME/bin:/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin export PATH=$HOME/bin:/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin
} # End of no-repeat. } # End of no-repeat.

12
etc/rc
View File

@ -161,13 +161,13 @@ Mount $usr /usr failed -- Single user."
if [ "$fflag" ] if [ "$fflag" ]
then then
umount $usr umount $usr
echo "fsck / - $root" echo "fsck.mfs / - $root"
intr fsck $fsckopts $root intr fsck.mfs $fsckopts $root
echo "fsck /usr - $usr" echo "fsck.mfs /usr - $usr"
intr fsck $fsckopts $usr intr fsck.mfs $fsckopts $usr
if [ ! -z "$home" ] if [ ! -z "$home" ]
then echo "fsck /home - $home" then echo "fsck.mfs /home - $home"
intr fsck $fsckopts $home intr fsck.mfs $fsckopts $home
fi fi
mount $bin_img $usr /usr mount $bin_img $usr /usr
fi fi

4
tools/release.sh
View File

@ -148,7 +148,7 @@ fitfs()
# Create a filesystem on the target ramdisk # Create a filesystem on the target ramdisk
ramdisk $kbs $ramdisk ramdisk $kbs $ramdisk
mkfs -B $BS -i $inodes $ramdisk mkfs.mfs -B $BS -i $inodes $ramdisk
} }
RELEASEDIR=/usr/r-staging RELEASEDIR=/usr/r-staging
@ -268,7 +268,7 @@ mkdir -p $RELEASEPACKAGE
mkdir -p $RELEASEPACKAGESOURCES mkdir -p $RELEASEPACKAGESOURCES
echo " * Transfering bootstrap dirs to $RELEASEDIR" echo " * Transfering bootstrap dirs to $RELEASEDIR"
cp -p /bin/* /usr/bin/* $RELEASEDIR/$XBIN cp -p /bin/* /usr/bin/* /sbin/* $RELEASEDIR/$XBIN
cp -rp /usr/lib $RELEASEDIR/usr cp -rp /usr/lib $RELEASEDIR/usr
cp -rp /bin/sh /bin/echo $RELEASEDIR/bin cp -rp /bin/sh /bin/echo $RELEASEDIR/bin
cp -rp /usr/bin/make /usr/bin/install /usr/bin/yacc /usr/bin/lex /usr/bin/asmconv $RELEASEDIR/usr/bin cp -rp /usr/bin/make /usr/bin/install /usr/bin/yacc /usr/bin/lex /usr/bin/asmconv $RELEASEDIR/usr/bin