d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to new mount(2) argument syntax.

Browse Source 
Submitted by:	bde
This commit is contained in:
Jordan K. Hubbard 1998-01-16 15:07:55 +00:00
parent cf95d56dc5
commit a8d70a4bb7
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/sysinstall/cdrom.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: cdrom.c,v 1.38 1997/02/22 14:11:12 peter Exp $
* $Id: cdrom.c,v 1.39 1997/04/03 13:44:56 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -75,7 +75,7 @@ mediaInitCDROM(Device *dev)
Mkdir(mountpoint);
if (mount(MOUNT_CD9660, mountpoint, MNT_RDONLY, (caddr_t) &args) == -1) {
if (mount("cd9660", mountpoint, MNT_RDONLY, (caddr_t) &args) == -1) {
if (errno == EINVAL) {
msgConfirm("The CD in your drive looks more like an Audio CD than a FreeBSD release.");
return FALSE;

6
release/sysinstall/floppy.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: floppy.c,v 1.24 1997/03/19 10:09:16 jkh Exp $
* $Id: floppy.c,v 1.25 1997/04/03 13:44:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -143,8 +143,8 @@ mediaInitFloppy(Device *dev)
memset(&u_args, 0, sizeof(u_args));
u_args.fspec = dev->devname;
if (mount(MOUNT_MSDOS, mountpoint, MNT_RDONLY, (caddr_t)&dosargs) == -1) {
if (mount(MOUNT_UFS, mountpoint, MNT_RDONLY, (caddr_t)&u_args) == -1) {
if (mount("msdos", mountpoint, MNT_RDONLY, (caddr_t)&dosargs) == -1) {
if (mount("ufs", mountpoint, MNT_RDONLY, (caddr_t)&u_args) == -1) {
msgConfirm("Error mounting floppy %s (%s) on %s : %s", dev->name, dev->devname, mountpoint,
strerror(errno));
return FALSE;

6
release/sysinstall/install.c
View File

@ -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.202 1997/10/13 17:32:29 jkh Exp $
* $Id: install.c,v 1.203 1997/12/29 20:07:17 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -344,11 +344,11 @@ installFixitFloppy(dialogMenuItem *self)
while (1) {
msgConfirm("Please insert a writable fixit floppy and press return");
if (mount(MOUNT_UFS, "/mnt2", 0, (caddr_t)&args) != -1)
if (mount("ufs", "/mnt2", 0, (caddr_t)&args) != -1)
break;
msgConfirm("An attempt to mount the fixit floppy failed, maybe the filesystem\n"
"is unclean. Trying a forcible mount as a last resort...");
if (mount(MOUNT_UFS, "/mnt2", MNT_FORCE, (caddr_t)&args) != -1)
if (mount("ufs", "/mnt2", MNT_FORCE, (caddr_t)&args) != -1)
break;
if (msgYesNo("Unable to mount the fixit floppy - do you want to try again?") != 0)
return DITEM_FAILURE;

4
release/sysinstall/misc.c
View File

@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
* $Id: misc.c,v 1.35 1997/06/13 07:11:56 jkh Exp $
* $Id: misc.c,v 1.36 1997/11/05 06:11:30 obrien Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -338,7 +338,7 @@ Mount(char *mountp, void *dev)
msgDebug("mount %s %s\n", device, mountpoint);
ufsargs.fspec = device;
if (mount(MOUNT_UFS, mountpoint, RunningAsInit ? MNT_ASYNC : 0,
if (mount("ufs", mountpoint, RunningAsInit ? MNT_ASYNC : 0,
(caddr_t)&ufsargs) == -1) {
msgConfirm("Error mounting %s on %s : %s", device, mountpoint, strerror(errno));
return DITEM_FAILURE;

6
usr.sbin/sade/install.c
View File

@ -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.202 1997/10/13 17:32:29 jkh Exp $
* $Id: install.c,v 1.203 1997/12/29 20:07:17 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -344,11 +344,11 @@ installFixitFloppy(dialogMenuItem *self)
while (1) {
msgConfirm("Please insert a writable fixit floppy and press return");
if (mount(MOUNT_UFS, "/mnt2", 0, (caddr_t)&args) != -1)
if (mount("ufs", "/mnt2", 0, (caddr_t)&args) != -1)
break;
msgConfirm("An attempt to mount the fixit floppy failed, maybe the filesystem\n"
"is unclean. Trying a forcible mount as a last resort...");
if (mount(MOUNT_UFS, "/mnt2", MNT_FORCE, (caddr_t)&args) != -1)
if (mount("ufs", "/mnt2", MNT_FORCE, (caddr_t)&args) != -1)
break;
if (msgYesNo("Unable to mount the fixit floppy - do you want to try again?") != 0)
return DITEM_FAILURE;

4
usr.sbin/sade/misc.c
View File

@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
* $Id: misc.c,v 1.35 1997/06/13 07:11:56 jkh Exp $
* $Id: misc.c,v 1.36 1997/11/05 06:11:30 obrien Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -338,7 +338,7 @@ Mount(char *mountp, void *dev)
msgDebug("mount %s %s\n", device, mountpoint);
ufsargs.fspec = device;
if (mount(MOUNT_UFS, mountpoint, RunningAsInit ? MNT_ASYNC : 0,
if (mount("ufs", mountpoint, RunningAsInit ? MNT_ASYNC : 0,
(caddr_t)&ufsargs) == -1) {
msgConfirm("Error mounting %s on %s : %s", device, mountpoint, strerror(errno));
return DITEM_FAILURE;

4
usr.sbin/sysinstall/cdrom.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: cdrom.c,v 1.38 1997/02/22 14:11:12 peter Exp $
* $Id: cdrom.c,v 1.39 1997/04/03 13:44:56 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -75,7 +75,7 @@ mediaInitCDROM(Device *dev)
Mkdir(mountpoint);
if (mount(MOUNT_CD9660, mountpoint, MNT_RDONLY, (caddr_t) &args) == -1) {
if (mount("cd9660", mountpoint, MNT_RDONLY, (caddr_t) &args) == -1) {
if (errno == EINVAL) {
msgConfirm("The CD in your drive looks more like an Audio CD than a FreeBSD release.");
return FALSE;

6
usr.sbin/sysinstall/floppy.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: floppy.c,v 1.24 1997/03/19 10:09:16 jkh Exp $
* $Id: floppy.c,v 1.25 1997/04/03 13:44:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -143,8 +143,8 @@ mediaInitFloppy(Device *dev)
memset(&u_args, 0, sizeof(u_args));
u_args.fspec = dev->devname;
if (mount(MOUNT_MSDOS, mountpoint, MNT_RDONLY, (caddr_t)&dosargs) == -1) {
if (mount(MOUNT_UFS, mountpoint, MNT_RDONLY, (caddr_t)&u_args) == -1) {
if (mount("msdos", mountpoint, MNT_RDONLY, (caddr_t)&dosargs) == -1) {
if (mount("ufs", mountpoint, MNT_RDONLY, (caddr_t)&u_args) == -1) {
msgConfirm("Error mounting floppy %s (%s) on %s : %s", dev->name, dev->devname, mountpoint,
strerror(errno));
return FALSE;

6
usr.sbin/sysinstall/install.c
View File

@ -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.202 1997/10/13 17:32:29 jkh Exp $
* $Id: install.c,v 1.203 1997/12/29 20:07:17 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -344,11 +344,11 @@ installFixitFloppy(dialogMenuItem *self)
while (1) {
msgConfirm("Please insert a writable fixit floppy and press return");
if (mount(MOUNT_UFS, "/mnt2", 0, (caddr_t)&args) != -1)
if (mount("ufs", "/mnt2", 0, (caddr_t)&args) != -1)
break;
msgConfirm("An attempt to mount the fixit floppy failed, maybe the filesystem\n"
"is unclean. Trying a forcible mount as a last resort...");
if (mount(MOUNT_UFS, "/mnt2", MNT_FORCE, (caddr_t)&args) != -1)
if (mount("ufs", "/mnt2", MNT_FORCE, (caddr_t)&args) != -1)
break;
if (msgYesNo("Unable to mount the fixit floppy - do you want to try again?") != 0)
return DITEM_FAILURE;

4
usr.sbin/sysinstall/misc.c
View File

@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
* $Id: misc.c,v 1.35 1997/06/13 07:11:56 jkh Exp $
* $Id: misc.c,v 1.36 1997/11/05 06:11:30 obrien Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -338,7 +338,7 @@ Mount(char *mountp, void *dev)
msgDebug("mount %s %s\n", device, mountpoint);
ufsargs.fspec = device;
if (mount(MOUNT_UFS, mountpoint, RunningAsInit ? MNT_ASYNC : 0,
if (mount("ufs", mountpoint, RunningAsInit ? MNT_ASYNC : 0,
(caddr_t)&ufsargs) == -1) {
msgConfirm("Error mounting %s on %s : %s", device, mountpoint, strerror(errno));
return DITEM_FAILURE;