| vfs_mountroot.c (226673) | vfs_mountroot.c (228634) |
|---|---|
| 1/*- 2 * Copyright (c) 2010 Marcel Moolenaar 3 * Copyright (c) 1999-2004 Poul-Henning Kamp 4 * Copyright (c) 1999 Michael Smith 5 * Copyright (c) 1989, 1993 6 * The Regents of the University of California. All rights reserved. 7 * (c) UNIX System Laboratories, Inc. 8 * All or some portions of this file are derived from material licensed --- 24 unchanged lines hidden (view full) --- 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 */ 37 38#include "opt_rootdevname.h" 39 40#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2010 Marcel Moolenaar 3 * Copyright (c) 1999-2004 Poul-Henning Kamp 4 * Copyright (c) 1999 Michael Smith 5 * Copyright (c) 1989, 1993 6 * The Regents of the University of California. All rights reserved. 7 * (c) UNIX System Laboratories, Inc. 8 * All or some portions of this file are derived from material licensed --- 24 unchanged lines hidden (view full) --- 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 */ 37 38#include "opt_rootdevname.h" 39 40#include <sys/cdefs.h> |
| 41__FBSDID("$FreeBSD: head/sys/kern/vfs_mountroot.c 226673 2011-10-23 20:03:33Z marcel $"); | 41__FBSDID("$FreeBSD: head/sys/kern/vfs_mountroot.c 228634 2011-12-17 15:26:34Z avg $"); |
| 42 43#include <sys/param.h> 44#include <sys/conf.h> | 42 43#include <sys/param.h> 44#include <sys/conf.h> |
| 45#include <sys/cons.h> |
|
| 45#include <sys/fcntl.h> 46#include <sys/jail.h> 47#include <sys/kernel.h> | 46#include <sys/fcntl.h> 47#include <sys/jail.h> 48#include <sys/kernel.h> |
| 48#include <sys/libkern.h> | |
| 49#include <sys/malloc.h> 50#include <sys/mdioctl.h> 51#include <sys/mount.h> 52#include <sys/mutex.h> 53#include <sys/namei.h> 54#include <sys/priv.h> 55#include <sys/proc.h> 56#include <sys/filedesc.h> --- 424 unchanged lines hidden (view full) --- 481 printf("\n"); 482 printf(" ? List valid disk boot devices\n"); 483 printf(" . Yield 1 second (for background tasks)\n"); 484 printf(" <empty line> Abort manual input\n"); 485 486 do { 487 error = EINVAL; 488 printf("\nmountroot> "); | 49#include <sys/malloc.h> 50#include <sys/mdioctl.h> 51#include <sys/mount.h> 52#include <sys/mutex.h> 53#include <sys/namei.h> 54#include <sys/priv.h> 55#include <sys/proc.h> 56#include <sys/filedesc.h> --- 424 unchanged lines hidden (view full) --- 481 printf("\n"); 482 printf(" ? List valid disk boot devices\n"); 483 printf(" . Yield 1 second (for background tasks)\n"); 484 printf(" <empty line> Abort manual input\n"); 485 486 do { 487 error = EINVAL; 488 printf("\nmountroot> "); |
| 489 gets(name, sizeof(name), GETS_ECHO); | 489 cngets(name, sizeof(name), GETS_ECHO); |
| 490 if (name[0] == '\0') 491 break; 492 if (name[0] == '?' && name[1] == '\0') { 493 printf("\nList of GEOM managed disk devices:\n "); 494 g_dev_print(); 495 continue; 496 } 497 if (name[0] == '.' && name[1] == '\0') { --- 544 unchanged lines hidden --- | 490 if (name[0] == '\0') 491 break; 492 if (name[0] == '?' && name[1] == '\0') { 493 printf("\nList of GEOM managed disk devices:\n "); 494 g_dev_print(); 495 continue; 496 } 497 if (name[0] == '.' && name[1] == '\0') { --- 544 unchanged lines hidden --- |