summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/sysinstall/install.c6
-rw-r--r--release/sysinstall/wizard.c2
-rw-r--r--usr.sbin/sade/install.c6
-rw-r--r--usr.sbin/sade/wizard.c2
-rw-r--r--usr.sbin/sysinstall/install.c6
-rw-r--r--usr.sbin/sysinstall/wizard.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index db3a990..655991d 100644
--- a/release/sysinstall/install.c
+++ b/release/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/release/sysinstall/wizard.c b/release/sysinstall/wizard.c
index 9fa1449..19a63de 100644
--- a/release/sysinstall/wizard.c
+++ b/release/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);
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);
OpenPOWER on IntegriCloud