From e72a0d1082c4912ecce3cbea4c55a4e86b8e7904 Mon Sep 17 00:00:00 2001 From: jkh Date: Fri, 20 Mar 1998 18:07:02 +0000 Subject: My face is red - make the code for creating slices actually work now. --- release/sysinstall/devices.c | 7 ++++--- usr.sbin/sade/devices.c | 7 ++++--- usr.sbin/sysinstall/devices.c | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index fbd5c56..1bd84e9 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.71 1998/03/15 16:15:47 jkh Exp $ + * $Id: devices.c,v 1.72 1998/03/16 14:33:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -302,12 +302,13 @@ skipif: if (fd >= 0 && RunningAsInit) { dev_t d; int s, fail; - char slice[80]; + char unit[80], slice[80]; close(fd); /* Make associated slice entries */ for (s = 1; s < 33; s++) { - snprintf(slice, sizeof slice, "/dev/%ss%d", device_names[i].name, s); + snprintf(unit, sizeof unit, device_names[i].name, i); + snprintf(slice, sizeof slice, "/dev/%ss%d", unit, s); d = makedev(device_names[i].major, device_names[i].minor + (j * device_names[i].delta) + (s * SLICE_DELTA)); fail = mknod(slice, 0640 | S_IFBLK, d); diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index fbd5c56..1bd84e9 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.71 1998/03/15 16:15:47 jkh Exp $ + * $Id: devices.c,v 1.72 1998/03/16 14:33:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -302,12 +302,13 @@ skipif: if (fd >= 0 && RunningAsInit) { dev_t d; int s, fail; - char slice[80]; + char unit[80], slice[80]; close(fd); /* Make associated slice entries */ for (s = 1; s < 33; s++) { - snprintf(slice, sizeof slice, "/dev/%ss%d", device_names[i].name, s); + snprintf(unit, sizeof unit, device_names[i].name, i); + snprintf(slice, sizeof slice, "/dev/%ss%d", unit, s); d = makedev(device_names[i].major, device_names[i].minor + (j * device_names[i].delta) + (s * SLICE_DELTA)); fail = mknod(slice, 0640 | S_IFBLK, d); diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index fbd5c56..1bd84e9 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.71 1998/03/15 16:15:47 jkh Exp $ + * $Id: devices.c,v 1.72 1998/03/16 14:33:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -302,12 +302,13 @@ skipif: if (fd >= 0 && RunningAsInit) { dev_t d; int s, fail; - char slice[80]; + char unit[80], slice[80]; close(fd); /* Make associated slice entries */ for (s = 1; s < 33; s++) { - snprintf(slice, sizeof slice, "/dev/%ss%d", device_names[i].name, s); + snprintf(unit, sizeof unit, device_names[i].name, i); + snprintf(slice, sizeof slice, "/dev/%ss%d", unit, s); d = makedev(device_names[i].major, device_names[i].minor + (j * device_names[i].delta) + (s * SLICE_DELTA)); fail = mknod(slice, 0640 | S_IFBLK, d); -- cgit v1.1