diff options
author | msmith <msmith@FreeBSD.org> | 2000-05-31 00:57:48 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 2000-05-31 00:57:48 +0000 |
commit | 882dea157bab1ae77d92e076dec4ac7533093ff3 (patch) | |
tree | 7315ee54504d29244ca9e841dbe20169ffbd1395 /usr.sbin | |
parent | 2dbe92be83d7108aa9708dc52c5aa009e76b3805 (diff) | |
download | FreeBSD-src-882dea157bab1ae77d92e076dec4ac7533093ff3.zip FreeBSD-src-882dea157bab1ae77d92e076dec4ac7533093ff3.tar.gz |
Finish the /dev/rXXX removal job. With the libdisk fixes, this should
actually work again.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/install.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/wizard.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/wizard.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index db3a990..655991d 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -938,7 +938,7 @@ installFilesystems(dialogMenuItem *self) if (rootdev && RunningAsInit) { /* Next, create and/or mount the root device */ - sprintf(dname, "/dev/r%s", rootdev->name); + sprintf(dname, "/dev/%s", rootdev->name); if (!Fake && (!MakeDevChunk(rootdev, "/dev") || !file_readable(dname))) { msgConfirm("Unable to make device node for %s in /dev!\n" "The creation of filesystems will be aborted.", dname); @@ -1010,9 +1010,9 @@ installFilesystems(dialogMenuItem *self) continue; if (tmp->newfs && (!upgrade || !msgYesNo("You are upgrading - are you SURE you want to newfs /dev/%s?", c2->name))) - command_shell_add(tmp->mountpoint, "%s %s/dev/r%s", tmp->newfs_cmd, RunningAsInit ? "/mnt" : "", c2->name); + command_shell_add(tmp->mountpoint, "%s %s/dev/%s", tmp->newfs_cmd, RunningAsInit ? "/mnt" : "", c2->name); else - command_shell_add(tmp->mountpoint, "fsck -y %s/dev/r%s", RunningAsInit ? "/mnt" : "", c2->name); + command_shell_add(tmp->mountpoint, "fsck -y %s/dev/%s", RunningAsInit ? "/mnt" : "", c2->name); command_func_add(tmp->mountpoint, Mount, c2->name); } else if (c2->type == part && c2->subtype == FS_SWAP) { diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c index 9fa1449..19a63de 100644 --- a/usr.sbin/sade/wizard.c +++ b/usr.sbin/sade/wizard.c @@ -33,7 +33,7 @@ Scan_Disk(Disk *d) u_long l; int i,j,fd; - strcpy(device,"/dev/r"); + strcpy(device,"/dev/"); strcat(device,d->name); fd = open(device,O_RDWR); diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index db3a990..655991d 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -938,7 +938,7 @@ installFilesystems(dialogMenuItem *self) if (rootdev && RunningAsInit) { /* Next, create and/or mount the root device */ - sprintf(dname, "/dev/r%s", rootdev->name); + sprintf(dname, "/dev/%s", rootdev->name); if (!Fake && (!MakeDevChunk(rootdev, "/dev") || !file_readable(dname))) { msgConfirm("Unable to make device node for %s in /dev!\n" "The creation of filesystems will be aborted.", dname); @@ -1010,9 +1010,9 @@ installFilesystems(dialogMenuItem *self) continue; if (tmp->newfs && (!upgrade || !msgYesNo("You are upgrading - are you SURE you want to newfs /dev/%s?", c2->name))) - command_shell_add(tmp->mountpoint, "%s %s/dev/r%s", tmp->newfs_cmd, RunningAsInit ? "/mnt" : "", c2->name); + command_shell_add(tmp->mountpoint, "%s %s/dev/%s", tmp->newfs_cmd, RunningAsInit ? "/mnt" : "", c2->name); else - command_shell_add(tmp->mountpoint, "fsck -y %s/dev/r%s", RunningAsInit ? "/mnt" : "", c2->name); + command_shell_add(tmp->mountpoint, "fsck -y %s/dev/%s", RunningAsInit ? "/mnt" : "", c2->name); command_func_add(tmp->mountpoint, Mount, c2->name); } else if (c2->type == part && c2->subtype == FS_SWAP) { diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c index 9fa1449..19a63de 100644 --- a/usr.sbin/sysinstall/wizard.c +++ b/usr.sbin/sysinstall/wizard.c @@ -33,7 +33,7 @@ Scan_Disk(Disk *d) u_long l; int i,j,fd; - strcpy(device,"/dev/r"); + strcpy(device,"/dev/"); strcat(device,d->name); fd = open(device,O_RDWR); |