diff options
| author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1997-02-18 15:46:39 +0000 |
|---|---|---|
| committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1997-02-18 15:46:39 +0000 |
| commit | 2e0e558ca38443478b120387ea55730c50b8bcc6 (patch) | |
| tree | 2c3c2a0048a390b9bd39aac2ce03e49aac14f750 /distrib/powerpc/miniroot | |
| parent | 64285f5ff59cdb72ecfbaec2d48694f3fbc3ebdd (diff) | |
commit some stragglers in my source tree, cleaning up of ramdisk installation.
Diffstat (limited to 'distrib/powerpc/miniroot')
| -rw-r--r-- | distrib/powerpc/miniroot/Makefile | 17 | ||||
| -rw-r--r-- | distrib/powerpc/miniroot/install.sub | 8 |
2 files changed, 18 insertions, 7 deletions
diff --git a/distrib/powerpc/miniroot/Makefile b/distrib/powerpc/miniroot/Makefile index e5222e55bad..62af4dbf249 100644 --- a/distrib/powerpc/miniroot/Makefile +++ b/distrib/powerpc/miniroot/Makefile @@ -6,10 +6,12 @@ TOP= ${.CURDIR}/.. IMAGE= miniroot-${REV}.fs CRUNCHCONF?= ${TOP}/miniroot/${CBIN}.conf BASE=miniroot +KERNEL= ${SRCSYSDIR}/arch/powerpc/compile/MINI/bsd MOUNT_POINT= /mnt1 BDEV= /dev/rd0a -CDEV= /dev/rrd0c +CDEV= /dev/rrd0a +RDEV= /dev/rd0c .include "${TOP}/inst-common/Makefile.inc" @@ -28,13 +30,22 @@ ${IMAGE}: do_prep do_mount do_files do_umount_copy do_unconfig rm rd.pid;\ fi +elfrdsetroot: ${TOP}//elfrdsetroot.c + ${HOSTCC} -o elfrdsetroot ${TOP}/elfrdsetroot.c + +setroot: ${IMAGE} bsd elfrdsetroot + elfrdsetroot bsd < ${IMAGE} + +bsd: ${KERNEL} + cp ${KERNEL} bsd + do_prep: ${CBIN} do_unconfig - sh ${.CURDIR}/start_rdconfig.sh ${CDEV} ${NBLKS} + sh ${.CURDIR}/start_rdconfig.sh ${RDEV} ${NBLKS} dd if=/usr/mdec/sdboot of=${CDEV} disklabel -w ${CDEV} ${DISKTYPE} do_mount: - -newfs ${NEWFSARGS} -s ${NBLKS} ${BDEV} ${DISKTYPE} + -newfs ${NEWFSARGS} -s ${NBLKS} ${CDEV} ${DISKTYPE} mount ${BDEV} ${MOUNT_POINT} do_umount_copy: diff --git a/distrib/powerpc/miniroot/install.sub b/distrib/powerpc/miniroot/install.sub index 756940fe1c9..23f6e95ec1b 100644 --- a/distrib/powerpc/miniroot/install.sub +++ b/distrib/powerpc/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.2 1997/02/17 17:00:05 rahnds Exp $ +# $OpenBSD: install.sub,v 1.3 1997/02/18 15:46:38 rahnds Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -655,7 +655,7 @@ install_from_mounted_fs() { fi # Extract file - cat $_filename | (cd /mnt; tar --unlink -zxvpf -) + cat $_filename | (cd /mnt; pax -r -pe -z ) echo "Extraction complete." _setsdone="$_f $_setsdone" @@ -1011,11 +1011,11 @@ __install_tape_2 getresp "1" case "$resp" in 1) - _xcmd="tar --unlink -zxvpf -" + _xcmd="pax -r -pe -z" ;; 2) - _xcmd="tar --unlink -xvpf -" + _xcmd="pax -r -pe" ;; *) |