From 88c97d37854ec02029c373660a65335c1da170fc Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Sat, 20 May 1995 15:47:19 +0000 Subject: [PATCH] Whoops - copy_self() was going to the wrong place! Use proper floppy device names. --- release/sysinstall/devices.c | 6 +++--- release/sysinstall/install.c | 5 +++-- usr.sbin/sade/devices.c | 6 +++--- usr.sbin/sade/install.c | 5 +++-- usr.sbin/sysinstall/devices.c | 6 +++--- usr.sbin/sysinstall/install.c | 5 +++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index e6d3137683e..3c0f706f4f3 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.21 1995/05/20 10:33:00 jkh Exp $ + * $Id: devices.c,v 1.22 1995/05/20 14:36:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -88,8 +88,8 @@ static struct { { DEVICE_TYPE_TAPE, "wt0", "Wangtek tape drive" }, { DEVICE_TYPE_DISK, "sd", "SCSI disk device" }, { DEVICE_TYPE_DISK, "wd", "IDE/ESDI/MFM/ST506 disk device" }, - { DEVICE_TYPE_FLOPPY, "fd0a", "Floppy disk drive (unit A)" }, - { DEVICE_TYPE_FLOPPY, "fd1a", "Floppy disk drive (unit B)" }, + { DEVICE_TYPE_FLOPPY, "fd0", "Floppy disk drive (unit A)" }, + { DEVICE_TYPE_FLOPPY, "fd1", "Floppy disk drive (unit B)" }, { DEVICE_TYPE_NETWORK, "cuaa0", "Serial port (COM1) - possible PPP device" }, { DEVICE_TYPE_NETWORK, "cuaa1", "Serial port (COM2) - possible PPP device" }, { DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" }, diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 8728278b33b..fe45a43b1df 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.36 1995/05/20 13:24:33 jkh Exp $ + * $Id: install.c,v 1.37 1995/05/20 14:05:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,6 +131,7 @@ installInitial(void) } make_filesystems(); copy_self(); + dialog_clear(); cpio_extract(); alreadyDone = TRUE; } @@ -263,7 +264,7 @@ copy_self(void) int i; msgNotify("Copying the boot floppy to /stand on root filesystem"); - i = vsystem("find -x / | cpio -pdmv /mnt/stand"); + i = vsystem("find -x / | cpio -pdmv /mnt"); if (i) msgConfirm("Copy returned error status of %d!", i); } diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index e6d3137683e..3c0f706f4f3 100644 --- a/usr.sbin/sade/devices.c +++ b/usr.sbin/sade/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.21 1995/05/20 10:33:00 jkh Exp $ + * $Id: devices.c,v 1.22 1995/05/20 14:36:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -88,8 +88,8 @@ static struct { { DEVICE_TYPE_TAPE, "wt0", "Wangtek tape drive" }, { DEVICE_TYPE_DISK, "sd", "SCSI disk device" }, { DEVICE_TYPE_DISK, "wd", "IDE/ESDI/MFM/ST506 disk device" }, - { DEVICE_TYPE_FLOPPY, "fd0a", "Floppy disk drive (unit A)" }, - { DEVICE_TYPE_FLOPPY, "fd1a", "Floppy disk drive (unit B)" }, + { DEVICE_TYPE_FLOPPY, "fd0", "Floppy disk drive (unit A)" }, + { DEVICE_TYPE_FLOPPY, "fd1", "Floppy disk drive (unit B)" }, { DEVICE_TYPE_NETWORK, "cuaa0", "Serial port (COM1) - possible PPP device" }, { DEVICE_TYPE_NETWORK, "cuaa1", "Serial port (COM2) - possible PPP device" }, { DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" }, diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 8728278b33b..fe45a43b1df 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.36 1995/05/20 13:24:33 jkh Exp $ + * $Id: install.c,v 1.37 1995/05/20 14:05:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,6 +131,7 @@ installInitial(void) } make_filesystems(); copy_self(); + dialog_clear(); cpio_extract(); alreadyDone = TRUE; } @@ -263,7 +264,7 @@ copy_self(void) int i; msgNotify("Copying the boot floppy to /stand on root filesystem"); - i = vsystem("find -x / | cpio -pdmv /mnt/stand"); + i = vsystem("find -x / | cpio -pdmv /mnt"); if (i) msgConfirm("Copy returned error status of %d!", i); } diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index e6d3137683e..3c0f706f4f3 100644 --- a/usr.sbin/sysinstall/devices.c +++ b/usr.sbin/sysinstall/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.21 1995/05/20 10:33:00 jkh Exp $ + * $Id: devices.c,v 1.22 1995/05/20 14:36:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -88,8 +88,8 @@ static struct { { DEVICE_TYPE_TAPE, "wt0", "Wangtek tape drive" }, { DEVICE_TYPE_DISK, "sd", "SCSI disk device" }, { DEVICE_TYPE_DISK, "wd", "IDE/ESDI/MFM/ST506 disk device" }, - { DEVICE_TYPE_FLOPPY, "fd0a", "Floppy disk drive (unit A)" }, - { DEVICE_TYPE_FLOPPY, "fd1a", "Floppy disk drive (unit B)" }, + { DEVICE_TYPE_FLOPPY, "fd0", "Floppy disk drive (unit A)" }, + { DEVICE_TYPE_FLOPPY, "fd1", "Floppy disk drive (unit B)" }, { DEVICE_TYPE_NETWORK, "cuaa0", "Serial port (COM1) - possible PPP device" }, { DEVICE_TYPE_NETWORK, "cuaa1", "Serial port (COM2) - possible PPP device" }, { DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" }, diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 8728278b33b..fe45a43b1df 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.36 1995/05/20 13:24:33 jkh Exp $ + * $Id: install.c,v 1.37 1995/05/20 14:05:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,6 +131,7 @@ installInitial(void) } make_filesystems(); copy_self(); + dialog_clear(); cpio_extract(); alreadyDone = TRUE; } @@ -263,7 +264,7 @@ copy_self(void) int i; msgNotify("Copying the boot floppy to /stand on root filesystem"); - i = vsystem("find -x / | cpio -pdmv /mnt/stand"); + i = vsystem("find -x / | cpio -pdmv /mnt"); if (i) msgConfirm("Copy returned error status of %d!", i); }