summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sade/install.c
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2000-05-31 00:57:48 +0000
committermsmith <msmith@FreeBSD.org>2000-05-31 00:57:48 +0000
commit882dea157bab1ae77d92e076dec4ac7533093ff3 (patch)
tree7315ee54504d29244ca9e841dbe20169ffbd1395 /usr.sbin/sade/install.c
parent2dbe92be83d7108aa9708dc52c5aa009e76b3805 (diff)
downloadFreeBSD-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/sade/install.c')
-rw-r--r--usr.sbin/sade/install.c6
1 files changed, 3 insertions, 3 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) {
OpenPOWER on IntegriCloud