diff options
| author |   deraadt <deraadt@openbsd.org> | 2012-10-18 16:57:31 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2012-10-18 16:57:31 +0000 |
| commit | 2d42194bec519f5345f797f62b1e14fa85a0b31f (patch) | |
| tree | 9d4eda7e4a460af00da38c5cbd74e3f4049ac73a | |
| parent | Put back the kl_n_shift variable, removed by mistake in 1.18, causing the (diff) | |
| download | wireguard-openbsd-2d42194bec519f5345f797f62b1e14fa85a0b31f.tar.xz wireguard-openbsd-2d42194bec519f5345f797f62b1e14fa85a0b31f.zip | |
put fewer things in usr/mdec on the ramdisk filesystem, and use them
once baseXX has been installed in /mnt. sgivol installs the bootblocks
much later now.
ok miod
| -rw-r--r-- | distrib/sgi/ramdisk/install.md | 24 | ||||
| -rw-r--r-- | distrib/sgi/ramdisk/list | 11 |
2 files changed, 14 insertions, 21 deletions
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index baa2ae0aa71..7fc992d41a2 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.30 2012/07/10 14:25:00 halex Exp $ +# $OpenBSD: install.md,v 1.31 2012/10/18 16:57:31 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -46,6 +46,18 @@ fi DEFAULTSETS=${MDSETS} md_installboot() { + local _disk=$1 + + echo "Installing boot loader in volume header." + /usr/mdec/sgivol -w boot /mnt/usr/mdec/boot-`sysctl -n hw.model` $_disk + case $? in + 0) + ;; + *) echo + echo "WARNING: Boot install failed. Booting from disk will not be possible" + ;; + esac + if [[ -f /mnt/bsd.${IPARCH} ]]; then mv /mnt/bsd.${IPARCH} /mnt/bsd fi @@ -131,16 +143,6 @@ __EOT ;; esac - echo "Installing boot loader in volume header." - /usr/mdec/sgivol -w boot /usr/mdec/boot-`sysctl -n hw.model` $_disk - case $? in - 0) - ;; - *) echo - echo "WARNING: Boot install failed. Booting from disk will not be possible" - ;; - esac - _f=/tmp/fstab.$_disk if [[ $_disk == $ROOTDISK ]]; then while :; do diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list index 444b894ede1..44140e243ae 100644 --- a/distrib/sgi/ramdisk/list +++ b/distrib/sgi/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.32 2012/05/25 17:32:38 miod Exp $ +# $OpenBSD: list,v 1.33 2012/10/18 16:57:31 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -60,15 +60,6 @@ LINK instbin sbin/bioctl SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk -# we need the contents of /usr/mdec -COPY ${DESTDIR}/usr/mdec/boot32 usr/mdec/boot32 -SYMLINK /usr/mdec/boot32 usr/mdec/boot-IP32 -COPY ${DESTDIR}/usr/mdec/boot64 usr/mdec/boot64 -SYMLINK /usr/mdec/boot64 usr/mdec/boot-IP27 -SYMLINK /usr/mdec/boot64 usr/mdec/boot-IP28 -SYMLINK /usr/mdec/boot64 usr/mdec/boot-IP30 -COPY ${DESTDIR}/usr/mdec/bootecoff usr/mdec/bootecoff -SYMLINK /usr/mdec/bootecoff usr/mdec/boot-IP22 COPY ${DESTDIR}/usr/mdec/sgivol usr/mdec/sgivol # various files that we need in /etc for the install |