MAKEDEV: make more device nodes
setup: - fix for root progress bar - fix for network config and mount/umount order
This commit is contained in:
parent
f13d86f6e5
commit
6bfa44771e
@ -12,8 +12,10 @@ case $#:$1 in
|
||||
set -$- mem fd0 fd1 fd0p0 fd1p0 \
|
||||
c0d0 c0d0p0 c0d0p0s0 c0d1 c0d1p0 c0d1p0s0 \
|
||||
c0d2 c0d2p0 c0d2p0s0 c0d3 c0d3p0 c0d3p0s0 \
|
||||
c0d7 c0d7p0 c0d7p0s0 \
|
||||
tty ttyc1 ttyc2 ttyc3 tty00 tty01 ttyp0 ttyp1 ttyp2 ttyp3 eth klog random cmos
|
||||
c0d4 c0d4p0 c0d4p0s0 c0d5 c0d5p0 c0d5p0s0 \
|
||||
c0d6 c0d6p0 c0d6p0s0 c0d7 c0d7p0 c0d7p0s0 \
|
||||
tty ttyc1 ttyc2 ttyc3 tty00 tty01 ttyp0 ttyp1 ttyp2 ttyp3 \
|
||||
eth klog random cmos
|
||||
;;
|
||||
0:|1:-\?)
|
||||
cat >&2 <<EOF
|
||||
|
@ -9,6 +9,7 @@
|
||||
#
|
||||
|
||||
LOCALRC=/usr/etc/rc.local
|
||||
MYLOCALRC=/mnt/etc/rc.local
|
||||
|
||||
PATH=/bin:/usr/bin
|
||||
export PATH
|
||||
@ -389,12 +390,24 @@ mount /dev/$usr /mnt >/dev/null || exit # Mount the intended /usr.
|
||||
files="`find /usr | wc -l`"
|
||||
cpdir -v /usr /mnt | progressbar "$files" || exit # Copy the usr floppy.
|
||||
|
||||
|
||||
# Set inet.conf to correct driver
|
||||
if [ -n "$driver" ]
|
||||
then echo "$driverargs" >$MYLOCALRC
|
||||
disable=""
|
||||
else disable="disable=inet;"
|
||||
fi
|
||||
|
||||
umount /dev/$usr >/dev/null || exit # Unmount the intended /usr.
|
||||
mount /dev/$root /mnt >/dev/null || exit
|
||||
|
||||
# Running from the installation CD.
|
||||
files="`find / -xdev | wc -l`"
|
||||
cpdir -vx / /mnt || progressbar "$files" || exit
|
||||
chmod 555 /mnt/usr
|
||||
cpdir -vx / /mnt | progressbar "$files" || exit
|
||||
|
||||
if [ -n "$driver" ]
|
||||
then echo "eth0 $driver 0 { default; };" >/mnt/etc/inet.conf
|
||||
fi
|
||||
|
||||
# CD remnants that aren't for the installed system
|
||||
rm /mnt/etc/issue /mnt/CD 2>/dev/null
|
||||
@ -409,14 +422,6 @@ usr=/dev/$usr"
|
||||
# National keyboard map.
|
||||
test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap
|
||||
|
||||
# Set inet.conf to correct driver
|
||||
if [ -n "$driver" ]
|
||||
then echo "eth0 $driver 0 { default; };" >/mnt/etc/inet.conf
|
||||
echo "$driverargs" >$LOCALRC
|
||||
disable=""
|
||||
else disable="disable=inet;"
|
||||
fi
|
||||
|
||||
umount /dev/$root >/dev/null || exit # Unmount the new root.
|
||||
mount /dev/$usr /mnt >/dev/null || exit
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user