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

setup: copy boot.cfg.default to /boot.cfg

Browse Source 
This way the setup stays in sync with the source tree.
This commit is contained in:
Thomas Veerman 2012-06-19 16:07:40 +00:00
parent 6759b24c57
commit 305dacf6ea
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
commands/setup/setup.sh
View File

@ -739,25 +739,18 @@ $fshome"
test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap
# Make bootable. # Make bootable.
# XXX we have to use "-f" here, because installboot worries about BPB, which mount /dev/$usr /mnt/usr >/dev/null || exit
# we don't have... # XXX we have to use "-f" here, because installboot worries about BPB, which
installboot_nbsd -f /dev/$primary /usr/mdec/bootxx_minixfs3 >/dev/null || exit # we don't have...
cat >/mnt/boot.cfg <<END_BOOT_CFG installboot_nbsd -f /dev/$primary /usr/mdec/bootxx_minixfs3 >/dev/null || exit
menu=Start MINIX 3:load_mods /boot/minix_default/mod*;multiboot /boot/minix_default/kernel rootdevname=$root cp /mnt/usr/src/etc/boot.cfg.default /mnt/boot.cfg
menu=Start Custom MINIX 3:load_mods /boot/minix_latest/mod*;multiboot /boot/minix_latest/kernel rootdevname=$root chroot /mnt update_bootcfg
menu=Drop to boot prompt:prompt
clear=1
timeout=5
default=2
END_BOOT_CFG
umount /dev/$root >/dev/null || exit # Unmount the new root.
mount /dev/$usr /mnt >/dev/null || exit
pfile="/mnt/src/tools/fdbootparams" pfile="/mnt/usr/src/tools/fdbootparams"
echo "rootdev=$root; ramimagedev=$root; save" >$pfile echo "rootdev=$root; ramimagedev=$root; save" >$pfile
# Save name of CD drive # Save name of CD drive
cddrive="`mount | grep usr | awk '{ print $1 }' | sed 's/p.*//'`" cddrive="`mount | grep /usr | awk '{ print $1 }' | sed 's/p.*//'`"
echo "cddrive=$cddrive" >>/mnt/etc/rc.package echo "cddrive=$cddrive" >>/mnt/usr/etc/rc.package
bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`" bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`"
@ -777,18 +770,13 @@ then if mount /dev/$home /home 2>/dev/null
fi fi
echo "Saving random data.." echo "Saving random data.."
dd if=/dev/random of=/mnt/adm/random.dat bs=1024 count=1 dd if=/dev/random of=/mnt/usr/adm/random.dat bs=1024 count=1
umount /dev/$usr >/dev/null || exit
# Networking. # Networking.
echo "" echo ""
echo " --- Step 8: Select your Ethernet chip ---------------------------------" echo " --- Step 8: Select your Ethernet chip ---------------------------------"
echo "" echo ""
mount /dev/$root /mnt >/dev/null || exit
mount /dev/$usr /mnt/usr >/dev/null || exit
/bin/netconf -p /mnt || echo FAILED TO CONFIGURE NETWORK /bin/netconf -p /mnt || echo FAILED TO CONFIGURE NETWORK
umount /dev/$usr && echo Unmounted $usr umount /dev/$usr && echo Unmounted $usr