diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-17 02:36:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-17 02:36:17 +0000 |
| commit | 5ae64b2daf25f694fbc983dcd69a5b9101ccfd64 (patch) | |
| tree | 3e7ee64021897e6546469bef4b7a91e4aee2d7ca /distrib/landisk | |
| parent | 361ddf78343000af87909568db603336f0f839f7 (diff) | |
landisk was already using the installed usr/mdec/boot conditionally, but
would never hit the 'other case', so we can shorten the code.
Diffstat (limited to 'distrib/landisk')
| -rw-r--r-- | distrib/landisk/ramdisk/install.md | 12 | ||||
| -rw-r--r-- | distrib/landisk/ramdisk/list | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index d4c0fc13fd6..cdc8f5e5463 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.28 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.29 2012/10/17 02:36:16 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -35,14 +35,8 @@ md_installboot() { disklabel -B ${1} - # use extracted mdec if it exists (may be newer) - if [ -d /mnt/usr/mdec ]; then - # Use cat to avoid holes created by cp(1) - cat /mnt/usr/mdec/boot > /mnt/boot - elif [ -d /usr/mdec ]; then - # Use cat to avoid holes created by cp(1) - cat /usr/mdec/boot > /mnt/boot - fi + # Use cat to avoid holes created by cp(1) + cat /mnt/usr/mdec/boot > /mnt/boot } md_prep_fdisk() { diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index 25d4a902a18..960a90ed874 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.21 2011/08/02 01:14:28 deraadt Exp $ +# $OpenBSD: list,v 1.22 2012/10/17 02:36:16 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -86,8 +86,9 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-in SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk -# we need at least this one file from mdec +# for fdisk(8) COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr +# for disklabel(8) -B COPY ${DESTDIR}/usr/mdec/xxboot usr/mdec/xxboot LINK usr/mdec/xxboot usr/mdec/wdboot LINK usr/mdec/xxboot usr/mdec/sdboot |