From ffc4374869b9ac10539a3c18e13b29d1b0c64484 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 7 Dec 2006 00:25:53 +0100 Subject: [PATCH] Imported from util-linux-2.11o tarball. --- HISTORY | 30 +- MCONFIG | 8 +- VERSION | 2 +- configure | 18 +- disk-utils/Makefile | 4 +- disk-utils/README.bootutils-0.1 | 104 - disk-utils/blockdev.c | 1 - disk-utils/elvtune.c | 2 +- disk-utils/isosize.c | 2 +- disk-utils/mkfs.bfs.c | 2 +- disk-utils/mkfs.c | 2 +- disk-utils/mkfs.minix.c | 2 +- disk-utils/raw.c | 18 +- example.files/rc.serial | 194 - fdisk/cfdisk.c | 14 +- fdisk/fdisk.c | 2 +- fdisk/i386_sys_types.c | 3 + fdisk/sfdisk.c | 191 +- getopt-1.1.2/getopt.1 | 2 +- hwclock/cmos.c | 6 +- hwclock/hwclock.c | 2 +- login-utils/README.admutil | 249 - login-utils/chfn.c | 2 +- login-utils/chsh.c | 2 +- login-utils/last.c | 2 +- login-utils/login.c | 2 +- login-utils/mesg.c | 2 +- login-utils/passwd.c | 3 +- login-utils/wall.1 | 3 + login-utils/wall.c | 2 +- misc-utils/Makefile | 12 +- misc-utils/cal.1 | 19 +- misc-utils/cal.c | 9 +- misc-utils/logger.c | 2 +- misc-utils/look.c | 2 +- misc-utils/mcookie.c | 2 +- misc-utils/namei.c | 2 +- misc-utils/replay.1 | 5 +- misc-utils/replay.pl | 6 +- misc-utils/script.1 | 3 +- misc-utils/script.c | 10 +- misc-utils/setterm.c | 3 +- mount/fstab.5 | 105 +- mount/linux_fs.h | 3 +- mount/lomount.c | 2 +- mount/mount.8 | 83 +- mount/mount.c | 19 +- mount/mount_guess_fstype.c | 88 +- mount/mount_guess_fstype.h | 3 +- mount/swapon.c | 2 +- mount/umount.c | 72 +- po/Makefile | 4 +- po/cat-id-tbl.c | 2963 +++++------ po/cs.po | 762 +-- po/da.po | 762 +-- po/de.po | 764 +-- po/es.po | 2733 +++++----- po/et.po | 8874 +++++++++++++++++++++++++++++++ po/fr.po | 759 +-- po/it.po | 759 +-- po/ja.po | 868 +-- po/nl.po | 746 +-- po/pt_BR.po | 762 +-- po/sv.po | 762 +-- po/tr.po | 762 +-- sys-utils/cytune.c | 3 +- sys-utils/dmesg.c | 2 +- sys-utils/ipcs.c | 2 +- sys-utils/readprofile.c | 2 +- sys-utils/tunelp.c | 2 +- text-utils/Makefile | 2 +- text-utils/col.c | 2 - text-utils/colrm.c | 6 +- text-utils/column.c | 4 +- text-utils/conv.c | 18 +- text-utils/display.c | 231 +- text-utils/hexdump.1 | 39 +- text-utils/hexdump.c | 2 +- text-utils/hexdump.h | 10 +- text-utils/hexsyntax.c | 26 +- text-utils/od.1 | 12 +- text-utils/odsyntax.c | 84 +- text-utils/parse.c | 187 +- text-utils/rev.c | 2 +- text-utils/ul.c | 4 +- 85 files changed, 16583 insertions(+), 7665 deletions(-) delete mode 100644 disk-utils/README.bootutils-0.1 delete mode 100644 example.files/rc.serial delete mode 100644 login-utils/README.admutil create mode 100644 po/et.po diff --git a/HISTORY b/HISTORY index b44d5fcc..36fd0e38 100644 --- a/HISTORY +++ b/HISTORY @@ -1,7 +1,33 @@ +util-linux 2.11o + +* Estonian messages (Meelis Roos) +* No new French messages yet (Michel Robitaille) +* Japanese messages (Daisuke Yamashita) +* Spanish messages (Santiago Vila Doncel) +* cal: option -s: Sunday is first day of the week +* cal.1: updated +* cfdisk: give not only bytes but also MB or GB for clarity. +* colrm: wide character fix (Elliot Lee) +* *fdisk: added Darwin types (Vincent Bourgonjen) +* fstab.5: updated +* hwclock: cmos.c: do not include on alpha +* mount: improved detection of ufs (and slowdown of detection of iso9660) +* mount.8: added info on * in /etc/filesystems, shortname option of vfat, + mount --move, udf, return codes +* raw: try /dev/raw/rawctl when /dev/rawctl fails (Thierry Vignaud) +* rc.serial: removed - setserial is no longer in util-linux (kromJx) +* README.admutil: removed - only of historical interest +* README.bootutils-0.1: removed - only of historical interest +* script: security fix +* sfdisk: improved geometry detection; wider columns; default disks from + /proc/partitions +* umount: permission test owner umount +* wall.1: added suid restriction + util-linux 2.11n * Danish messages (Claus Hindsgaul) -* No new French messages yet +* No new French messages yet (Michel Robitaille) * German messages (Karl Eichwalder) * Swedish messages (Christian Rose) * Turkish messages now in UTF-8 (Nilgün Belma Bugüner) @@ -66,7 +92,7 @@ util-linux 2.11k util-linux 2.11j -* No new French messages yet +* No new French messages yet (Michel Robitaille) * fdisk: fix for AIX label (Olaf Hering) * fdisk: fix for creating DOS label when BSD label is present * mount.8: added remark about blocksize to ext2 sb= mount option description. diff --git a/MCONFIG b/MCONFIG index 60ba808a..54e5e6d6 100644 --- a/MCONFIG +++ b/MCONFIG @@ -70,6 +70,11 @@ HAVE_GETTY=no # properly.] USE_TTY_GROUP=yes +# If HAVE_KILL is set to "yes", then kill will not be built or +# installed from the misc-utils subdirectory. +# (There is also a kill in the procps package.) +HAVE_KILL=no + # If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN # to the current user, allowing her to make a screendump and do other # nifty things on the console, but also allowing him to keep an open @@ -88,9 +93,6 @@ HAVE_SLN=no # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. HAVE_FDUTILS=no -# This enables building of raw -ADD_RAW=yes - # Different optimizations for different cpus. # gcc 3.0 likes options -mcpu=i486 instead of -m486 ifeq "$(ARCH)" "intel" diff --git a/VERSION b/VERSION index 7014172f..4ce74c6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.11n +2.11o diff --git a/configure b/configure index 2a03d0ab..4f7b5050 100755 --- a/configure +++ b/configure @@ -13,6 +13,7 @@ # H5. For cal.c: do we have ? # H6. For mkswap.c: do we have or ? # H7. For nfsmount.h (nfsmount_xdr.c: int32_t): do we have ? +# H8. For raw.c: do we have ? # # Existence of functions: # F1. For nfsmount.c: is inet_aton() available? @@ -144,6 +145,13 @@ if ./testincl "asm/types.h"; then echo "#define HAVE_asm_types_h" >> defines.h fi +# +# H8. For raw.c: do we have ? +# +if ./testincl "linux/raw.h"; then + echo "HAVE_RAW_H=yes" >> make_include +fi + # # Find out about the existence of functions @@ -344,7 +352,7 @@ else fi # -# Some systems have /usr/lib/termcap.so -> /usr/lib/termcap.so.2 +# 3. Some systems have /usr/lib/termcap.so -> /usr/lib/termcap.so.2 # where however the latter file does not exist. When termcap does # not exist, we can try to compile more with curses instead. # @@ -357,6 +365,7 @@ eval $compile LIBS= if test -s conftest && ./conftest 2>/dev/null; then echo "#define HAVE_termcap" >> defines.h + echo "HAVE_TERMCAP=yes" >> make_include echo "LIBTERMCAP=-ltermcap" >> make_include echo "You have termcap" else @@ -431,6 +440,11 @@ rm -f conftest conftest.c # # 7. Does xgettext exist and take the option --foreign-user? # +# We use the bash builtin "type" here. +# I don't see an easy way to avoid it. +# Many Linux systems do not have "which". Maybe "env" can be used. +# Writing /usr/bin/xgettext is no good: one may have xgettext elsewhere. +# if (test $ENABLE_NLS = yes && type xgettext > /dev/null 2>&1); then msg=`xgettext --foreign-user 2>&1 | grep unrecognized` if test -n "$msg"; then @@ -594,7 +608,7 @@ then echo "HAVE_GOOD_RPC=yes" >> make_include echo "Your rpcgen seems to work" else - echo "Your rpcgen output does not compile" + echo "Your rpcgen output does not compile - using pregenerated code" fi rm -f conftest conftestx.c conftestl.c conftest.h conftest.x conferrs rm -f conftestx.o conftestl.o diff --git a/disk-utils/Makefile b/disk-utils/Makefile index af15ee41..044a97e6 100644 --- a/disk-utils/Makefile +++ b/disk-utils/Makefile @@ -25,9 +25,7 @@ USRBIN:=$(USRBIN) setfdprm MAN8:=$(MAN8) setfdprm.8 endif -# raw.c does not compile on 2.2.*. -# find out later where it does and add tests to config -ifeq "$(ADD_RAW)" "yes" +ifeq "$(HAVE_RAW_H)" "yes" USRBIN:=$(USRBIN) raw MAN8:=$(MAN8) raw.8 endif diff --git a/disk-utils/README.bootutils-0.1 b/disk-utils/README.bootutils-0.1 deleted file mode 100644 index d87437e8..00000000 --- a/disk-utils/README.bootutils-0.1 +++ /dev/null @@ -1,104 +0,0 @@ -bootutils-0.1 - -* ALPHA RELEASE: Use at your own risk! * - -* You MUST have 0.99pl10 or later kernel to make use of all of the - facilities of this package. If you can live without the unmount-root - feature, then 0.99pl9 will work. * - -This is the first release of a set of utilities designed to automate -the management and checking of filesystems at boot time and shutdown. -It supports automatic and safe 'fsck' of all filesystems (including -root) at boot time by booting with root readonly; if the fsck succeeds -then root is remounted read-write and booting can continue. - -Why bother? - -Well, many people like to have a safe and reliable check of all their -filesystems during boot. This is especially true for ext2fs, because -all ext2fs filesystems have a special 'clean' flag which gets set when -the filesystem is cleaned (by e2fsck) or is unmounted cleanly, and -which gets unset when the filesystem is active. e2fsck can sense this -flag, and will skip over filesystems which are clean. - -This means that e2fsck won't bother you with a laborious filesystem -check at each startup, as long as you always shut down cleanly; but it -will check your filesystems automatically if you ever have a crash, -because afterwards the filesystem 'clean' flags will not be set. You -*can* still mount an unclean filesystem, but ext2fs will give you a -warning and will not mark it clean when it gets unmounted. - -One of the problems with automatic fsck'ing is that it is unsafe to -check mounted, active filesystems. The solution is to initially mount -only the root filesystem, and to mount it in readonly mode. In this -situation, fsck can run safely on all filesystems, without the danger -that the kernel might start conflicting with the repairs being done to -the filesystem. - -If any repairs were done, it is unsafe to proceed any further because -the kernel might have cached old information about the filesystems -which has been updated by fsck. However, if the fsck succeeded, then -we can remount the root filesystem in read-write mode and proceed to -mount all of the other filesystems. - -Finally, in order to ensure that filesystems are correctly tidied up -on shutdown, we need to unmount the root at shutdown. This is usually -done automatically; the standard Linux shutdown programs do a 'umount -- -a' command to unmount all mounted filesystems. You MUST have a -0.99pl10 or later kernel for this to work. Many versions of umount -explicitly do not try to unmount the root, since pre-99pl10 kernels -forbade this. The umount included here will unmount even the root -filesystem. (A special kernel trick in pl10 allows this to work by -keeping the filesystem alive in readonly mode after it has been tidied -up.) - -The bootup operation of this package is invoked by the /etc/rc shell -script, an example of which is in mount/etc/rc. It contains the -following important lines: - - # Check the integrity of all filesystems - /bin/fsck -A -a - # If there was a failure, drop into single-user mode. - if [ $? -gt 1 ] ; then - echo fsck failed. Please reboot. - sh - fi - - # Remount the root filesystem in read-write mode - /etc/mount -n -o remount /dev/hda3 / - - # remove /etc/mtab* so that mount will create it with a root entry - /bin/rm -f /etc/mtab* /etc/nologin /etc/utmp - - # mount file systems in fstab (and create an entry for /) - # but not NFS because TCP/IP is not yet configured - /etc/mount -avt nonfs - - -This is the first attempt at a complete package for automated clean -fsck support, so you may well find that you would like a slightly -different behaviour. Please feel free to send me comments, bug -reports and improvements! - - -This package includes three separate items, shamelessly adapted from -other, more or less standard Linux programs. - -* rdev.c: a modified rdev which is extended to allow the - readonly/readwrite status of the kernel image to be altered. Use - rdev -R 1 - to make the kernel mount in readonly mode. This can be overridden - by the use of the 'read-only' or 'read-write' keywords of the most - recent version of LILO. - -* Mount/umount package: This was recently posted to the net, and - implements the '-o remount' mount option which allows filesystems to - be remounted. Unlike the previous post, the version included here - also attempts to unmount the root filesystem on 'umount -a'. I have - also tried to clean up the man-pages. - -* fsck package: David Engel's fsck front-end. Read the README for it. - This package implements the 'fsck -A' command which will check all - filesystems in /etc/fstab automatically. - -Stephen Tweedie diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c index 367eeb23..b1422a82 100644 --- a/disk-utils/blockdev.c +++ b/disk-utils/blockdev.c @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c index 75ab57c0..2c49b444 100644 --- a/disk-utils/elvtune.c +++ b/disk-utils/elvtune.c @@ -69,7 +69,7 @@ main(int argc, char * argv[]) { int opt; opt = getopt(argc, argv, "r:w:b:hv"); - if (opt < 0) + if (opt == -1) break; switch (opt) { case 'r': diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c index bff45d92..005077a8 100644 --- a/disk-utils/isosize.c +++ b/disk-utils/isosize.c @@ -184,7 +184,7 @@ main(int argc, char * argv[]) { int opt; opt = getopt(argc, argv, "xd:"); - if (opt < 0) + if (opt == -1) break; switch (opt) { case 'd': diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c index b27fd2eb..47863bb1 100644 --- a/disk-utils/mkfs.bfs.c +++ b/disk-utils/mkfs.bfs.c @@ -123,7 +123,7 @@ main(int argc, char *argv[]) { volume = fsname = " "; /* is there a default? */ inodes = 0; - while (EOF != (c = getopt(argc, argv, "vF:N:V:cl:"))) { + while ((c = getopt(argc, argv, "vF:N:V:cl:")) != -1) { switch (c) { case 'N': inodes = atol(optarg); diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 51b18f30..c5aa7566 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) /* Check commandline options. */ opterr = 0; - while ((more == 0) && ((i = getopt(argc, argv, "Vt:")) != EOF)) + while ((more == 0) && ((i = getopt(argc, argv, "Vt:")) != -1)) switch (i) { case 'V': verbose++; diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index 55d97e01..b56b095f 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -652,7 +652,7 @@ main(int argc, char ** argv) { die(_("bad inode size")); #endif opterr = 0; - while ((i = getopt(argc, argv, "ci:l:n:v")) != EOF) + while ((i = getopt(argc, argv, "ci:l:n:v")) != -1) switch (i) { case 'c': check=1; break; diff --git a/disk-utils/raw.c b/disk-utils/raw.c index 6e20fe26..d58c58ec 100644 --- a/disk-utils/raw.c +++ b/disk-utils/raw.c @@ -29,6 +29,7 @@ #define RAWCTLDEV "/dev/rawctl" #define RAWDEVDIR "/dev/raw/" #endif +#define DEVFS_RAWCTLDEV "/dev/raw/rawctl" char * progname; @@ -69,7 +70,7 @@ int main(int argc, char *argv[]) progname = argv[0]; - while ((c = getopt(argc, argv, "ahq")) != EOF) { + while ((c = getopt(argc, argv, "ahq")) != -1) { switch (c) { case 'a': do_query_all = 1; @@ -173,12 +174,19 @@ int main(int argc, char *argv[]) void open_raw_ctl(void) { + int errsv; + master_fd = open(RAWCTLDEV, O_RDWR, 0); if (master_fd < 0) { - fprintf (stderr, - "Cannot open master raw device '" RAWCTLDEV "' (%s)\n", - strerror(errno)); - exit(2); + errsv = errno; + master_fd = open(DEVFS_RAWCTLDEV, O_RDWR, 0); + if (master_fd < 0) { + fprintf (stderr, + "Cannot open master raw device '" + RAWCTLDEV + "' (%s)\n", strerror(errsv)); + exit(2); + } } } diff --git a/example.files/rc.serial b/example.files/rc.serial deleted file mode 100644 index 1f3b07d0..00000000 --- a/example.files/rc.serial +++ /dev/null @@ -1,194 +0,0 @@ -# -# /etc/rc.serial -# Initializes the serial ports on your system -# -# Distributed with setserial version 2.10 -# - -# Standard flags you want your serial devices to have -# Examples: SAK, pgrp_lockout, session_lockout -# -STD_FLAGS="session_lockout" - -SETSERIAL=/sbin/setserial - -echo -n "Configuring serial ports...." - -# Do wild interrupt detection -# -${SETSERIAL} -W /dev/cua0 - -############################################################### -# -# AUTOMATIC CONFIGURATION -# -# Uncomment the appropriate lines below to enable auto-configuration -# of a particular board. Or comment them out to disable them.... -# -# NOTE! Although the automatic configuration is enabled by default, -# I strongly suggest that you comment out this section and use the -# manual configuration section instead. It's more work to set up, but -# it's more reliable. -# -############################################################### - -# Do AUTOMATIC_IRQ probing -# -AUTO_IRQ=auto_irq - -# These are the standard COM1 through COM4 devices -# -# If you have an internal modeme with a Rockwell Chipset, add a "skip_test" -# to the /dev/cua3 line below. (It's not added by default because it will -# screw up people with 8514 displays). -# -${SETSERIAL} /dev/cua0 ${AUTO_IRQ} skip_test autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua1 ${AUTO_IRQ} skip_test autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua2 ${AUTO_IRQ} skip_test autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua3 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - -# These are for the first AST Fourport board (base address 0x1A0) -# -${SETSERIAL} /dev/cua4 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua5 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua6 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua7 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - -# These are for the second AST Fourport board (base address 0x2A0) -# -${SETSERIAL} /dev/cua8 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua9 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua10 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua11 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - -# These are the 3rd and 4th ports on the Accent Async board. -# -#${SETSERIAL} /dev/cua12 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua13 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - -# Usenet Serial Board II (base address 0x100) -# -#${SETSERIAL} /dev/cua16 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua17 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua18 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua19 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - - -# BocaBoard 4 port (BB-1004) (base address 0x100) -# -#${SETSERIAL} /dev/cua16 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua17 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua18 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua19 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - -# BocaBoard 8 port (BB-1008) (base address 0x100), -# or two BB-1004's (base addresses 0x100 and 0x120) -# -#${SETSERIAL} /dev/cua16 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua17 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua18 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua19 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua20 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua21 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua22 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -#${SETSERIAL} /dev/cua23 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - -# BocaBoard 16 port (BB-1008), (base address 0x100), -# or two BB-1008's (base addresses 0x100 and 0x140), -# or four BB-1004's (base address 0x100, 0x120, 0x140, and 0x160) -# -# Warning --- some of these ports may conflict with the Future Domain -# SCSI controller. If you want to run both the BocaBoards and the -# Future Domain controller, you may need to change the port assignment -# of the Bocaboards -- see below in the section on manual configuration. -# -${SETSERIAL} /dev/cua16 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua17 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua18 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua19 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua20 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua21 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua22 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua23 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua24 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua25 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua26 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua27 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua28 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua29 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua30 ${AUTO_IRQ} autoconfig ${STD_FLAGS} -${SETSERIAL} /dev/cua31 ${AUTO_IRQ} autoconfig ${STD_FLAGS} - -############################################################### -# -# MANUAL CONFIGURATION -# -# If you want to do manual configuration of one or more of your -# serial ports, uncomment and modify the relevant lines. -# -############################################################### - -# These are the standard COM1 through COM4 devices -# -#${SETSERIAL} /dev/cua0 uart 16450 port 0x3F8 irq 4 ${STD_FLAGS} -#${SETSERIAL} /dev/cua1 uart 16450 port 0x2F8 irq 3 ${STD_FLAGS} -#${SETSERIAL} /dev/cua2 uart 16450 port 0x3E8 irq 4 ${STD_FLAGS} -#${SETSERIAL} /dev/cua3 uart 16450 port 0x2E8 irq 3 ${STD_FLAGS} - -# These are the first set of AST Fourport ports -# -#${SETSERIAL} /dev/cua4 uart 16450 port 0x1A0 irq 9 fourport ${STD_FLAGS} -#${SETSERIAL} /dev/cua5 uart 16450 port 0x1A8 irq 9 fourport ${STD_FLAGS} -#${SETSERIAL} /dev/cua6 uart 16450 port 0x1B0 irq 9 fourport ${STD_FLAGS} -#${SETSERIAL} /dev/cua7 uart 16450 port 0x1B8 irq 9 fourport ${STD_FLAGS} - -# These are the second set of AST Fourport ports -# -#${SETSERIAL} /dev/cua8 uart 16450 port 0x2A0 irq 5 fourport ${STD_FLAGS} -#${SETSERIAL} /dev/cua9 uart 16450 port 0x2A8 irq 5 fourport ${STD_FLAGS} -#${SETSERIAL} /dev/cua10 uart 16450 port 0x2B0 irq 5 fourport ${STD_FLAGS} -#${SETSERIAL} /dev/cua11 uart 16450 port 0x2B8 irq 5 fourport ${STD_FLAGS} - -# These are the 3rd and 4th ports on the Accent Async board. -# -#${SETSERIAL} /dev/cua12 uart 16450 port 0x330 irq 4 ${STD_FLAGS} -#${SETSERIAL} /dev/cua13 uart 16450 port 0x338 irq 4 ${STD_FLAGS} - -# These are two spare devices you can use to customize for -# some board which is not supported above.... -#${SETSERIAL} /dev/cua14 uart XXXXX port XXXX irq X ${STD_FLAGS} -#${SETSERIAL} /dev/cua15 uart XXXXX port XXXX irq X ${STD_FLAGS} - -# These are the ports used for either the Usenet Serial II -# board, or the Boca Board 4, 8, or 16 port boards. -# -# Uncomment only the first 4 lines for the Usenet Serial II board, -# and uncomment the first 4, 8, or all 16 lines for the -# Boca Board BB-1004, BB-1008, and BB-2016 respectively. -# -#${SETSERIAL} /dev/cua16 uart 16550A port 0x100 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua17 uart 16550A port 0x108 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua18 uart 16550A port 0x110 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua19 uart 16550A port 0x118 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua20 uart 16550A port 0x120 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua21 uart 16550A port 0x128 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua22 uart 16550A port 0x130 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua23 uart 16550A port 0x138 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua24 uart 16550A port 0x140 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua25 uart 16550A port 0x148 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua26 uart 16550A port 0x150 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua27 uart 16550A port 0x158 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua28 uart 16550A port 0x160 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua29 uart 16550A port 0x168 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua30 uart 16550A port 0x170 irq 12 ${STD_FLAGS} -#${SETSERIAL} /dev/cua31 uart 16550A port 0x178 irq 12 ${STD_FLAGS} - -########################################################### -# -# Print the results of the serial configuration process -# -########################################################### - -echo "done." - -${SETSERIAL} -bg /dev/cua? /dev/cua?? diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 656b1aea..d69dba5e 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -2569,8 +2569,16 @@ draw_screen(void) { mvaddstr(HEADER_START, (COLS-strlen(line))/2, line); sprintf(line, _("Disk Drive: %s"), disk_device); mvaddstr(HEADER_START+2, (COLS-strlen(line))/2, line); - { long long bytes = actual_size*(long long) SECTOR_SIZE; - sprintf(line, _("Size: %lld bytes"), bytes); } + { + long long bytes = actual_size*(long long) SECTOR_SIZE; + long megabytes = bytes/1000000; + if (megabytes < 10000) + sprintf(line, _("Size: %lld bytes, %ld MB"), + bytes, megabytes); + else + sprintf(line, _("Size: %lld bytes, %ld.%ld GB"), + bytes, megabytes/1000, (megabytes/100)%10); + } mvaddstr(HEADER_START+3, (COLS-strlen(line))/2, line); sprintf(line, _("Heads: %d Sectors per Track: %d Cylinders: %d"), heads, sectors, cylinders); @@ -2844,7 +2852,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - while ((c = getopt(argc, argv, "ac:gh:s:vzP:")) != EOF) + while ((c = getopt(argc, argv, "ac:gh:s:vzP:")) != -1) switch (c) { case 'a': arrow_cursor = TRUE; diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c index 4e709b7b..6c07186d 100644 --- a/fdisk/fdisk.c +++ b/fdisk/fdisk.c @@ -2272,7 +2272,7 @@ main(int argc, char **argv) { * fdisk -s [partition] ... * fdisk [-b sectorsize] [-u] device */ - while ((c = getopt(argc, argv, "b:lsuvV")) != EOF) { + while ((c = getopt(argc, argv, "b:lsuvV")) != -1) { switch (c) { case 'b': /* ugly: this sector size is really per device, diff --git a/fdisk/i386_sys_types.c b/fdisk/i386_sys_types.c index b2b7e753..5ecf2cc5 100644 --- a/fdisk/i386_sys_types.c +++ b/fdisk/i386_sys_types.c @@ -67,10 +67,13 @@ struct systypes i386_sys_types[] = { {0xa5, N_("FreeBSD")}, /* various BSD flavours */ {0xa6, N_("OpenBSD")}, {0xa7, N_("NeXTSTEP")}, + {0xa8, N_("Darwin UFS")}, {0xa9, N_("NetBSD")}, + {0xab, N_("Darwin boot")}, {0xb7, N_("BSDI fs")}, {0xb8, N_("BSDI swap")}, {0xbb, N_("Boot Wizard hidden")}, + {0xbe, N_("Solaris boot")}, {0xc1, N_("DRDOS/sec (FAT-12)")}, {0xc4, N_("DRDOS/sec (FAT-16 < 32M)")}, {0xc6, N_("DRDOS/sec (FAT-16)")}, diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c index 40432193..ddd553dd 100644 --- a/fdisk/sfdisk.c +++ b/fdisk/sfdisk.c @@ -868,24 +868,24 @@ out_partition_header(char *dev, int format, struct geometry G) { printf(_("Units = cylinders of %lu bytes, blocks of 1024 bytes" ", counting from %d\n\n"), G.cylindersize<<9, increment); - printf(_(" Device Boot Start End #cyls #blocks Id System\n")); + printf(_(" Device Boot Start End #cyls #blocks Id System\n")); break; } /* fall through */ case F_SECTOR: printf(_("Units = sectors of 512 bytes, counting from %d\n\n"), increment); - printf(_(" Device Boot Start End #sectors Id System\n")); + printf(_(" Device Boot Start End #sectors Id System\n")); break; case F_BLOCK: printf(_("Units = blocks of 1024 bytes, counting from %d\n\n"), increment); - printf(_(" Device Boot Start End #blocks Id System\n")); + printf(_(" Device Boot Start End #blocks Id System\n")); break; case F_MEGABYTE: printf(_("Units = megabytes of 1048576 bytes, blocks of 1024 bytes" ", counting from %d\n\n"), increment); - printf(_(" Device Boot Start End MB #blocks Id System\n")); + printf(_(" Device Boot Start End MB #blocks Id System\n")); break; } } @@ -917,13 +917,41 @@ out_roundup_size(int width, unsigned long n, unsigned long unit) { putchar(' '); } -static int -get_fdisk_geometry(struct part_desc *p) { +static struct geometry +get_fdisk_geometry_one(struct part_desc *p) { + struct geometry G; + chs b = p->p.end_chs; longchs bb = chs_to_longchs(b); - F.heads = bb.h+1; - F.sectors = bb.s; - F.cylindersize = F.heads*F.sectors; + G.heads = bb.h+1; + G.sectors = bb.s; + G.cylindersize = G.heads*G.sectors; + G.cylinders = G.start = 0; + return G; +} + +static int +get_fdisk_geometry(struct disk_desc *z) { + struct part_desc *p; + int pno, agree; + struct geometry G0, G; + + agree = 0; + G0.heads = G0.sectors = 0; + for (pno=0; pno < z->partno; pno++) { + p = &(z->partitions[pno]); + if (p->size != 0 && p->p.sys_type != 0) { + G = get_fdisk_geometry_one(p); + if (!G0.heads) { + G0 = G; + agree = 1; + } else if (G.heads != G0.heads || G.sectors != G0.sectors) { + agree = 0; + break; + } + } + } + F = (agree ? G0 : B); return (F.sectors != B.sectors || F.heads != B.heads); } @@ -952,7 +980,7 @@ out_partition(char *dev, int format, struct part_desc *p, if (dump) { printf(" start=%9lu", start); - printf(", size=%8lu", size); + printf(", size=%9lu", size); if (p->ptype == DOS_TYPE) { printf(", Id=%2x", p->p.sys_type); if (p->p.bootable == 0x80) @@ -975,7 +1003,7 @@ out_partition(char *dev, int format, struct part_desc *p, out_rounddown(6, start, G.cylindersize, increment); out_roundup(6, end, G.cylindersize, increment); out_roundup_size(6, size, G.cylindersize); - out_rounddown(8, size, 2, 0); + out_rounddown(9, size, 2, 0); break; } /* fall through */ @@ -983,7 +1011,7 @@ out_partition(char *dev, int format, struct part_desc *p, case F_SECTOR: out_rounddown(9, start, 1, increment); out_roundup(9, end, 1, increment); - out_rounddown(9, size, 1, 0); + out_rounddown(10, size, 1, 0); break; case F_BLOCK: #if 0 @@ -992,17 +1020,17 @@ out_partition(char *dev, int format, struct part_desc *p, #endif out_rounddown(8, start, 2, increment); out_roundup(8, end, 2, increment); - out_rounddown(8, size, 2, 0); + out_rounddown(9, size, 2, 0); break; case F_MEGABYTE: out_rounddown(5, start, 2048, increment); out_roundup(5, end, 2048, increment); out_roundup_size(5, size, 2048); - out_rounddown(8, size, 2, 0); + out_rounddown(9, size, 2, 0); break; } if (p->ptype == DOS_TYPE) { - printf(" %2x %s\n", + printf(" %2x %s\n", p->p.sys_type, sysname(p->p.sys_type)); } else { printf("\n"); @@ -1034,24 +1062,19 @@ out_partition(char *dev, int format, struct part_desc *p, static void out_partitions(char *dev, struct disk_desc *z) { - struct part_desc *p; int pno, format = 0; if (z->partno == 0) printf(_("No partitions found\n")); else { - for (pno=0; pno < z->partno; pno++) { - p = &(z->partitions[pno]); - if (p->size != 0 && p->p.sys_type != 0) { - if (get_fdisk_geometry(p) && !dump) - printf( - _("Warning: The first partition looks like it was made\n" - " for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n" - "For this listing I'll assume that geometry.\n"), - F.heads, F.sectors, B.cylinders, B.heads, B.sectors); - break; - } + if (get_fdisk_geometry(z) && !dump) { + printf( + _("Warning: The partition table looks like it was made\n" + " for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n" + "For this listing I'll assume that geometry.\n"), + F.heads, F.sectors, B.cylinders, B.heads, B.sectors); } + out_partition_header(dev, format, F); for(pno=0; pno < z->partno; pno++) { out_partition(dev, format, &(z->partitions[pno]), z, F); @@ -1094,7 +1117,7 @@ partitions_ok(struct disk_desc *z) { /* Have at least 4 partitions been defined? */ if (partno < 4) { - if (!partno) + if (!partno) fatal(_("no partition table present.\n")); else fatal(_("strange, only %d partitions defined.\n"), partno); @@ -1144,10 +1167,10 @@ partitions_ok(struct disk_desc *z) { table sectors disjoint? */ for (p = partitions; p < partitions+partno; p++) if (p->size && !is_extended(p->p.sys_type)) - for (q = partitions; q < partitions+partno; q++) - if (is_extended(q->p.sys_type)) - if (p->start <= q->start && p->start + p->size > q->start) { - warn(_("Warning: partition %s contains part of " + for (q = partitions; q < partitions+partno; q++) + if (is_extended(q->p.sys_type)) + if (p->start <= q->start && p->start + p->size > q->start) { + warn(_("Warning: partition %s contains part of " "the partition table (sector %lu),\n" "and will destroy it when filled\n"), PNO(p), q->start); @@ -1161,12 +1184,12 @@ partitions_ok(struct disk_desc *z) { if(p->start == 0) { warn(_("Warning: partition %s starts at sector 0\n"), PNO(p)); return 0; - } - if (p->size && p->start + p->size > ds) { + } + if (p->size && p->start + p->size > ds) { warn(_("Warning: partition %s extends past end of disk\n"), PNO(p)); return 0; - } + } } } @@ -1225,12 +1248,12 @@ partitions_ok(struct disk_desc *z) { "This does not matter for LILO, but the DOS MBR will " "not boot this disk.\n")); break; - } + } if (p - partitions >= 4) { warn(_("Warning: usually one can boot from primary partitions " "only\nLILO disregards the `bootable' flag.\n")); break; - } + } } if (pno == -1 || pno >= 4) warn(_("Warning: no primary partition is marked bootable (active)\n" @@ -1337,7 +1360,7 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) partitions[pno].ptype = DOS_TYPE; partitions[pno].p = p; pno++; - } + } here = next; } @@ -1346,19 +1369,19 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) #define BSD_DISKMAGIC (0x82564557UL) #define BSD_MAXPARTITIONS 8 -#define BSD_FS_UNUSED 0 +#define BSD_FS_UNUSED 0 typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; struct bsd_disklabel { u32 d_magic; char d_junk1[4]; - char d_typename[16]; - char d_packname[16]; + char d_typename[16]; + char d_packname[16]; char d_junk2[92]; - u32 d_magic2; + u32 d_magic2; char d_junk3[2]; - u16 d_npartitions; /* number of partitions in following */ + u16 d_npartitions; /* number of partitions in following */ char d_junk4[8]; struct bsd_partition { /* the partition table */ u32 p_size; /* number of sectors in partition */ @@ -2298,25 +2321,6 @@ static const struct option long_opts[] = { { NULL, 0, NULL, 0 } }; -/* default devices to list - will be removed */ -static struct devd { - char *pref, *letters; -} defdevs[] = { - { "hd", "abcdefgh" }, - { "sd", "abcde" }, - { "xd", "ab" }, - { "ed", "abcd" }, - /* Compaq's SMART Array Controllers */ - { "cciss/c0d", "01234567" }, - { "cciss/c1d", "01234567" }, - /* Compaq's SMART2 Intelligent Disk Array Controllers */ - { "ida/c0d", "01234567" }, - { "ida/c1d", "01234567" }, - /* Mylex DAC960/AcceleRAID/eXtremeRAID PCI RAID Controllers */ - { "rd/c0d", "01234567" }, - { "rd/c1d", "01234567" } -}; - static int is_ide_cdrom_or_tape(char *device) { FILE *procf; @@ -2350,6 +2354,40 @@ is_ide_cdrom_or_tape(char *device) { return is_ide; } +#define PROC_PARTITIONS "/proc/partitions" +static FILE *procf = NULL; + +static void +openproc(void) { + procf = fopen(PROC_PARTITIONS, "r"); + if (procf == NULL) + fprintf(stderr, _("cannot open %s\n"), PROC_PARTITIONS); +} + +static char * +nextproc(void) { + static char devname[120]; + char line[100], ptname[100], *s; + int ma, mi, sz; + + if (procf == NULL) + return NULL; + while (fgets(line, sizeof(line), procf) != NULL) { + if (sscanf (line, " %d %d %d %[^\n ]", + &ma, &mi, &sz, ptname) != 4) + continue; + for(s = ptname; *s; s++); + if (isdigit(s[-1])) + continue; + snprintf(devname, sizeof(devname), "/dev/%s", ptname); + return devname; + } + + fclose(procf); + procf = NULL; + return NULL; +} + static void do_list(char *dev, int silent); static void do_size(char *dev, int silent); static void do_geom(char *dev, int silent); @@ -2484,25 +2522,18 @@ main(int argc, char **argv) { } if (optind == argc && (opt_list || opt_out_geom || opt_size || verify)) { - struct devd *dp; - char *lp; - char device[10]; - + /* try all known devices */ total_size = 0; - - for(dp = defdevs; dp-defdevs < SIZE(defdevs); dp++) { - lp = dp->letters; - while(*lp) { - sprintf(device, "/dev/%s%c", dp->pref, *lp++); - if (!strcmp(dp->pref, "hd") && is_ide_cdrom_or_tape(device)) - continue; - if (opt_out_geom) - do_geom(device, 1); - if (opt_size) - do_size(device, 1); - if (opt_list || verify) - do_list(device, 1); - } + openproc(); + while ((dev = nextproc()) != NULL) { + if (!strncmp(dev, "hd", 2) && is_ide_cdrom_or_tape(dev)) + continue; + if (opt_out_geom) + do_geom(dev, 1); + if (opt_size) + do_size(dev, 1); + if (opt_list || verify) + do_list(dev, 1); } if (opt_size) diff --git a/getopt-1.1.2/getopt.1 b/getopt-1.1.2/getopt.1 index b7e36031..29e4e1d7 100644 --- a/getopt-1.1.2/getopt.1 +++ b/getopt-1.1.2/getopt.1 @@ -88,7 +88,7 @@ More than one option name may be specified at once, by separating the names with commas. This option may be given more than once, the .I longopts -are cummulative. +are cumulative. Each long option name in .I longopts diff --git a/hwclock/cmos.c b/hwclock/cmos.c index 94153dea..aed122cb 100644 --- a/hwclock/cmos.c +++ b/hwclock/cmos.c @@ -49,8 +49,12 @@ #include "nls.h" -#if defined(__i386__) || defined(__alpha__) +#if defined(__i386__) #include /* for inb, outb */ +#elif defined(__alpha__) +/* fails to compile, probably because of u8 etc */ +extern unsigned int inb(unsigned long port); +extern void outb(unsigned char b,unsigned long port); #else void outb(int a, int b){} int inb(int c){ return 0; } diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c index 154ba0b8..20c548eb 100644 --- a/hwclock/hwclock.c +++ b/hwclock/hwclock.c @@ -369,7 +369,7 @@ mktime_tz(struct tm tm, const bool universal, local time zone input, we may have to fake it out by temporarily changing the local time zone to UTC. */ - zone = (char *) getenv("TZ"); /* remember original time zone */ + zone = getenv("TZ"); /* remember original time zone */ if (universal) { /* Set timezone to UTC */ setenv("TZ", "", TRUE); diff --git a/login-utils/README.admutil b/login-utils/README.admutil deleted file mode 100644 index 448f99f0..00000000 --- a/login-utils/README.admutil +++ /dev/null @@ -1,249 +0,0 @@ -README file for the admutils V1.23 for Linux. - -See installation instructions at the bottom. Currently the latest versions -of this software are maintained at ftp://ftp.daimi.aau.dk/pub/linux/poe/ - -LICENSE: -This software is distributed as is without any warranty what so ever. -With respect to copyrights it is covered by the GNU Public License. - -Version 1.24 (20-Jun-97) - Small patches for glibc compat. - -Version 1.23 (6-Jun-97): - Patch by Christophe Thaelemans to last.c, - no longer considers all users logged out in case of a run-level - change. - -Version 1.22 (28-Jan-97): - Clean-up release. - -Version 1.21c (27-Jan-97): - Updated setpwnam.[hc] to be in sync with util-linux 2.6, this - also prevents passwd from copying the entire passwd YP/NIS map - into the local /etc/passwd. Edited setpwnam.c somewhat to - improve error checking, beautify the code, and remove output - to stderr. - Fixed a couple of buffer overrun nits in passwd.c, patches from - David Holland. - -Version 1.21b (23-Jan-97): - Shutdown now supports a message on the command line, a'la - "shutdown -f +5 'for some reason'" - -Version 1.20 (2-Nov-96): - Fix by Steffen Zahn for shutdown.c so it - prints its final message. - -Version 1.19 (8-Jul-96): - Fix by faith@cs.unc.edu to allow C-A-D after halting in shutdown.c - -Version 1.18 (19-Nov-95): - passwd almost completely rewritten by Martin Schulze - to use setpwnam() and support - more long options. There's a new man-page as well. - Hacked some more on Martins passwd.c to support -s and -f options. - The old passwd.c is in the Attic/ sub-directory. - Bugfix in shutdown.c to fix file modes. - -Version 1.17 (7-Oct-95): - Added setrlimit() calls to passwd.c and chsh.c to fix security hole - caused by resource limitations. Inspired by Zefram - . Also beefed up the ptmp locking in - chsh.c. - Added swap_off() function to shutdown.c by baekgrd@ibm.net - (Anders Baekgaard). - Bugfix in shutdown.c that makes sure wtmp gets closed. By - Alexandre Julliard . - Fixed bug in passwd.c that made it impossible to change from having - no password into having one. - -Version 1.16 (18-Sep-95): - Added feature to passwd.c by Arpad Magossanyi (mag@tas.vein.hu), - so root can give a password for a user on the command line. This - might be useful in a shell script autogenerating passwords for - new users. - - Added and updated manual pages for all commands by Rick Faith. - -Version 1.15d (21-Aug-95): - Fixed minor nit with salt generation in passwd.c - By Steven Reisman . - -Version 1.15c (5-Jul-95): - passwd does not allow reuse of the old password when changing. - passwd returns 1 if the password is not changed. This was - suggested by Anibal Jodorcovsky who - also fixed my initial bug in this feature. - - passwd uses O_EXCL for opening /etc/ptmp instead of access/fopen. - This was suggested by jorge@un1.satlink.com (Jorge). - -Version 1.15a (12-Jun-95): - Fix in last.c so it does not print wtmp entries marked DEAD_PROCESS. - By Andreas Schwab - -Version 1.15 (5-Jun-95): - Man-page fixes, fixes in pathnames.h to adhere to the FSSTND. - Fix by Rickard Faith to passwd.c, so sanity - checks come before the second entry of the new password. - This is for Linux 1.2, GCC 2.6.2 or later. - -Version 1.14a (12-Mar-95): - Fixed passwd and chsh so a username that is a prefix of another - doesn't affect the other's password. After suggested patch - by Valtteri J. Karu , but differently! - -Version 1.14 (12-Feb-95): - Added options -l, -y, -i to last.c. See last.man - -Version 1.13d (26-Jan-95): - Added some comments on request from Rik Faith. Compiled succesfully - on Linux 1.1.73, GCC 2.5.8, libc 4.5.26 - -Version 1.13c (6-Dec-94): - New versions of passwd and chsh due to Alvaro Martinez Echevarria - , so they will coexist with YP/NIS - passwords. - -Version 1.13b (7-Nov-94): - Use fgets() + atoi() in chsh.c instead of scanf(). - -Version 1.12 (17-Sep-94): - Rik Faith provided patches for passwd.c to let non-alphabetics count - as digits as well, allows more obscure passwords. - - Applied patches from Dave Gentzel - to prevent dereferencing a NULL pointer, and turn off accounting - in shutdown.c - -Version 1.11 (18-Aug-94): - Finally got around to making it a non-alpha version. Just a - little cleanup in Makefile - -Version 1.10b (8-Jun-94): - David A. Holland made me aware of a - security leak in passwd and chsh. /etc/ptmp could be forced to - be world-writeable. Fixed by hardwiring an umask of 022 into - passwd and chsh. - - Vesa Ruokonen sent me a new pathnames.h - file that shouldn't conflict with paths.h. - - Cleaned the source a bit for -Wall - -Version 1.10a (31-May-94): - Vesa Ruokonen provided a patch for - passwd.c such that it will work for multiple usernames for - the same uid. I mimicked his actions on chsh.c. In both cases - I added a check to ensure that even if utmp is hacked, one can - only change the password for users with the same uid. - -Version 1.9 (9-Feb-94): - Vesa Ruokonen suggested that newgrp should support passwords in - /etc/group. It now does. I mostly rewrote newgrp to make it - cleaner. - -Version 1.8 (19-Jan-94): - Rik Faith provided several patches, especially for passwd.c and - some man-pages. - -Version 1.7 (3-Nov-93): changes since 1.6 - Shutdown can now be used as a login shell. I forget who sent me the - patch. Example /etc/passwd entry: - - shutdown:dLbVbIMx7bVHw:0:0:Stopper:/:/etc/halt - - The package should now be prepared to have shutdown in /sbin as well - as in /etc. utmp and wtmp are allowed in /usr/adm too. Both things - are configurable in the Makefile. - - Olaf Flebbe provided a - patch for chsh.c to make it work. - - This version is built under linux 0.99.13 with gcc 2.4.3 and - libc 4.4.1 - -Version 1.6 (1-Jun-93) - Shutdown now looks more like shutdown on SunOS, but not quite. Most - of this was done by Scott Telford (s.telford@ed.ac.uk), but I - butchered his patches somewhat. This version was built under Linux - 0.99.9 with GCC 2.3.3 and libc 4.3.3. - - "make install" will now install shutdown in /etc instead of /usr/bin - -Version 1.5 (13-Dec-92) - This version is tested and built under Linux 0.98P6 with gcc-2.2.2d7 - You will have a hard time making it work with the older compilers and - libraries. - - Su is now deprecated. I believe that the GNU/FSF version is better. - -CONTENTS. -last - A new and better last command, a port from BSD done by - Michael Haardt. - I put a couple of if's in so LOGIN_PROCESS entries in wtmp - are not printed. - -chsh - CHangeSHell changes the shell entry in the passwd file. - Written from scratch by me. - -passwd - Changes the password in the passwd file. - Also done from scratch by me. - -su - A su(1) command by me. - -newgrp - Sets the gid if possible, ala su(1), written by Michael - Haardt. - -shutdown - Shuts down linux. Supports timed shutdowns, and sends - warnings to all users currently logged in. It then - kills all processes and unmounts file-systems etc. - - Shutdown also doubles as halt and reboot commands. - - Shutdown leaves the file /etc/nologin behind after shutdown, - it is wise to have a "rm -f /etc/nologin" in ones /etc/rc - - Shutdown now supports a -s switch, that works in connection - with the init program in poeigl-1.7 or later, so a singleuser - reboot is possible. - - Rick Sladkey provided patches for better - umounting code, needed in connection with NFS. - - Remy Card provided patches for support for - fastboot/fasthalt. These create a /fastboot file on shutdown, - and /etc/rc may check for the existance of this file, to - optionally skip fsck. - -example.rc An example of an /etc/rc file. Edit it to suit your own setup. - -ctrlaltdel - Sets the behaviour of the Ctrl-Alt-Del combination. - "ctrlaltdel hard" makes the key-combination instantly reboot - the machine without syncing the disk or anything. This may - very well corrupt the data on the disk. - - "ctrlaltdel soft" makes the key-combination send a SIGINT to - the init process. Such a command would typically be in /etc/rc. - For this to make sense you must run the init from the - poeigl-1.4 package or later. The System V compatible init in - this package won't reboot the machine when it gets a SIGINT. - Linux version 0.96b-PL1 or later is also needed for this - feature to work. - -init is gone as of V1.5, it was outdated and buggy. If you want a -SYSV compatible init get the newest one from Mike Smoorenburg, called -sysvinit.tar.Z - -INSTALLATION. -Simply do a - - make - -and then (optionally) as root: - - make install - - - - Peter (poe@daimi.aau.dk) diff --git a/login-utils/chfn.c b/login-utils/chfn.c index e25212e8..7c6bfac0 100644 --- a/login-utils/chfn.c +++ b/login-utils/chfn.c @@ -221,7 +221,7 @@ static boolean parse_argv (argc, argv, pinfo) info_given = false; while (true) { c = getopt_long (argc, argv, "f:r:p:h:o:uv", long_options, &index); - if (c == EOF) break; + if (c == -1) break; /* version? output version and exit. */ if (c == 'v') { printf ("%s\n", util_linux_version); diff --git a/login-utils/chsh.c b/login-utils/chsh.c index 4be7e555..ce8c2ae9 100644 --- a/login-utils/chsh.c +++ b/login-utils/chsh.c @@ -217,7 +217,7 @@ parse_argv (int argc, char *argv[], struct sinfo *pinfo) { while (c != EOF) { c = getopt_long (argc, argv, "s:luv", long_options, &index); switch (c) { - case EOF: + case -1: break; case 'v': printf ("%s\n", util_linux_version); diff --git a/login-utils/last.c b/login-utils/last.c index 8d3a8911..6d0ce2ff 100644 --- a/login-utils/last.c +++ b/login-utils/last.c @@ -113,7 +113,7 @@ main(int argc, char **argv) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - while ((ch = getopt(argc, argv, "0123456789yli:f:h:t:")) != EOF) + while ((ch = getopt(argc, argv, "0123456789yli:f:h:t:")) != -1) switch((char)ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': diff --git a/login-utils/login.c b/login-utils/login.c index c38abe44..048316bc 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -390,7 +390,7 @@ main(int argc, char **argv) fflag = hflag = pflag = 0; passwd_req = 1; - while ((ch = getopt(argc, argv, "fh:p")) != EOF) + while ((ch = getopt(argc, argv, "fh:p")) != -1) switch (ch) { case 'f': fflag = 1; diff --git a/login-utils/mesg.c b/login-utils/mesg.c index 2b08d835..a94ef665 100644 --- a/login-utils/mesg.c +++ b/login-utils/mesg.c @@ -70,7 +70,7 @@ main(argc, argv) textdomain(PACKAGE); - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/login-utils/passwd.c b/login-utils/passwd.c index cb50c0ef..eb330389 100644 --- a/login-utils/passwd.c +++ b/login-utils/passwd.c @@ -257,7 +257,8 @@ main(int argc, char *argv[]) { textdomain(PACKAGE); optind = 0; - while ( (c = getopt_long(argc, argv, "foqsvV", long_options, &opt_index)) != -1 ) { + while ((c = getopt_long(argc, argv, "foqsvV", + long_options, &opt_index)) != -1) { switch (c) { case 'f': fullname = 1; diff --git a/login-utils/wall.1 b/login-utils/wall.1 index 788f5f2b..f774ebd5 100644 --- a/login-utils/wall.1 +++ b/login-utils/wall.1 @@ -53,6 +53,9 @@ Only the super-user can write on the terminals of users who have chosen to deny messages or are using a program which automatically denies messages. +.Pp +Reading from a file is refused when the invoker is not superuser +and the program is suid or sgid. .Sh SEE ALSO .Xr mesg 1 , .Xr talk 1 , diff --git a/login-utils/wall.c b/login-utils/wall.c index 0bd3b79a..2797f465 100644 --- a/login-utils/wall.c +++ b/login-utils/wall.c @@ -91,7 +91,7 @@ main(int argc, char **argv) { if (p) progname = p+1; - while ((ch = getopt(argc, argv, "n")) != EOF) + while ((ch = getopt(argc, argv, "n")) != -1) switch (ch) { case 'n': /* undoc option for shutdown: suppress banner */ diff --git a/misc-utils/Makefile b/misc-utils/Makefile index 67350b70..d61add41 100644 --- a/misc-utils/Makefile +++ b/misc-utils/Makefile @@ -11,14 +11,13 @@ include ../MCONFIG # Where to put man pages? -MAN1= cal.1 chkdupexe.1 ddate.1 kill.1 \ - logger.1 look.1 mcookie.1 namei.1 rename.1 script.1 \ - whereis.1 +MAN1= cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ + namei.1 rename.1 script.1 whereis.1 # Where to put binaries? # See the "install" rule for the links. . . -BIN= kill +BIN= USRBIN= cal chkdupexe ddate logger look mcookie \ namei rename script whereis @@ -35,6 +34,11 @@ USRBIN:=$(USRBIN) write MAN1:=$(MAN1) write.1 endif +ifeq "$(HAVE_KILL)" "no" +BIN:=$(BIN) kill +MAN1:=$(MAN1) kill.1 +endif + ifeq "$(HAVE_NCURSES)" "yes" USRBIN:=$(USRBIN) setterm MAN1:=$(MAN1) setterm.1 diff --git a/misc-utils/cal.1 b/misc-utils/cal.1 index d16d3050..7d5e71eb 100644 --- a/misc-utils/cal.1 +++ b/misc-utils/cal.1 @@ -42,7 +42,7 @@ .Nd displays a calendar .Sh SYNOPSIS .Nm cal -.Op Fl mjy13 +.Op Fl smjy13 .Op [ Ar month ] Ar year .Sh DESCRIPTION .Nm Cal @@ -52,14 +52,15 @@ the current month is displayed. The options are as follows: .Bl -tag -width Ds .It Fl 1 -Display single month output (use if cal was built with -3 as default to get -older traditional output) +Display single month output. +(This is the default.) .It Fl 3 -Display prev/current/next month output (use if cal was built with traditional --1 as default to get newer improved output) +Display prev/current/next month output. +.It Fl s +Display Sunday as the first day of the week. +(This is the default.) .It Fl m Display Monday as the first day of the week. -(The default is Sunday.) .It Fl j Display Julian dates (days one-based, numbered from January 1). .It Fl y @@ -88,3 +89,9 @@ calendar for that month is a bit unusual. A .Nm command appeared in Version 6 AT&T UNIX. +.Sh OTHER VERSIONS +Several much more elaborate versions of this program exist, +with support for colors, holidays, birthdays, reminders and +appointments, etc. For example, try the cal from +http://home.sprynet.com/~cbagwell/projects.html +or GNU gcal. diff --git a/misc-utils/cal.c b/misc-utils/cal.c index 37aa1b1d..b71a72e8 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -222,14 +222,17 @@ main(int argc, char **argv) { #endif yflag = 0; - while ((ch = getopt(argc, argv, "13mjyV")) != EOF) + while ((ch = getopt(argc, argv, "13mjyV")) != -1) switch(ch) { case '1': - num_months = 1; + num_months = 1; /* default */ break; case '3': num_months = 3; break; + case 's': + week1stday = 0; /* default */ + break; case 'm': week1stday = 1; break; @@ -668,6 +671,6 @@ void usage() { - (void)fprintf(stderr, _("usage: cal [-mjyV] [[month] year]\n")); + (void)fprintf(stderr, _("usage: cal [-13smjyV] [[month] year]\n")); exit(1); } diff --git a/misc-utils/logger.c b/misc-utils/logger.c index e0057873..8f28e39e 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -132,7 +132,7 @@ main(int argc, char **argv) { tag = NULL; pri = LOG_NOTICE; logflags = 0; - while ((ch = getopt(argc, argv, "f:ip:st:u:d")) != EOF) + while ((ch = getopt(argc, argv, "f:ip:st:u:d")) != -1) switch((char)ch) { case 'f': /* file to log */ if (freopen(optarg, "r", stdin) == NULL) { diff --git a/misc-utils/look.c b/misc-utils/look.c index f3b4ba51..7ba4ac06 100644 --- a/misc-utils/look.c +++ b/misc-utils/look.c @@ -98,7 +98,7 @@ main(int argc, char *argv[]) termchar = '\0'; string = NULL; /* just for gcc */ - while ((ch = getopt(argc, argv, "adft:")) != EOF) + while ((ch = getopt(argc, argv, "adft:")) != -1) switch(ch) { case 'a': file = _PATH_WORDS_ALT; diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c index 6930745b..e550bec6 100644 --- a/misc-utils/mcookie.c +++ b/misc-utils/mcookie.c @@ -90,7 +90,7 @@ int main( int argc, char **argv ) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - while ((c = getopt( argc, argv, "vf:" )) != EOF) + while ((c = getopt( argc, argv, "vf:" )) != -1) switch (c) { case 'v': ++Verbose; break; case 'f': file = optarg; break; diff --git a/misc-utils/namei.c b/misc-utils/namei.c index 60ec98a9..ffdb7359 100644 --- a/misc-utils/namei.c +++ b/misc-utils/namei.c @@ -81,7 +81,7 @@ main(int argc, char **argv) { if(argc < 2) usage(); - while((c = getopt(argc, argv, "mx")) != EOF){ + while((c = getopt(argc, argv, "mx")) != -1){ switch(c){ case 'm': mflag = !mflag; diff --git a/misc-utils/replay.1 b/misc-utils/replay.1 index 578cadbc..52d82c25 100644 --- a/misc-utils/replay.1 +++ b/misc-utils/replay.1 @@ -149,7 +149,7 @@ replay timingfile [typescript [divisor]] .IX Header "DESCRIPTION" This program replays a typescript, using timing information to ensure that output happens at the same speed as it originally appeared when the script -was recorded. It is only guaranteed to work preperly if run on the same +was recorded. It is only guaranteed to work properly if run on the same terminal the script was recorded on. .PP The timings information is what script outputs to standard error if it is @@ -171,6 +171,9 @@ specifying a divisor of 2 makes the script be replayed twice as fast. \& Script done, file is typescript \& % replay timingfile .Ve +.SH "SEE ALSO" +.IX Header "SEE ALSO" +.BR script (1) .SH "COPYRIGHT" .IX Header "COPYRIGHT" This program is in the public domain. diff --git a/misc-utils/replay.pl b/misc-utils/replay.pl index 78564d6b..416dc601 100755 --- a/misc-utils/replay.pl +++ b/misc-utils/replay.pl @@ -16,7 +16,7 @@ replay timingfile [typescript [divisor]] This program replays a typescript, using timing information to ensure that output happens at the same speed as it originally appeared when the script -was recorded. It is only guaranteed to work preperly if run on the same +was recorded. It is only guaranteed to work properly if run on the same terminal the script was recorded on. The timings information is what script outputs to standard error if it is @@ -69,6 +69,10 @@ while () { } print $oldblock; +=head1 SEE ALSO + +script(1) + =head1 COPYRIGHT This program is in the public domain. diff --git a/misc-utils/script.1 b/misc-utils/script.1 index 545ac3bc..6e987732 100644 --- a/misc-utils/script.1 +++ b/misc-utils/script.1 @@ -124,7 +124,8 @@ is assumed. (Most shells set this variable automatically). .Xr csh 1 (for the .Em history -mechanism). +mechanism), +.Xr replay 1 . .Sh HISTORY The .Nm script diff --git a/misc-utils/script.c b/misc-utils/script.c index 973e80aa..a5d0c663 100644 --- a/misc-utils/script.c +++ b/misc-utils/script.c @@ -98,12 +98,12 @@ int tflg = 0; static char *progname; static void -die_if_symlink(char *fn) { +die_if_link(char *fn) { struct stat s; - if (lstat(fn, &s) == 0 && S_ISLNK(s.st_mode)) { + if (lstat(fn, &s) == 0 && (S_ISLNK(s.st_mode) || s.st_nlink > 1)) { fprintf(stderr, - _("Warning: `%s' is a symlink.\n" + _("Warning: `%s' is a link.\n" "Use `%s [options] %s' if you really " "want to use it.\n" "Script not started.\n"), @@ -135,7 +135,7 @@ main(int argc, char **argv) { } } - while ((ch = getopt(argc, argv, "afqt")) != EOF) + while ((ch = getopt(argc, argv, "afqt")) != -1) switch((char)ch) { case 'a': aflg++; @@ -162,7 +162,7 @@ main(int argc, char **argv) { fname = argv[0]; else { fname = "typescript"; - die_if_symlink(fname); + die_if_link(fname); } if ((fscript = fopen(fname, aflg ? "a" : "w")) == NULL) { perror(fname); diff --git a/misc-utils/setterm.c b/misc-utils/setterm.c index 435e7e48..24fb90d8 100644 --- a/misc-utils/setterm.c +++ b/misc-utils/setterm.c @@ -802,7 +802,8 @@ static char *ti_entry(const char *name) { char *buf_ptr; - if ((buf_ptr = tigetstr(name)) == (char *)-1) buf_ptr = NULL; + if ((buf_ptr = tigetstr((char *)name)) == (char *)-1) + buf_ptr = NULL; return buf_ptr; } diff --git a/mount/fstab.5 b/mount/fstab.5 index a9ff4383..fa3d2b78 100644 --- a/mount/fstab.5 +++ b/mount/fstab.5 @@ -52,7 +52,7 @@ contains descriptive information about the various file systems. is only read by programs, and not written; it is the duty of the system administrator to properly create and maintain this file. Each filesystem is described on a separate line; fields on each line are separated by tabs -or spaces. The order of records in +or spaces. Lines starting with '#' are comments. The order of records in .B fstab is important because .BR fsck (8), @@ -94,50 +94,53 @@ contains spaces these can be escaped as `\\040'. The third field, .RI ( fs_vfstype ), -describes the type of the filesystem. The system currently supports these -types of filesystems (and possibly others - consult -.IR /proc/filesystems ): -.TP -.I minix -a local filesystem, supporting filenames of length 14 or 30 characters. -.TP -.I ext -a local filesystem with longer filenames and larger inodes. This -filesystem has been replaced by the -.I ext2 -file system, and should no longer be used. -.TP -.I ext2 -a local filesystem with longer filenames, larger inodes, and lots of other -features. -.TP -.I xiafs -a local filesystem with longer filenames, larger inodes, and lots of other -features. -.TP -.I xfs -a local filesystem with journaling, scalability and lots of other -features. -.TP -.I msdos -a local filesystem for MS-DOS partitions. -.TP -.I hpfs -a local filesystem for HPFS partitions. -.TP -.I iso9660 -a local filesystem used for CD-ROM drives. -.TP -.I nfs -a filesystem for mounting partitions from remote systems. -.TP -.I swap -a disk partition to be used for swapping. -.PP -If -.I fs_vfstype -is specified as ``ignore'' the entry is ignored. This is useful to show -disk partitions which are currently unused. +describes the type of the filesystem. Linux supports lots +of filesystem types, such as +.IR adfs , +.IR affs , +.IR autofs , +.IR coda , +.IR coherent , +.IR cramfs , +.IR devpts , +.IR efs , +.IR ext2 , +.IR ext3 , +.IR hfs , +.IR hpfs , +.IR iso9660 , +.IR jfs , +.IR minix , +.IR msdos , +.IR ncpfs , +.IR nfs , +.IR ntfs , +.IR proc , +.IR qnx4 , +.IR reiserfs , +.IR romfs , +.IR smbfs , +.IR sysv , +.IR tmpfs , +.IR udf , +.IR ufs , +.IR umsdos , +.IR vfat , +.IR xenix , +.IR xfs , +and possibly others. For more details, see +.BR mount (8). +For the filesystems currently supported by the running kernel, see +.IR /proc/filesystems . +An entry +.I swap +denotes a file or partition to be used +for swapping, cf.\& +.BR swapon (8). +An entry +.I ignore +causes the line to be ignored. This is useful +to show disk partitions which are currently unused. The fourth field, .RI ( fs_mntops ), @@ -187,14 +190,6 @@ is to use the routines .BR getmntent (3). .SH FILES .I /etc/fstab -The file -.B fstab -resides in -.IR /etc . -.SH BUGS -The documentation in -.BR mount (8) -is often more up-to-date. .SH "SEE ALSO" .BR getmntent (3), .BR mount (8), @@ -202,6 +197,8 @@ is often more up-to-date. .BR fs (5) .BR nfs (5) .SH HISTORY -The +The ancestor of this .B fstab file format appeared in 4.0BSD. +.\" But without comment convention, and options and vfs_type. +.\" Instead there was a type rw/ro/rq/sw/xx, where xx is the present 'ignore'. diff --git a/mount/linux_fs.h b/mount/linux_fs.h index 53cdf573..c6ef8105 100644 --- a/mount/linux_fs.h +++ b/mount/linux_fs.h @@ -101,7 +101,8 @@ struct xiafs_super_block { (((uint) s.s_magic[3]) << 24)) /* From jj@sunsite.ms.mff.cuni.cz Mon Mar 23 15:19:05 1998 */ -#define UFS_SUPER_MAGIC 0x00011954 +#define UFS_SUPER_MAGIC_LE 0x00011954 +#define UFS_SUPER_MAGIC_BE 0x54190100 struct ufs_super_block { u_char s_dummy[0x55c]; u_char s_magic[4]; diff --git a/mount/lomount.c b/mount/lomount.c index 26e89501..70a8ff0a 100644 --- a/mount/lomount.c +++ b/mount/lomount.c @@ -399,7 +399,7 @@ main(int argc, char **argv) { delete = off = 0; offset = encryption = NULL; progname = argv[0]; - while ((c = getopt(argc,argv,"de:o:v")) != EOF) { + while ((c = getopt(argc,argv,"de:o:v")) != -1) { switch (c) { case 'd': delete = 1; diff --git a/mount/mount.8 b/mount/mount.8 index 7114b295..01a722b7 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -107,6 +107,14 @@ file hierarchy somewhere else. The call is .br .B "mount --bind olddir newdir" .RE +After this call the same contents is accessible in two places. + +Since Linux 2.5.1 it is possible to atomically move a subtree +to another place. The call is +.RS +.br +.B "mount --move olddir newdir" +.RE The .I proc @@ -408,6 +416,7 @@ type is specified, the superblock is probed for the filesystem type .IR qnx4 , .IR reiserfs , .IR romfs , +.IR udf , .IR ufs , .IR vxfs , .IR xfs , @@ -423,8 +432,13 @@ except for those that are labeled "nodev" (e.g., .I proc and .IR nfs ). +If +.I /etc/filesystems +ends in a line with a single * only, mount will read +.I /proc/filesystems +afterwards. -Note that the +The .B auto type may be useful for user-mounted floppies. Creating a file @@ -432,7 +446,10 @@ Creating a file can be useful to change the probe order (e.g., to try vfat before msdos) or if you use a kernel module autoloader. Warning: the probing uses a heuristic (the presence of appropriate `magic'), -and could recognize the wrong filesystem type. +and could recognize the wrong filesystem type, possibly with catastrophic +consequences. If your data is valuable, don't ask +.B mount +to guess. More than one type may be specified in a comma separated list. The list of file system types can be prefixed with @@ -547,6 +564,13 @@ This option implies the options (unless overridden by subsequent options, as in the option line .BR users,exec,dev,suid ). .RE +.TP +.B \-\-bind +Remount a subtree somewhere else (so that its contents are available +in both places). See above. +.TP +.B \-\-move +Move a subtree to some other place. See above. .SH "FILESYSTEM SPECIFIC MOUNT OPTIONS" The following options apply only to certain file systems. @@ -937,6 +961,11 @@ just read what is in the file. This is the default. Do not abort mounting when certain consistency checks fail. .SH "Mount options for iso9660" +ISO 9660 is a standard describing a filesystem structure to be used +on CD-ROMs. (This filesystem type is also seen on some DVDs. See also the +.I udf +filesystem.) + Normal .I iso9660 filenames appear in a 8.3 format (i.e., DOS-like restrictions on filename @@ -1154,6 +1183,7 @@ By default, the files are owned by root and not readable by somebody else. These options are recognized, but have no effect as far as I can see. .SH "Mount options for reiserfs" +Reiserfs is a journaling filesystem. The reiserfs mount options are more fully described at .IR http://www.namesys.com/mount-options.html . .TP @@ -1276,6 +1306,10 @@ Set number of inodes. Set initial permissions of the root directory. .SH "Mount options for udf" +udf is the "Universal Disk Format" filesystem defined by the Optical +Storage Technology Association, and is often used for DVD-ROM. +See also +.IR iso9660 . .TP .B gid= Set the default group. @@ -1359,6 +1393,7 @@ For NextStep CDROMs (block_size == 2048), read-only. .TP .B openstep For filesystems created by OpenStep (currently read only). +The same filesystem type is also used by Mac OS X. .RE .TP @@ -1412,6 +1447,17 @@ before trying UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option. If `uni_xlate' gets set, UTF8 gets disabled. +.TP +.B shortname=[lower|win95|winnt|mixed] +Option (available since 2.4.13) that sets how short filenames are to be +created and displayed. +.nf + lower = display lower, create win95 filenames + win95 = display win95, create win95 filenames + winnt = display winnt, create winnt filenames + mixed = display winnt, create win95 filenames +.fi +Default is "lower". .SH "Mount options for xenix" None. @@ -1550,6 +1596,39 @@ will be freed by You can also free a loop device by hand, using `losetup -d', see .BR losetup (8). +.SH RETURN CODES +.B mount +has the following return codes (the bits can be ORed): +.TP +.BR 0 +success +.TP +.BR 1 +incorrect invocation or permissions +.TP +.BR 2 +system error (out of memory, cannot fork, no more loop devices) +.TP +.BR 4 +internal +.B mount +bug or missing +.BR nfs +support in +.B mount +.TP +.BR 8 +user interrupt +.TP +.BR 16 +problems writing or locking /etc/mtab +.TP +.BR 32 +mount failure +.TP +.BR 64 +some mount succeeded + .SH FILES .I /etc/fstab file system table diff --git a/mount/mount.c b/mount/mount.c index 97b8aebb..dc10e64b 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -467,7 +467,7 @@ guess_fstype_and_mount (char *spec, char *node, char **types, *types = "none"; /* random, but not "bind" */ if (!*types && !(flags & MS_REMOUNT)) { - *types = guess_fstype_from_superblock(spec); + *types = guess_fstype(spec); if (*types && !strcmp(*types, "swap")) { error(_("%s looks like swapspace - not mounted"), spec); *types = NULL; @@ -1312,6 +1312,7 @@ static struct option longopts[] = { { "before", 0, 0, 131 }, { "over", 0, 0, 132 }, { "move", 0, 0, 133 }, + { "guess-fstype", 1, 0, 134 }, { NULL, 0, 0, 0 } }; @@ -1335,6 +1336,8 @@ usage (FILE *fp, int n) { "a filesystem (of the given type) found on the device.\n" "One can also mount an already visible directory tree elsewhere:\n" " mount --bind olddir newdir\n" + "or move a subtree:\n" + " mount --move olddir newdir\n" "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n" "or by label, using -L label or by uuid, using -U uuid .\n" "Other options: [-nfFrsvw] [-o options].\n" @@ -1375,7 +1378,7 @@ main (int argc, char *argv[]) { #endif while ((c = getopt_long (argc, argv, "afFhlL:no:rsU:vVwt:", - longopts, NULL)) != EOF) { + longopts, NULL)) != -1) { switch (c) { case 'a': /* mount everything in fstab */ ++all; @@ -1448,7 +1451,17 @@ main (int argc, char *argv[]) { case 133: /* move */ mounttype = MS_MOVE; break; - + case 134: + /* undocumented, may go away again: + call: mount --guess-fstype device + use only for testing purposes - + the guessing is not reliable at all */ + { + char *fstype; + fstype = do_guess_fstype(optarg); + printf("%s\n", fstype ? fstype : "unknown"); + exit(fstype ? 0 : EX_FAIL); + } case '?': default: usage (stderr, EX_USAGE); diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c index 6b8def09..63b00ba8 100644 --- a/mount/mount_guess_fstype.c +++ b/mount/mount_guess_fstype.c @@ -66,7 +66,7 @@ assemble4le(unsigned char *p) { } /* - char *guess_fstype_from_superblock(const char *device); + char *guess_fstype(const char *device); Probes the device and attempts to determine the type of filesystem contained within. @@ -85,6 +85,7 @@ assemble4le(unsigned char *p) { Added ext3 - Andrew Morton Added jfs - Christoph Hellwig Added sysv - Tim Launchbury + Added udf - Bryce Nesbitt */ static char *magic_known[] = { @@ -137,15 +138,22 @@ free_tested(void) { tried = NULL; } -/* udf magic - I find that trying to mount garbage as an udf fs - causes a very large kernel delay, almost killing the machine. - So, we do not try udf unless there is positive evidence that it - might work. Try iso9660 first, it is much more likely. - Strings below taken from ECMA 167. */ +/* + * udf magic - I find that trying to mount garbage as an udf fs + * causes a very large kernel delay, almost killing the machine. + * So, we do not try udf unless there is positive evidence that it + * might work. Strings below taken from ECMA 167. + */ +/* + * It seems that before udf 2.00 the volume descriptor was not well + * defined. For 2.00 you're supposed to keep scanning records until + * you find one NOT in this list. (See ECMA 2/8.3.1). + */ static char *udf_magic[] = { "BEA01", "BOOT2", "CD001", "CDW02", "NSR02", "NSR03", "TEA01" }; + static int may_be_udf(const char *id) { char **m; @@ -156,6 +164,43 @@ may_be_udf(const char *id) { return 0; } +/* we saw "CD001" - may be iso9660 or udf - Bryce Nesbitt */ +static int +is_really_udf(int fd) { + int j, bs; + struct iso_volume_descriptor isosb; + + /* determine the block size by scanning in 2K increments + (block sizes larger than 2K will be null padded) */ + for (bs = 1; bs < 16; bs++) { + lseek(fd, bs*2048+32768, SEEK_SET); + if (read(fd, (char *)&isosb, sizeof(isosb)) != sizeof(isosb)) + return 0; + if (isosb.id[0]) + break; + } + + /* Scan up to another 64 blocks looking for additional VSD's */ + for (j = 1; j < 64; j++) { + if (j > 1) { + lseek(fd, j*bs*2048+32768, SEEK_SET); + if (read(fd, (char *)&isosb, sizeof(isosb)) + != sizeof(isosb)) + return 0; + } + /* If we find NSR0x then call it udf: + NSR01 for UDF 1.00 + NSR02 for UDF 1.50 + NSR03 for UDF 2.00 */ + if (!strncmp(isosb.id, "NSR0", 4)) + return 1; + if (!may_be_udf(isosb.id)) + return 0; + } + + return 0; +} + static int may_be_swap(const char *s) { return (strncmp(s-10, "SWAP-SPACE", 10) == 0 || @@ -184,8 +229,8 @@ static int is_reiserfs_magic_string (struct reiserfs_super_block * rs) strlen ( REISER2FS_SUPER_MAGIC_STRING))); } -static char * -fstype(const char *device) { +char * +do_guess_fstype(const char *device) { int fd; char *type = NULL; union { @@ -292,7 +337,7 @@ fstype(const char *device) { if ((assemble4le(sb.e2s.s_feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) && assemble4le(sb.e2s.s_journal_inum) != 0) - type = "ext3,ext2"; + type = "ext3"; /* "ext3,ext2" */ } else if (minixmagic(sb.ms) == MINIX_SUPER_MAGIC || @@ -340,12 +385,15 @@ fstype(const char *device) { } if (!type) { + int mag; + /* block 8 */ if (lseek(fd, 8192, SEEK_SET) != 8192 || read(fd, (char *) &ufssb, sizeof(ufssb)) != sizeof(ufssb)) goto io_error; - if (ufsmagic(ufssb) == UFS_SUPER_MAGIC) /* also test swapped version? */ + mag = ufsmagic(ufssb); + if (mag == UFS_SUPER_MAGIC_LE || mag == UFS_SUPER_MAGIC_BE) type = "ufs"; } @@ -385,11 +433,17 @@ fstype(const char *device) { || read(fd, (char *) &isosb, sizeof(isosb)) != sizeof(isosb)) goto io_error; - if(strncmp(isosb.iso.id, ISO_STANDARD_ID, sizeof(isosb.iso.id)) == 0 - || strncmp(isosb.hs.id, HS_STANDARD_ID, sizeof(isosb.hs.id)) == 0) - type = "iso9660"; - else if (may_be_udf(isosb.iso.id)) - type = "udf"; + if (strncmp(isosb.hs.id, HS_STANDARD_ID, sizeof(isosb.hs.id)) == 0) { + /* "CDROM" */ + type = "iso9660"; + } else if (strncmp(isosb.iso.id, ISO_STANDARD_ID, + sizeof(isosb.iso.id)) == 0) { + /* CD001 */ + type = "iso9660"; + if (is_really_udf(fd)) + type = "udf"; + } else if (may_be_udf(isosb.iso.id)) + type = "udf"; } if (!type) { @@ -436,8 +490,8 @@ io_error: } char * -guess_fstype_from_superblock(const char *spec) { - char *type = fstype(spec); +guess_fstype(const char *spec) { + char *type = do_guess_fstype(spec); if (verbose) { printf (_("mount: you didn't specify a filesystem type for %s\n"), spec); diff --git a/mount/mount_guess_fstype.h b/mount/mount_guess_fstype.h index 9c0903b5..d005c918 100644 --- a/mount/mount_guess_fstype.h +++ b/mount/mount_guess_fstype.h @@ -8,7 +8,8 @@ struct mountargs { extern int verbose; -char *guess_fstype_from_superblock(const char *device); +char *guess_fstype(const char *device); +char *do_guess_fstype(const char *device); int procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args, char **type); int is_in_procfs(const char *fstype); diff --git a/mount/swapon.c b/mount/swapon.c index 9f25fcbe..29c859db 100644 --- a/mount/swapon.c +++ b/mount/swapon.c @@ -183,7 +183,7 @@ main (int argc, char *argv[]) else program_name = argv[0]; - while ((c = getopt_long (argc, argv, "ahp:svV", longopts, NULL)) != EOF) + while ((c = getopt_long (argc, argv, "ahp:svV", longopts, NULL)) != -1) switch (c) { case 'a': /* all */ diff --git a/mount/umount.c b/mount/umount.c index b2beb9ac..4688495e 100644 --- a/mount/umount.c +++ b/mount/umount.c @@ -25,6 +25,7 @@ * 001202: aeb - remove at most one line from /etc/mtab * 010914: Jamie Strandboge - use tcp if that was used for mount * 011005: hch - add lazy umount support + * 020105: aeb - permission test owner umount */ #include @@ -497,6 +498,30 @@ parse_list (char *strings) { return list; } + +static int +contains(string_list list, char *s) { + while (list) { + if (streq (car (list), s)) + return 1; + list = cdr (list); + } + return 0; +} + +/* + * If list contains "user=peter" and we ask for "user=", return "peter" + */ +static char * +get_value(string_list list, char *s) { + int n = strlen(s); + while (list) { + if (strncmp (car (list), s, n) == 0) + return car(list)+n; + list = cdr (list); + } + return 0; +} /*=======================================================================*/ static int @@ -504,6 +529,7 @@ umount_file (char *arg) { struct mntentchn *mc, *fs; char *file; string_list options; + int fstab_has_user, fstab_has_users, fstab_has_owner, ok; file = canonicalize (arg); /* mtab paths are canonicalized */ if (verbose > 1) @@ -536,7 +562,8 @@ umount_file (char *arg) { } /* User mounting and unmounting is allowed only - if fstab contains the option `user' or `users' */ + if fstab contains one of the options `user', + `users' or `owner'. */ /* The option `users' allows arbitrary users to mount and unmount - this may be a security risk. */ /* The option `user' only allows unmounting by the user @@ -544,40 +571,35 @@ umount_file (char *arg) { /* The option `owner' only allows (un)mounting by the owner. */ /* A convenient side effect is that the user who mounted is visible in mtab. */ + options = parse_list (fs->m.mnt_opts); - while (options) { - if (streq (car (options), "user") || - streq (car (options), "users") || - streq (car (options), "owner")) - break; - options = cdr (options); - } - if (!options) - die (2, _("umount: only root can unmount %s from %s"), - fs->m.mnt_fsname, fs->m.mnt_dir); - if (streq (car (options), "user") || - streq (car (options), "owner")) { + fstab_has_user = contains(options, "user"); + fstab_has_users = contains(options, "users"); + fstab_has_owner = contains(options, "owner"); + ok = 0; + + if (fstab_has_users) + ok = 1; + + if (!ok && (fstab_has_user || fstab_has_owner)) { char *user = getusername(); + char *mtab_user; options = parse_list (mc->m.mnt_opts); - while (options) { - char *co = car (options); - if (!strncmp(co, "user=", 5)) { - if (!user || !streq(co+5,user)) - die(2, _("umount: only %s can unmount %s from %s"), - co+5, fs->m.mnt_fsname, fs->m.mnt_dir); - break; - } - options = cdr (options); - } + mtab_user = get_value(options, "user="); + + if (user && mtab_user && streq (user, mtab_user)) + ok = 1; } + if (!ok) + die (2, _("umount: only root can unmount %s from %s"), + fs->m.mnt_fsname, fs->m.mnt_dir); } if (mc) return umount_one_bw (file, mc); else return umount_one (arg, arg, arg, arg, NULL); - } int @@ -593,7 +615,7 @@ main (int argc, char *argv[]) { textdomain(PACKAGE); while ((c = getopt_long (argc, argv, "adfhlnrt:vV", - longopts, NULL)) != EOF) + longopts, NULL)) != -1) switch (c) { case 'a': /* umount everything */ ++all; diff --git a/po/Makefile b/po/Makefile index 15f38aad..50c266d4 100644 --- a/po/Makefile +++ b/po/Makefile @@ -37,9 +37,9 @@ INCLUDES = -I.. -I$(INTL) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) # Enter here all .po files -POFILES = cs.po da.po de.po es.po fr.po it.po ja.po nl.po pt_BR.po sv.po tr.po +POFILES = cs.po da.po de.po es.po et.po fr.po it.po ja.po nl.po pt_BR.po sv.po tr.po # the same but with .gmo -GMOFILES = cs.gmo da.gmo de.gmo es.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo sv.gmo tr.gmo +GMOFILES = cs.gmo da.gmo de.gmo es.gmo et.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo sv.gmo tr.gmo CATALOGS = $(GMOFILES) CATOBJEXT = .gmo diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index cf52316b..2171553c 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -398,47 +398,48 @@ More than one primary partition is marked bootable. DOS MBR cannot boot this.", {"NC", 349}, {"Pri/Log", 350}, {"Disk Drive: %s", 351}, - {"Size: %lld bytes", 352}, - {"Heads: %d Sectors per Track: %d Cylinders: %d", 353}, - {"Name", 354}, - {"Flags", 355}, - {"Part Type", 356}, - {"FS Type", 357}, - {"[Label]", 358}, - {" Sectors", 359}, - {"Size (MB)", 360}, - {"Size (GB)", 361}, - {"Bootable", 362}, - {"Toggle bootable flag of the current partition", 363}, - {"Delete", 364}, - {"Delete the current partition", 365}, - {"Geometry", 366}, - {"Change disk geometry (experts only)", 367}, - {"Help", 368}, - {"Print help screen", 369}, - {"Maximize", 370}, - {"Maximize disk usage of the current partition (experts only)", 371}, - {"New", 372}, - {"Create new partition from free space", 373}, - {"Print", 374}, - {"Print partition table to the screen or to a file", 375}, - {"Quit", 376}, - {"Quit program without writing partition table", 377}, - {"Type", 378}, - {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 379}, - {"Units", 380}, - {"Change units of the partition size display (MB, sect, cyl)", 381}, - {"Write", 382}, - {"Write partition table to disk (this might destroy data)", 383}, - {"Cannot make this partition bootable", 384}, - {"Cannot delete an empty partition", 385}, - {"Cannot maximize this partition", 386}, - {"This partition is unusable", 387}, - {"This partition is already in use", 388}, - {"Cannot change the type of an empty partition", 389}, - {"No more partitions", 390}, - {"Illegal command", 391}, - {"Copyright (C) 1994-2000 Kevin E. Martin & aeb\n", 392}, + {"Size: %lld bytes, %ld MB", 352}, + {"Size: %lld bytes, %ld.%ld GB", 353}, + {"Heads: %d Sectors per Track: %d Cylinders: %d", 354}, + {"Name", 355}, + {"Flags", 356}, + {"Part Type", 357}, + {"FS Type", 358}, + {"[Label]", 359}, + {" Sectors", 360}, + {"Size (MB)", 361}, + {"Size (GB)", 362}, + {"Bootable", 363}, + {"Toggle bootable flag of the current partition", 364}, + {"Delete", 365}, + {"Delete the current partition", 366}, + {"Geometry", 367}, + {"Change disk geometry (experts only)", 368}, + {"Help", 369}, + {"Print help screen", 370}, + {"Maximize", 371}, + {"Maximize disk usage of the current partition (experts only)", 372}, + {"New", 373}, + {"Create new partition from free space", 374}, + {"Print", 375}, + {"Print partition table to the screen or to a file", 376}, + {"Quit", 377}, + {"Quit program without writing partition table", 378}, + {"Type", 379}, + {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 380}, + {"Units", 381}, + {"Change units of the partition size display (MB, sect, cyl)", 382}, + {"Write", 383}, + {"Write partition table to disk (this might destroy data)", 384}, + {"Cannot make this partition bootable", 385}, + {"Cannot delete an empty partition", 386}, + {"Cannot maximize this partition", 387}, + {"This partition is unusable", 388}, + {"This partition is already in use", 389}, + {"Cannot change the type of an empty partition", 390}, + {"No more partitions", 391}, + {"Illegal command", 392}, + {"Copyright (C) 1994-2000 Kevin E. Martin & aeb\n", 393}, {"\ \n\ Usage:\n\ @@ -454,7 +455,7 @@ Options:\n\ -z: Start with a zero partition table, instead of reading the pt from disk;\n\ -c C -h H -s S: Override the kernel's idea of the number of cylinders,\n\ the number of heads and the number of sectors/track.\n\ -\n", 393}, +\n", 394}, {"\ Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n\ fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n\ @@ -463,65 +464,65 @@ Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n\ Here DISK is something like /dev/hdb or /dev/sda\n\ and PARTITION is something like /dev/hda7\n\ -u: give Start and End in sector (instead of cylinder) units\n\ --b 2048: (for certain MO disks) use 2048-byte sectors\n", 394}, +-b 2048: (for certain MO disks) use 2048-byte sectors\n", 395}, {"\ Usage: fdisk [-l] [-b SSZ] [-u] device\n\ E.g.: fdisk /dev/hda (for the first IDE disk)\n\ or: fdisk /dev/sdc (for the third SCSI disk)\n\ or: fdisk /dev/eda (for the first PS/2 ESDI drive)\n\ or: fdisk /dev/rd/c0d0 or: fdisk /dev/ida/c0d0 (for RAID devices)\n\ - ...\n", 395}, - {"Unable to open %s\n", 396}, - {"Unable to read %s\n", 397}, - {"Unable to seek on %s\n", 398}, - {"Unable to write %s\n", 399}, - {"BLKGETSIZE ioctl failed on %s\n", 400}, - {"Unable to allocate any more memory\n", 401}, - {"Fatal error\n", 402}, - {"Command action", 403}, - {" a toggle a read only flag", 404}, - {" b edit bsd disklabel", 405}, - {" c toggle the mountable flag", 406}, - {" d delete a partition", 407}, - {" l list known partition types", 408}, - {" m print this menu", 409}, - {" n add a new partition", 410}, - {" o create a new empty DOS partition table", 411}, - {" p print the partition table", 412}, - {" q quit without saving changes", 413}, - {" s create a new empty Sun disklabel", 414}, - {" t change a partition's system id", 415}, - {" u change display/entry units", 416}, - {" v verify the partition table", 417}, - {" w write table to disk and exit", 418}, - {" x extra functionality (experts only)", 419}, - {" a select bootable partition", 420}, - {" b edit bootfile entry", 421}, - {" c select sgi swap partition", 422}, - {" a toggle a bootable flag", 423}, - {" c toggle the dos compatibility flag", 424}, - {" a change number of alternate cylinders", 425}, - {" c change number of cylinders", 426}, - {" d print the raw data in the partition table", 427}, - {" e change number of extra sectors per cylinder", 428}, - {" h change number of heads", 429}, - {" i change interleave factor", 430}, - {" o change rotation speed (rpm)", 431}, - {" r return to main menu", 432}, - {" s change number of sectors/track", 433}, - {" y change number of physical cylinders", 434}, - {" b move beginning of data in a partition", 435}, - {" e list extended partitions", 436}, - {" g create an IRIX (SGI) partition table", 437}, - {" f fix partition order", 438}, - {"You must set", 439}, - {"heads", 440}, - {"sectors", 441}, - {"cylinders", 442}, + ...\n", 396}, + {"Unable to open %s\n", 397}, + {"Unable to read %s\n", 398}, + {"Unable to seek on %s\n", 399}, + {"Unable to write %s\n", 400}, + {"BLKGETSIZE ioctl failed on %s\n", 401}, + {"Unable to allocate any more memory\n", 402}, + {"Fatal error\n", 403}, + {"Command action", 404}, + {" a toggle a read only flag", 405}, + {" b edit bsd disklabel", 406}, + {" c toggle the mountable flag", 407}, + {" d delete a partition", 408}, + {" l list known partition types", 409}, + {" m print this menu", 410}, + {" n add a new partition", 411}, + {" o create a new empty DOS partition table", 412}, + {" p print the partition table", 413}, + {" q quit without saving changes", 414}, + {" s create a new empty Sun disklabel", 415}, + {" t change a partition's system id", 416}, + {" u change display/entry units", 417}, + {" v verify the partition table", 418}, + {" w write table to disk and exit", 419}, + {" x extra functionality (experts only)", 420}, + {" a select bootable partition", 421}, + {" b edit bootfile entry", 422}, + {" c select sgi swap partition", 423}, + {" a toggle a bootable flag", 424}, + {" c toggle the dos compatibility flag", 425}, + {" a change number of alternate cylinders", 426}, + {" c change number of cylinders", 427}, + {" d print the raw data in the partition table", 428}, + {" e change number of extra sectors per cylinder", 429}, + {" h change number of heads", 430}, + {" i change interleave factor", 431}, + {" o change rotation speed (rpm)", 432}, + {" r return to main menu", 433}, + {" s change number of sectors/track", 434}, + {" y change number of physical cylinders", 435}, + {" b move beginning of data in a partition", 436}, + {" e list extended partitions", 437}, + {" g create an IRIX (SGI) partition table", 438}, + {" f fix partition order", 439}, + {"You must set", 440}, + {"heads", 441}, + {"sectors", 442}, + {"cylinders", 443}, {"\ %s%s.\n\ -You can do this from the extra functions menu.\n", 443}, - {" and ", 444}, +You can do this from the extra functions menu.\n", 444}, + {" and ", 445}, {"\ \n\ The number of cylinders for this disk is set to %d.\n\ @@ -529,158 +530,158 @@ There is nothing wrong with that, but this is larger than 1024,\n\ and could in certain setups cause problems with:\n\ 1) software that runs at boot time (e.g., old versions of LILO)\n\ 2) booting and partitioning software from other OSs\n\ - (e.g., DOS FDISK, OS/2 FDISK)\n", 445}, - {"Bad offset in primary extended partition\n", 446}, - {"Warning: deleting partitions after %d\n", 447}, - {"Warning: extra link pointer in partition table %d\n", 448}, - {"Warning: ignoring extra data in partition table %d\n", 449}, + (e.g., DOS FDISK, OS/2 FDISK)\n", 446}, + {"Bad offset in primary extended partition\n", 447}, + {"Warning: deleting partitions after %d\n", 448}, + {"Warning: extra link pointer in partition table %d\n", 449}, + {"Warning: ignoring extra data in partition table %d\n", 450}, {"\ Building a new DOS disklabel. Changes will remain in memory only,\n\ until you decide to write them. After that, of course, the previous\n\ content won't be recoverable.\n\ -\n", 450}, - {"Note: sector size is %d (not %d)\n", 451}, - {"You will not be able to write the partition table.\n", 452}, +\n", 451}, + {"Note: sector size is %d (not %d)\n", 452}, + {"You will not be able to write the partition table.\n", 453}, {"\ Device contains neither a valid DOS partition table, nor Sun, SGI or OSF \ -disklabel\n", 453}, - {"Internal error\n", 454}, - {"Ignoring extra extended partition %d\n", 455}, +disklabel\n", 454}, + {"Internal error\n", 455}, + {"Ignoring extra extended partition %d\n", 456}, {"\ Warning: invalid flag 0x%04x of partition table %d will be corrected by w\ -(rite)\n", 456}, +(rite)\n", 457}, {"\ \n\ -got EOF thrice - exiting..\n", 457}, - {"Hex code (type L to list codes): ", 458}, - {"%s (%d-%d, default %d): ", 459}, - {"Using default value %d\n", 460}, - {"Value out of range.\n", 461}, - {"Partition number", 462}, - {"Warning: partition %d has empty type\n", 463}, - {"cylinder", 464}, - {"sector", 465}, - {"Changing display/entry units to %s\n", 466}, - {"WARNING: Partition %d is an extended partition\n", 467}, - {"DOS Compatibility flag is set\n", 468}, - {"DOS Compatibility flag is not set\n", 469}, - {"Partition %d does not exist yet!\n", 470}, +got EOF thrice - exiting..\n", 458}, + {"Hex code (type L to list codes): ", 459}, + {"%s (%d-%d, default %d): ", 460}, + {"Using default value %d\n", 461}, + {"Value out of range.\n", 462}, + {"Partition number", 463}, + {"Warning: partition %d has empty type\n", 464}, + {"cylinder", 465}, + {"sector", 466}, + {"Changing display/entry units to %s\n", 467}, + {"WARNING: Partition %d is an extended partition\n", 468}, + {"DOS Compatibility flag is set\n", 469}, + {"DOS Compatibility flag is not set\n", 470}, + {"Partition %d does not exist yet!\n", 471}, {"\ Type 0 means free space to many systems\n\ (but not to Linux). Having partitions of\n\ type 0 is probably unwise. You can delete\n\ -a partition using the `d' command.\n", 471}, +a partition using the `d' command.\n", 472}, {"\ You cannot change a partition into an extended one or vice versa\n\ -Delete it first.\n", 472}, +Delete it first.\n", 473}, {"\ Consider leaving partition 3 as Whole disk (5),\n\ as SunOS/Solaris expects it and even Linux likes it.\n\ -\n", 473}, +\n", 474}, {"\ Consider leaving partition 9 as volume header (0),\n\ and partition 11 as entire volume (6)as IRIX expects it.\n\ -\n", 474}, - {"Changed system type of partition %d to %x (%s)\n", 475}, - {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 476}, - {" phys=(%d, %d, %d) ", 477}, - {"logical=(%d, %d, %d)\n", 478}, - {"Partition %d has different physical/logical endings:\n", 479}, - {"Partition %i does not start on cylinder boundary:\n", 480}, - {"should be (%d, %d, 1)\n", 481}, - {"Partition %i does not end on cylinder boundary:\n", 482}, - {"should be (%d, %d, %d)\n", 483}, +\n", 475}, + {"Changed system type of partition %d to %x (%s)\n", 476}, + {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 477}, + {" phys=(%d, %d, %d) ", 478}, + {"logical=(%d, %d, %d)\n", 479}, + {"Partition %d has different physical/logical endings:\n", 480}, + {"Partition %i does not start on cylinder boundary:\n", 481}, + {"should be (%d, %d, 1)\n", 482}, + {"Partition %i does not end on cylinder boundary:\n", 483}, + {"should be (%d, %d, %d)\n", 484}, {"\ \n\ Disk %s: %d heads, %d sectors, %d cylinders\n\ Units = %s of %d * %d bytes\n\ -\n", 484}, +\n", 485}, {"\ Nothing to do. Ordering is correct already.\n\ -\n", 485}, - {"%*s Boot Start End Blocks Id System\n", 486}, - {"Device", 487}, +\n", 486}, + {"%*s Boot Start End Blocks Id System\n", 487}, + {"Device", 488}, {"\ \n\ -Partition table entries are not in disk order\n", 488}, +Partition table entries are not in disk order\n", 489}, {"\ \n\ Disk %s: %d heads, %d sectors, %d cylinders\n\ -\n", 489}, - {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 490}, - {"Warning: partition %d contains sector 0\n", 491}, - {"Partition %d: head %d greater than maximum %d\n", 492}, - {"Partition %d: sector %d greater than maximum %d\n", 493}, - {"Partitions %d: cylinder %d greater than maximum %d\n", 494}, - {"Partition %d: previous sectors %d disagrees with total %d\n", 495}, - {"Warning: bad start-of-data in partition %d\n", 496}, - {"Warning: partition %d overlaps partition %d.\n", 497}, - {"Warning: partition %d is empty\n", 498}, - {"Logical partition %d not entirely in partition %d\n", 499}, - {"Total allocated sectors %d greater than the maximum %d\n", 500}, - {"%d unallocated sectors\n", 501}, - {"Partition %d is already defined. Delete it before re-adding it.\n", 502}, - {"First %s", 503}, - {"Sector %d is already allocated\n", 504}, - {"No free sectors available\n", 505}, - {"Last %s or +size or +sizeM or +sizeK", 506}, +\n", 490}, + {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 491}, + {"Warning: partition %d contains sector 0\n", 492}, + {"Partition %d: head %d greater than maximum %d\n", 493}, + {"Partition %d: sector %d greater than maximum %d\n", 494}, + {"Partitions %d: cylinder %d greater than maximum %d\n", 495}, + {"Partition %d: previous sectors %d disagrees with total %d\n", 496}, + {"Warning: bad start-of-data in partition %d\n", 497}, + {"Warning: partition %d overlaps partition %d.\n", 498}, + {"Warning: partition %d is empty\n", 499}, + {"Logical partition %d not entirely in partition %d\n", 500}, + {"Total allocated sectors %d greater than the maximum %d\n", 501}, + {"%d unallocated sectors\n", 502}, + {"Partition %d is already defined. Delete it before re-adding it.\n", 503}, + {"First %s", 504}, + {"Sector %d is already allocated\n", 505}, + {"No free sectors available\n", 506}, + {"Last %s or +size or +sizeM or +sizeK", 507}, {"\ \tSorry - this fdisk cannot handle AIX disk labels.\n\ \tIf you want to add DOS-type partitions, create\n\ \ta new empty DOS partition table first. (Use o.)\n\ -\tWARNING: This will destroy the present disk contents.\n", 507}, - {"The maximum number of partitions has been created\n", 508}, - {"You must delete some partition and add an extended partition first\n", 509}, +\tWARNING: This will destroy the present disk contents.\n", 508}, + {"The maximum number of partitions has been created\n", 509}, + {"You must delete some partition and add an extended partition first\n", 510}, {"\ Command action\n\ %s\n\ - p primary partition (1-4)\n", 510}, - {"l logical (5 or over)", 511}, - {"e extended", 512}, - {"Invalid partition number for type `%c'\n", 513}, + p primary partition (1-4)\n", 511}, + {"l logical (5 or over)", 512}, + {"e extended", 513}, + {"Invalid partition number for type `%c'\n", 514}, {"\ The partition table has been altered!\n\ -\n", 514}, - {"Calling ioctl() to re-read partition table.\n", 515}, +\n", 515}, + {"Calling ioctl() to re-read partition table.\n", 516}, {"\ \n\ WARNING: Re-reading the partition table failed with error %d: %s.\n\ The kernel still uses the old table.\n\ -The new table will be used at the next reboot.\n", 516}, +The new table will be used at the next reboot.\n", 517}, {"\ \n\ WARNING: If you have created or modified any DOS 6.x\n\ partitions, please see the fdisk manual page for additional\n\ -information.\n", 517}, - {"Syncing disks.\n", 518}, - {"Partition %d has no data area\n", 519}, - {"New beginning of data", 520}, - {"Expert command (m for help): ", 521}, - {"Number of cylinders", 522}, - {"Number of heads", 523}, - {"Number of sectors", 524}, - {"Warning: setting sector offset for DOS compatiblity\n", 525}, - {"Disk %s doesn't contain a valid partition table\n", 526}, - {"Cannot open %s\n", 527}, - {"cannot open %s\n", 528}, - {"%c: unknown command\n", 529}, - {"This kernel finds the sector size itself - -b option ignored\n", 530}, +information.\n", 518}, + {"Syncing disks.\n", 519}, + {"Partition %d has no data area\n", 520}, + {"New beginning of data", 521}, + {"Expert command (m for help): ", 522}, + {"Number of cylinders", 523}, + {"Number of heads", 524}, + {"Number of sectors", 525}, + {"Warning: setting sector offset for DOS compatiblity\n", 526}, + {"Disk %s doesn't contain a valid partition table\n", 527}, + {"Cannot open %s\n", 528}, + {"cannot open %s\n", 529}, + {"%c: unknown command\n", 530}, + {"This kernel finds the sector size itself - -b option ignored\n", 531}, {"\ Warning: the -b (set sector size) option should be used with one specified \ -device\n", 531}, +device\n", 532}, {"\ Detected an OSF/1 disklabel on %s, entering disklabel mode.\n\ -To return to DOS partition table mode, use the 'r' command.\n", 532}, - {"Command (m for help): ", 533}, +To return to DOS partition table mode, use the 'r' command.\n", 533}, + {"Command (m for help): ", 534}, {"\ \n\ -The current boot file is: %s\n", 534}, - {"Please enter the name of the new boot file: ", 535}, - {"Boot file unchanged\n", 536}, +The current boot file is: %s\n", 535}, + {"Please enter the name of the new boot file: ", 536}, + {"Boot file unchanged\n", 537}, {"\ \n\ \tSorry, no experts menu for SGI partition tables available.\n\ -\n", 537}, +\n", 538}, {"\ \n\ \tThere is a valid AIX label on this disk.\n\ @@ -693,94 +694,94 @@ The current boot file is: %s\n", 534}, \t erase the other disks as well, if unmirrored.)\n\ \t3. Before deleting this physical volume be sure\n\ \t to remove the disk logically from your AIX\n\ -\t machine. (Otherwise you become an AIXpert).", 538}, +\t machine. (Otherwise you become an AIXpert).", 539}, {"\ \n\ -BSD label for device: %s\n", 539}, - {" d delete a BSD partition", 540}, - {" e edit drive data", 541}, - {" i install bootstrap", 542}, - {" l list known filesystem types", 543}, - {" n add a new BSD partition", 544}, - {" p print BSD partition table", 545}, - {" s show complete disklabel", 546}, - {" t change a partition's filesystem id", 547}, - {" u change units (cylinders/sectors)", 548}, - {" w write disklabel to disk", 549}, - {" x link BSD partition to non-BSD partition", 550}, - {"Partition %s has invalid starting sector 0.\n", 551}, - {"Reading disklabel of %s at sector %d.\n", 552}, - {"There is no *BSD partition on %s.\n", 553}, - {"BSD disklabel command (m for help): ", 554}, - {"type: %s\n", 555}, - {"type: %d\n", 556}, - {"disk: %.*s\n", 557}, - {"label: %.*s\n", 558}, - {"flags:", 559}, - {" removable", 560}, - {" ecc", 561}, - {" badsect", 562}, - {"bytes/sector: %ld\n", 563}, - {"sectors/track: %ld\n", 564}, - {"tracks/cylinder: %ld\n", 565}, - {"sectors/cylinder: %ld\n", 566}, - {"cylinders: %ld\n", 567}, - {"rpm: %d\n", 568}, - {"interleave: %d\n", 569}, - {"trackskew: %d\n", 570}, - {"cylinderskew: %d\n", 571}, - {"headswitch: %ld\t\t# milliseconds\n", 572}, - {"track-to-track seek: %ld\t# milliseconds\n", 573}, - {"drivedata: ", 574}, +BSD label for device: %s\n", 540}, + {" d delete a BSD partition", 541}, + {" e edit drive data", 542}, + {" i install bootstrap", 543}, + {" l list known filesystem types", 544}, + {" n add a new BSD partition", 545}, + {" p print BSD partition table", 546}, + {" s show complete disklabel", 547}, + {" t change a partition's filesystem id", 548}, + {" u change units (cylinders/sectors)", 549}, + {" w write disklabel to disk", 550}, + {" x link BSD partition to non-BSD partition", 551}, + {"Partition %s has invalid starting sector 0.\n", 552}, + {"Reading disklabel of %s at sector %d.\n", 553}, + {"There is no *BSD partition on %s.\n", 554}, + {"BSD disklabel command (m for help): ", 555}, + {"type: %s\n", 556}, + {"type: %d\n", 557}, + {"disk: %.*s\n", 558}, + {"label: %.*s\n", 559}, + {"flags:", 560}, + {" removable", 561}, + {" ecc", 562}, + {" badsect", 563}, + {"bytes/sector: %ld\n", 564}, + {"sectors/track: %ld\n", 565}, + {"tracks/cylinder: %ld\n", 566}, + {"sectors/cylinder: %ld\n", 567}, + {"cylinders: %ld\n", 568}, + {"rpm: %d\n", 569}, + {"interleave: %d\n", 570}, + {"trackskew: %d\n", 571}, + {"cylinderskew: %d\n", 572}, + {"headswitch: %ld\t\t# milliseconds\n", 573}, + {"track-to-track seek: %ld\t# milliseconds\n", 574}, + {"drivedata: ", 575}, {"\ \n\ -%d partitions:\n", 575}, - {"# start end size fstype [fsize bsize cpg]\n", 576}, - {"Writing disklabel to %s.\n", 577}, - {"%s contains no disklabel.\n", 578}, - {"Do you want to create a disklabel? (y/n) ", 579}, - {"bytes/sector", 580}, - {"sectors/track", 581}, - {"tracks/cylinder", 582}, - {"sectors/cylinder", 583}, - {"Must be <= sectors/track * tracks/cylinder (default).\n", 584}, - {"rpm", 585}, - {"interleave", 586}, - {"trackskew", 587}, - {"cylinderskew", 588}, - {"headswitch", 589}, - {"track-to-track seek", 590}, - {"Bootstrap: %sboot -> boot%s (%s): ", 591}, - {"Bootstrap overlaps with disk label!\n", 592}, - {"Bootstrap installed on %s.\n", 593}, - {"Partition (a-%c): ", 594}, - {"This partition already exists.\n", 595}, - {"Warning: too many partitions (%d, maximum is %d).\n", 596}, +%d partitions:\n", 576}, + {"# start end size fstype [fsize bsize cpg]\n", 577}, + {"Writing disklabel to %s.\n", 578}, + {"%s contains no disklabel.\n", 579}, + {"Do you want to create a disklabel? (y/n) ", 580}, + {"bytes/sector", 581}, + {"sectors/track", 582}, + {"tracks/cylinder", 583}, + {"sectors/cylinder", 584}, + {"Must be <= sectors/track * tracks/cylinder (default).\n", 585}, + {"rpm", 586}, + {"interleave", 587}, + {"trackskew", 588}, + {"cylinderskew", 589}, + {"headswitch", 590}, + {"track-to-track seek", 591}, + {"Bootstrap: %sboot -> boot%s (%s): ", 592}, + {"Bootstrap overlaps with disk label!\n", 593}, + {"Bootstrap installed on %s.\n", 594}, + {"Partition (a-%c): ", 595}, + {"This partition already exists.\n", 596}, + {"Warning: too many partitions (%d, maximum is %d).\n", 597}, {"\ \n\ -Syncing disks.\n", 597}, - {"SGI volhdr", 598}, - {"SGI trkrepl", 599}, - {"SGI secrepl", 600}, - {"SGI raw", 601}, - {"SGI bsd", 602}, - {"SGI sysv", 603}, - {"SGI volume", 604}, - {"SGI efs", 605}, - {"SGI lvol", 606}, - {"SGI rlvol", 607}, - {"SGI xfs", 608}, - {"SGI xfslog", 609}, - {"SGI xlv", 610}, - {"SGI xvm", 611}, - {"Linux swap", 612}, - {"Linux native", 613}, - {"Linux LVM", 614}, - {"Linux RAID", 615}, +Syncing disks.\n", 598}, + {"SGI volhdr", 599}, + {"SGI trkrepl", 600}, + {"SGI secrepl", 601}, + {"SGI raw", 602}, + {"SGI bsd", 603}, + {"SGI sysv", 604}, + {"SGI volume", 605}, + {"SGI efs", 606}, + {"SGI lvol", 607}, + {"SGI rlvol", 608}, + {"SGI xfs", 609}, + {"SGI xfslog", 610}, + {"SGI xlv", 611}, + {"SGI xvm", 612}, + {"Linux swap", 613}, + {"Linux native", 614}, + {"Linux LVM", 615}, + {"Linux RAID", 616}, {"\ According to MIPS Computer Systems, Inc the Label must not contain more than \ -512 bytes\n", 616}, - {"Detected sgi disklabel with wrong checksum.\n", 617}, +512 bytes\n", 617}, + {"Detected sgi disklabel with wrong checksum.\n", 618}, {"\ \n\ Disk %s (SGI disk label): %d heads, %d sectors\n\ @@ -788,141 +789,141 @@ Disk %s (SGI disk label): %d heads, %d sectors\n\ %d extra sects/cyl, interleave %d:1\n\ %s\n\ Units = %s of %d * 512 bytes\n\ -\n", 618}, +\n", 619}, {"\ \n\ Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n\ Units = %s of %d * 512 bytes\n\ -\n", 619}, +\n", 620}, {"\ ----- partitions -----\n\ -Pt# %*s Info Start End Sectors Id System\n", 620}, +Pt# %*s Info Start End Sectors Id System\n", 621}, {"\ ----- Bootinfo -----\n\ Bootfile: %s\n\ ------ Directory Entries -----\n", 621}, - {"%2d: %-10s sector%5u size%8u\n", 622}, +----- Directory Entries -----\n", 622}, + {"%2d: %-10s sector%5u size%8u\n", 623}, {"\ \n\ Invalid Bootfile!\n\ \tThe bootfile must be an absolute non-zero pathname,\n\ -\te.g. \"/unix\" or \"/unix.save\".\n", 623}, +\te.g. \"/unix\" or \"/unix.save\".\n", 624}, {"\ \n\ -\tName of Bootfile too long: 16 bytes maximum.\n", 624}, +\tName of Bootfile too long: 16 bytes maximum.\n", 625}, {"\ \n\ -\tBootfile must have a fully qualified pathname.\n", 625}, +\tBootfile must have a fully qualified pathname.\n", 626}, {"\ \n\ \tBe aware, that the bootfile is not checked for existence.\n\ -\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 626}, +\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 627}, {"\ \n\ -\tBootfile is changed to \"%s\".\n", 627}, - {"More than one entire disk entry present.\n", 628}, - {"No partitions defined\n", 629}, - {"IRIX likes when Partition 11 covers the entire disk.\n", 630}, +\tBootfile is changed to \"%s\".\n", 628}, + {"More than one entire disk entry present.\n", 629}, + {"No partitions defined\n", 630}, + {"IRIX likes when Partition 11 covers the entire disk.\n", 631}, {"\ The entire disk partition should start at block 0,\n\ -not at diskblock %d.\n", 631}, +not at diskblock %d.\n", 632}, {"\ The entire disk partition is only %d diskblock large,\n\ -but the disk is %d diskblocks long.\n", 632}, - {"One Partition (#11) should cover the entire disk.\n", 633}, - {"Partition %d does not start on cylinder boundary.\n", 634}, - {"Partition %d does not end on cylinder boundary.\n", 635}, - {"The Partition %d and %d overlap by %d sectors.\n", 636}, - {"Unused gap of %8d sectors - sectors %8d-%d\n", 637}, +but the disk is %d diskblocks long.\n", 633}, + {"One Partition (#11) should cover the entire disk.\n", 634}, + {"Partition %d does not start on cylinder boundary.\n", 635}, + {"Partition %d does not end on cylinder boundary.\n", 636}, + {"The Partition %d and %d overlap by %d sectors.\n", 637}, + {"Unused gap of %8d sectors - sectors %8d-%d\n", 638}, {"\ \n\ -The boot partition does not exist.\n", 638}, +The boot partition does not exist.\n", 639}, {"\ \n\ -The swap partition does not exist.\n", 639}, +The swap partition does not exist.\n", 640}, {"\ \n\ -The swap partition has no swap type.\n", 640}, - {"\tYou have chosen an unusual boot file name.\n", 641}, - {"Sorry You may change the Tag of non-empty partitions.\n", 642}, +The swap partition has no swap type.\n", 641}, + {"\tYou have chosen an unusual boot file name.\n", 642}, + {"Sorry You may change the Tag of non-empty partitions.\n", 643}, {"\ It is highly recommended that the partition at offset 0\n\ is of type \"SGI volhdr\", the IRIX system will rely on it to\n\ retrieve from its directory standalone tools like sash and fx.\n\ Only the \"SGI volume\" entire disk section may violate this.\n\ -Type YES if you are sure about tagging this partition differently.\n", 643}, - {"YES\n", 644}, - {"Do You know, You got a partition overlap on the disk?\n", 645}, - {"Attempting to generate entire disk entry automatically.\n", 646}, - {"The entire disk is already covered with partitions.\n", 647}, - {"You got a partition overlap on the disk. Fix it first!\n", 648}, +Type YES if you are sure about tagging this partition differently.\n", 644}, + {"YES\n", 645}, + {"Do You know, You got a partition overlap on the disk?\n", 646}, + {"Attempting to generate entire disk entry automatically.\n", 647}, + {"The entire disk is already covered with partitions.\n", 648}, + {"You got a partition overlap on the disk. Fix it first!\n", 649}, {"\ It is highly recommended that eleventh partition\n\ -covers the entire disk and is of type `SGI volume'\n", 649}, - {"You will get a partition overlap on the disk. Fix it first!\n", 650}, - {" Last %s", 651}, +covers the entire disk and is of type `SGI volume'\n", 650}, + {"You will get a partition overlap on the disk. Fix it first!\n", 651}, + {" Last %s", 652}, {"\ Building a new SGI disklabel. Changes will remain in memory only,\n\ until you decide to write them. After that, of course, the previous\n\ content will be unrecoverably lost.\n\ -\n", 652}, - {"Trying to keep parameters of partition %d.\n", 653}, - {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 654}, - {"Empty", 655}, - {"SunOS root", 656}, - {"SunOS swap", 657}, - {"SunOS usr", 658}, - {"Whole disk", 659}, - {"SunOS stand", 660}, - {"SunOS var", 661}, - {"SunOS home", 662}, - {"Linux raid autodetect", 663}, +\n", 653}, + {"Trying to keep parameters of partition %d.\n", 654}, + {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 655}, + {"Empty", 656}, + {"SunOS root", 657}, + {"SunOS swap", 658}, + {"SunOS usr", 659}, + {"Whole disk", 660}, + {"SunOS stand", 661}, + {"SunOS var", 662}, + {"SunOS home", 663}, + {"Linux raid autodetect", 664}, {"\ Detected sun disklabel with wrong checksum.\n\ Probably you'll have to set all the values,\n\ e.g. heads, sectors, cylinders and partitions\n\ -or force a fresh label (s command in main menu)\n", 664}, - {"Autoconfigure found a %s%s%s\n", 665}, +or force a fresh label (s command in main menu)\n", 665}, + {"Autoconfigure found a %s%s%s\n", 666}, {"\ Building a new sun disklabel. Changes will remain in memory only,\n\ until you decide to write them. After that, of course, the previous\n\ content won't be recoverable.\n\ -\n", 666}, +\n", 667}, {"\ Drive type\n\ ? auto configure\n\ - 0 custom (with hardware detected defaults)", 667}, - {"Select type (? for auto, 0 for custom): ", 668}, - {"Autoconfigure failed.\n", 669}, - {"Sectors/track", 670}, - {"Alternate cylinders", 671}, - {"Physical cylinders", 672}, - {"Rotation speed (rpm)", 673}, - {"Interleave factor", 674}, - {"Extra sectors per cylinder", 675}, - {"You may change all the disk params from the x menu", 676}, - {"3,5\" floppy", 677}, - {"Linux custom", 678}, - {"Partition %d doesn't end on cylinder boundary\n", 679}, - {"Partition %d overlaps with others in sectors %d-%d\n", 680}, - {"Unused gap - sectors 0-%d\n", 681}, - {"Unused gap - sectors %d-%d\n", 682}, + 0 custom (with hardware detected defaults)", 668}, + {"Select type (? for auto, 0 for custom): ", 669}, + {"Autoconfigure failed.\n", 670}, + {"Sectors/track", 671}, + {"Alternate cylinders", 672}, + {"Physical cylinders", 673}, + {"Rotation speed (rpm)", 674}, + {"Interleave factor", 675}, + {"Extra sectors per cylinder", 676}, + {"You may change all the disk params from the x menu", 677}, + {"3,5\" floppy", 678}, + {"Linux custom", 679}, + {"Partition %d doesn't end on cylinder boundary\n", 680}, + {"Partition %d overlaps with others in sectors %d-%d\n", 681}, + {"Unused gap - sectors 0-%d\n", 682}, + {"Unused gap - sectors %d-%d\n", 683}, {"\ Other partitions already cover the whole disk.\n\ -Delete some/shrink them before retry.\n", 683}, +Delete some/shrink them before retry.\n", 684}, {"\ You haven't covered the whole disk with the 3rd partition, but your value\n\ %d %s covers some other partition. Your entry has been changed\n\ -to %d %s\n", 684}, +to %d %s\n", 685}, {"\ If you want to maintain SunOS/Solaris compatibility, consider leaving this\n\ -partition as Whole disk (5), starting at 0, with %u sectors\n", 685}, +partition as Whole disk (5), starting at 0, with %u sectors\n", 686}, {"\ It is highly recommended that the partition at offset 0\n\ is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n\ there may destroy your partition table and bootblock.\n\ Type YES if you're very sure you would like that partition\n\ -tagged with 82 (Linux swap): ", 686}, +tagged with 82 (Linux swap): ", 687}, {"\ \n\ Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\ @@ -930,453 +931,456 @@ Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\ %d extra sects/cyl, interleave %d:1\n\ %s\n\ Units = %s of %d * 512 bytes\n\ -\n", 687}, +\n", 688}, {"\ \n\ Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n\ Units = %s of %d * 512 bytes\n\ -\n", 688}, - {"%*s Flag Start End Blocks Id System\n", 689}, - {"Number of alternate cylinders", 690}, - {"Number of physical cylinders", 691}, - {"FAT12", 692}, - {"XENIX root", 693}, - {"XENIX usr", 694}, - {"FAT16 <32M", 695}, - {"Extended", 696}, - {"FAT16", 697}, - {"HPFS/NTFS", 698}, - {"AIX", 699}, - {"AIX bootable", 700}, - {"OS/2 Boot Manager", 701}, - {"Win95 FAT32", 702}, - {"Win95 FAT32 (LBA)", 703}, - {"Win95 FAT16 (LBA)", 704}, - {"Win95 Ext'd (LBA)", 705}, - {"OPUS", 706}, - {"Hidden FAT12", 707}, - {"Compaq diagnostics", 708}, - {"Hidden FAT16 <32M", 709}, - {"Hidden FAT16", 710}, - {"Hidden HPFS/NTFS", 711}, - {"AST SmartSleep", 712}, - {"Hidden Win95 FAT32", 713}, - {"Hidden Win95 FAT32 (LBA)", 714}, - {"Hidden Win95 FAT16 (LBA)", 715}, - {"NEC DOS", 716}, - {"Plan 9", 717}, - {"PartitionMagic recovery", 718}, - {"Venix 80286", 719}, - {"PPC PReP Boot", 720}, - {"SFS", 721}, - {"QNX4.x", 722}, - {"QNX4.x 2nd part", 723}, - {"QNX4.x 3rd part", 724}, - {"OnTrack DM", 725}, - {"OnTrack DM6 Aux1", 726}, - {"CP/M", 727}, - {"OnTrack DM6 Aux3", 728}, - {"OnTrackDM6", 729}, - {"EZ-Drive", 730}, - {"Golden Bow", 731}, - {"Priam Edisk", 732}, - {"SpeedStor", 733}, - {"GNU HURD or SysV", 734}, - {"Novell Netware 286", 735}, - {"Novell Netware 386", 736}, - {"DiskSecure Multi-Boot", 737}, - {"PC/IX", 738}, - {"Old Minix", 739}, - {"Minix / old Linux", 740}, - {"OS/2 hidden C: drive", 741}, - {"Linux extended", 742}, - {"NTFS volume set", 743}, - {"Amoeba", 744}, - {"Amoeba BBT", 745}, - {"BSD/OS", 746}, - {"IBM Thinkpad hibernation", 747}, - {"FreeBSD", 748}, - {"OpenBSD", 749}, - {"NeXTSTEP", 750}, - {"NetBSD", 751}, - {"BSDI fs", 752}, - {"BSDI swap", 753}, - {"Boot Wizard hidden", 754}, - {"DRDOS/sec (FAT-12)", 755}, - {"DRDOS/sec (FAT-16 < 32M)", 756}, - {"DRDOS/sec (FAT-16)", 757}, - {"Syrinx", 758}, - {"Non-FS data", 759}, - {"CP/M / CTOS / ...", 760}, - {"Dell Utility", 761}, - {"BootIt", 762}, - {"DOS access", 763}, - {"DOS R/O", 764}, - {"BeOS fs", 765}, - {"EFI GPT", 766}, - {"EFI (FAT-12/16/32)", 767}, - {"Linux/PA-RISC boot", 768}, - {"DOS secondary", 769}, - {"LANstep", 770}, - {"BBT", 771}, - {"seek error on %s - cannot seek to %lu\n", 772}, - {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 773}, - {"out of memory - giving up\n", 774}, - {"read error on %s - cannot read sector %lu\n", 775}, - {"ERROR: sector %lu does not have an msdos signature\n", 776}, - {"write error on %s - cannot write sector %lu\n", 777}, - {"cannot open partition sector save file (%s)\n", 778}, - {"write error on %s\n", 779}, - {"cannot stat partition restore file (%s)\n", 780}, - {"partition restore file has wrong size - not restoring\n", 781}, - {"out of memory?\n", 782}, - {"cannot open partition restore file (%s)\n", 783}, - {"error reading %s\n", 784}, - {"cannot open device %s for writing\n", 785}, - {"error writing sector %lu on %s\n", 786}, - {"Disk %s: cannot get size\n", 787}, - {"Disk %s: cannot get geometry\n", 788}, +\n", 689}, + {"%*s Flag Start End Blocks Id System\n", 690}, + {"Number of alternate cylinders", 691}, + {"Number of physical cylinders", 692}, + {"FAT12", 693}, + {"XENIX root", 694}, + {"XENIX usr", 695}, + {"FAT16 <32M", 696}, + {"Extended", 697}, + {"FAT16", 698}, + {"HPFS/NTFS", 699}, + {"AIX", 700}, + {"AIX bootable", 701}, + {"OS/2 Boot Manager", 702}, + {"Win95 FAT32", 703}, + {"Win95 FAT32 (LBA)", 704}, + {"Win95 FAT16 (LBA)", 705}, + {"Win95 Ext'd (LBA)", 706}, + {"OPUS", 707}, + {"Hidden FAT12", 708}, + {"Compaq diagnostics", 709}, + {"Hidden FAT16 <32M", 710}, + {"Hidden FAT16", 711}, + {"Hidden HPFS/NTFS", 712}, + {"AST SmartSleep", 713}, + {"Hidden Win95 FAT32", 714}, + {"Hidden Win95 FAT32 (LBA)", 715}, + {"Hidden Win95 FAT16 (LBA)", 716}, + {"NEC DOS", 717}, + {"Plan 9", 718}, + {"PartitionMagic recovery", 719}, + {"Venix 80286", 720}, + {"PPC PReP Boot", 721}, + {"SFS", 722}, + {"QNX4.x", 723}, + {"QNX4.x 2nd part", 724}, + {"QNX4.x 3rd part", 725}, + {"OnTrack DM", 726}, + {"OnTrack DM6 Aux1", 727}, + {"CP/M", 728}, + {"OnTrack DM6 Aux3", 729}, + {"OnTrackDM6", 730}, + {"EZ-Drive", 731}, + {"Golden Bow", 732}, + {"Priam Edisk", 733}, + {"SpeedStor", 734}, + {"GNU HURD or SysV", 735}, + {"Novell Netware 286", 736}, + {"Novell Netware 386", 737}, + {"DiskSecure Multi-Boot", 738}, + {"PC/IX", 739}, + {"Old Minix", 740}, + {"Minix / old Linux", 741}, + {"OS/2 hidden C: drive", 742}, + {"Linux extended", 743}, + {"NTFS volume set", 744}, + {"Amoeba", 745}, + {"Amoeba BBT", 746}, + {"BSD/OS", 747}, + {"IBM Thinkpad hibernation", 748}, + {"FreeBSD", 749}, + {"OpenBSD", 750}, + {"NeXTSTEP", 751}, + {"Darwin UFS", 752}, + {"NetBSD", 753}, + {"Darwin boot", 754}, + {"BSDI fs", 755}, + {"BSDI swap", 756}, + {"Boot Wizard hidden", 757}, + {"Solaris boot", 758}, + {"DRDOS/sec (FAT-12)", 759}, + {"DRDOS/sec (FAT-16 < 32M)", 760}, + {"DRDOS/sec (FAT-16)", 761}, + {"Syrinx", 762}, + {"Non-FS data", 763}, + {"CP/M / CTOS / ...", 764}, + {"Dell Utility", 765}, + {"BootIt", 766}, + {"DOS access", 767}, + {"DOS R/O", 768}, + {"BeOS fs", 769}, + {"EFI GPT", 770}, + {"EFI (FAT-12/16/32)", 771}, + {"Linux/PA-RISC boot", 772}, + {"DOS secondary", 773}, + {"LANstep", 774}, + {"BBT", 775}, + {"seek error on %s - cannot seek to %lu\n", 776}, + {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 777}, + {"out of memory - giving up\n", 778}, + {"read error on %s - cannot read sector %lu\n", 779}, + {"ERROR: sector %lu does not have an msdos signature\n", 780}, + {"write error on %s - cannot write sector %lu\n", 781}, + {"cannot open partition sector save file (%s)\n", 782}, + {"write error on %s\n", 783}, + {"cannot stat partition restore file (%s)\n", 784}, + {"partition restore file has wrong size - not restoring\n", 785}, + {"out of memory?\n", 786}, + {"cannot open partition restore file (%s)\n", 787}, + {"error reading %s\n", 788}, + {"cannot open device %s for writing\n", 789}, + {"error writing sector %lu on %s\n", 790}, + {"Disk %s: cannot get size\n", 791}, + {"Disk %s: cannot get geometry\n", 792}, {"\ Warning: start=%lu - this looks like a partition rather than\n\ the entire disk. Using fdisk on it is probably meaningless.\n\ -[Use the --force option if you really want this]\n", 789}, - {"Warning: HDIO_GETGEO says that there are %lu heads\n", 790}, - {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 791}, - {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 792}, +[Use the --force option if you really want this]\n", 793}, + {"Warning: HDIO_GETGEO says that there are %lu heads\n", 794}, + {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 795}, + {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 796}, {"\ Warning: unlikely number of sectors (%lu) - usually at most 63\n\ -This will give problems with all software that uses C/H/S addressing.\n", 793}, +This will give problems with all software that uses C/H/S addressing.\n", 797}, {"\ \n\ -Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 794}, +Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 798}, {"\ -%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 795}, +%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 799}, {"\ %s of partition %s has impossible value for sector: %lu (should be in 1-%\ -lu)\n", 796}, +lu)\n", 800}, {"\ %s of partition %s has impossible value for cylinders: %lu (should be in 0-%\ -lu)\n", 797}, +lu)\n", 801}, {"\ Id Name\n\ -\n", 798}, - {"Re-reading the partition table ...\n", 799}, +\n", 802}, + {"Re-reading the partition table ...\n", 803}, {"\ The command to re-read the partition table failed\n\ -Reboot your system now, before using mkfs\n", 800}, - {"Error closing %s\n", 801}, - {"%s: no such partition\n", 802}, - {"unrecognized format - using sectors\n", 803}, - {"# partition table of %s\n", 804}, - {"unimplemented format - using %s\n", 805}, +Reboot your system now, before using mkfs\n", 804}, + {"Error closing %s\n", 805}, + {"%s: no such partition\n", 806}, + {"unrecognized format - using sectors\n", 807}, + {"# partition table of %s\n", 808}, + {"unimplemented format - using %s\n", 809}, {"\ Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\ -\n", 806}, - {" Device Boot Start End #cyls #blocks Id System\n", 807}, +\n", 810}, + {" Device Boot Start End #cyls #blocks Id System\n", 811}, {"\ Units = sectors of 512 bytes, counting from %d\n\ -\n", 808}, - {" Device Boot Start End #sectors Id System\n", 809}, +\n", 812}, + {" Device Boot Start End #sectors Id System\n", 813}, {"\ Units = blocks of 1024 bytes, counting from %d\n\ -\n", 810}, - {" Device Boot Start End #blocks Id System\n", 811}, +\n", 814}, + {" Device Boot Start End #blocks Id System\n", 815}, {"\ Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\ -\n", 812}, - {" Device Boot Start End MB #blocks Id System\n", 813}, - {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 814}, - {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 815}, - {"partition ends on cylinder %ld, beyond the end of the disk\n", 816}, - {"No partitions found\n", 817}, - {"\ -Warning: The first partition looks like it was made\n\ +\n", 816}, + {" Device Boot Start End MB #blocks Id System\n", 817}, + {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 818}, + {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 819}, + {"partition ends on cylinder %ld, beyond the end of the disk\n", 820}, + {"No partitions found\n", 821}, + {"\ +Warning: The partition table looks like it was made\n\ for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n\ -For this listing I'll assume that geometry.\n", 818}, - {"no partition table present.\n", 819}, - {"strange, only %d partitions defined.\n", 820}, - {"Warning: partition %s has size 0 but is not marked Empty\n", 821}, - {"Warning: partition %s has size 0 and is bootable\n", 822}, - {"Warning: partition %s has size 0 and nonzero start\n", 823}, - {"Warning: partition %s ", 824}, - {"is not contained in partition %s\n", 825}, - {"Warning: partitions %s ", 826}, - {"and %s overlap\n", 827}, +For this listing I'll assume that geometry.\n", 822}, + {"no partition table present.\n", 823}, + {"strange, only %d partitions defined.\n", 824}, + {"Warning: partition %s has size 0 but is not marked Empty\n", 825}, + {"Warning: partition %s has size 0 and is bootable\n", 826}, + {"Warning: partition %s has size 0 and nonzero start\n", 827}, + {"Warning: partition %s ", 828}, + {"is not contained in partition %s\n", 829}, + {"Warning: partitions %s ", 830}, + {"and %s overlap\n", 831}, {"\ Warning: partition %s contains part of the partition table (sector %lu),\n\ -and will destroy it when filled\n", 828}, - {"Warning: partition %s starts at sector 0\n", 829}, - {"Warning: partition %s extends past end of disk\n", 830}, +and will destroy it when filled\n", 832}, + {"Warning: partition %s starts at sector 0\n", 833}, + {"Warning: partition %s extends past end of disk\n", 834}, {"\ Among the primary partitions, at most one can be extended\n\ - (although this is not a problem under Linux)\n", 831}, - {"Warning: partition %s does not start at a cylinder boundary\n", 832}, - {"Warning: partition %s does not end at a cylinder boundary\n", 833}, + (although this is not a problem under Linux)\n", 835}, + {"Warning: partition %s does not start at a cylinder boundary\n", 836}, + {"Warning: partition %s does not end at a cylinder boundary\n", 837}, {"\ Warning: more than one primary partition is marked bootable (active)\n\ -This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 834}, +This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 838}, {"\ Warning: usually one can boot from primary partitions only\n\ -LILO disregards the `bootable' flag.\n", 835}, +LILO disregards the `bootable' flag.\n", 839}, {"\ Warning: no primary partition is marked bootable (active)\n\ -This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 836}, +This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 840}, {"\ -partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 837}, - {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 838}, - {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 839}, +partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 841}, + {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 842}, + {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 843}, {"\ Warning: shifted start of the extd partition from %ld to %ld\n\ -(For listing purposes only. Do not change its contents.)\n", 840}, +(For listing purposes only. Do not change its contents.)\n", 844}, {"\ Warning: extended partition does not start at a cylinder boundary.\n\ -DOS and Linux will interpret the contents differently.\n", 841}, - {"too many partitions - ignoring those past nr (%d)\n", 842}, - {"tree of partitions?\n", 843}, - {"detected Disk Manager - unable to handle that\n", 844}, - {"DM6 signature found - giving up\n", 845}, - {"strange..., an extended partition of size 0?\n", 846}, - {"strange..., a BSD partition of size 0?\n", 847}, - {" %s: unrecognized partition\n", 848}, - {"-n flag was given: Nothing changed\n", 849}, - {"Failed saving the old sectors - aborting\n", 850}, - {"Failed writing the partition on %s\n", 851}, - {"long or incomplete input line - quitting\n", 852}, - {"input error: `=' expected after %s field\n", 853}, - {"input error: unexpected character %c after %s field\n", 854}, - {"unrecognized input: %s\n", 855}, - {"number too big\n", 856}, - {"trailing junk after number\n", 857}, - {"no room for partition descriptor\n", 858}, - {"cannot build surrounding extended partition\n", 859}, - {"too many input fields\n", 860}, - {"No room for more\n", 861}, - {"Illegal type\n", 862}, - {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 863}, - {"Warning: empty partition\n", 864}, - {"Warning: bad partition start (earliest %lu)\n", 865}, - {"unrecognized bootable flag - choose - or *\n", 866}, - {"partial c,h,s specification?\n", 867}, - {"Extended partition not where expected\n", 868}, - {"bad input\n", 869}, - {"too many partitions\n", 870}, +DOS and Linux will interpret the contents differently.\n", 845}, + {"too many partitions - ignoring those past nr (%d)\n", 846}, + {"tree of partitions?\n", 847}, + {"detected Disk Manager - unable to handle that\n", 848}, + {"DM6 signature found - giving up\n", 849}, + {"strange..., an extended partition of size 0?\n", 850}, + {"strange..., a BSD partition of size 0?\n", 851}, + {" %s: unrecognized partition\n", 852}, + {"-n flag was given: Nothing changed\n", 853}, + {"Failed saving the old sectors - aborting\n", 854}, + {"Failed writing the partition on %s\n", 855}, + {"long or incomplete input line - quitting\n", 856}, + {"input error: `=' expected after %s field\n", 857}, + {"input error: unexpected character %c after %s field\n", 858}, + {"unrecognized input: %s\n", 859}, + {"number too big\n", 860}, + {"trailing junk after number\n", 861}, + {"no room for partition descriptor\n", 862}, + {"cannot build surrounding extended partition\n", 863}, + {"too many input fields\n", 864}, + {"No room for more\n", 865}, + {"Illegal type\n", 866}, + {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 867}, + {"Warning: empty partition\n", 868}, + {"Warning: bad partition start (earliest %lu)\n", 869}, + {"unrecognized bootable flag - choose - or *\n", 870}, + {"partial c,h,s specification?\n", 871}, + {"Extended partition not where expected\n", 872}, + {"bad input\n", 873}, + {"too many partitions\n", 874}, {"\ Input in the following format; absent fields get a default value.\n\ \n\ -Usually you only need to specify and (and perhaps ).\n", 871}, - {"version", 872}, - {"Usage: %s [options] device ...\n", 873}, - {"device: something like /dev/hda or /dev/sda", 874}, - {"useful options:", 875}, - {" -s [or --show-size]: list size of a partition", 876}, - {" -c [or --id]: print or change partition Id", 877}, - {" -l [or --list]: list partitions of each device", 878}, - {" -d [or --dump]: idem, but in a format suitable for later input", 879}, - {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 880}, +Usually you only need to specify and (and perhaps ).\n", 875}, + {"version", 876}, + {"Usage: %s [options] device ...\n", 877}, + {"device: something like /dev/hda or /dev/sda", 878}, + {"useful options:", 879}, + {" -s [or --show-size]: list size of a partition", 880}, + {" -c [or --id]: print or change partition Id", 881}, + {" -l [or --list]: list partitions of each device", 882}, + {" -d [or --dump]: idem, but in a format suitable for later input", 883}, + {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 884}, {"\ -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/\ -MB", 881}, - {" -T [or --list-types]:list the known partition types", 882}, - {" -D [or --DOS]: for DOS-compatibility: waste a little space", 883}, - {" -R [or --re-read]: make kernel reread partition table", 884}, - {" -N# : change only the partition with number #", 885}, - {" -n : do not actually write to disk", 886}, - {"\ - -O file : save the sectors that will be overwritten to file", 887}, - {" -I file : restore these sectors again", 888}, - {" -v [or --version]: print version", 889}, - {" -? [or --help]: print this message", 890}, - {"dangerous options:", 891}, - {" -g [or --show-geometry]: print the kernel's idea of the geometry", 892}, +MB", 885}, + {" -T [or --list-types]:list the known partition types", 886}, + {" -D [or --DOS]: for DOS-compatibility: waste a little space", 887}, + {" -R [or --re-read]: make kernel reread partition table", 888}, + {" -N# : change only the partition with number #", 889}, + {" -n : do not actually write to disk", 890}, + {"\ + -O file : save the sectors that will be overwritten to file", 891}, + {" -I file : restore these sectors again", 892}, + {" -v [or --version]: print version", 893}, + {" -? [or --help]: print this message", 894}, + {"dangerous options:", 895}, + {" -g [or --show-geometry]: print the kernel's idea of the geometry", 896}, {"\ -x [or --show-extended]: also list extended partitions on output\n\ - or expect descriptors for them on input", 893}, - {"\ - -L [or --Linux]: do not complain about things irrelevant for Linux", 894}, - {" -q [or --quiet]: suppress warning messages", 895}, - {" You can override the detected geometry using:", 896}, - {" -C# [or --cylinders #]:set the number of cylinders to use", 897}, - {" -H# [or --heads #]: set the number of heads to use", 898}, - {" -S# [or --sectors #]: set the number of sectors to use", 899}, - {"You can disable all consistency checking with:", 900}, - {" -f [or --force]: do what I say, even if it is stupid", 901}, - {"Usage:", 902}, - {"%s device\t\t list active partitions on device\n", 903}, - {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 904}, - {"%s -An device\t activate partition n, inactivate the other ones\n", 905}, - {"no command?\n", 906}, - {"total: %d blocks\n", 907}, - {"usage: sfdisk --print-id device partition-number\n", 908}, - {"usage: sfdisk --change-id device partition-number Id\n", 909}, - {"usage: sfdisk --id device partition-number [Id]\n", 910}, - {"can specify only one device (except with -l or -s)\n", 911}, - {"cannot open %s read-write\n", 912}, - {"cannot open %s for reading\n", 913}, - {"%s: OK\n", 914}, - {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 915}, - {"BLKGETSIZE ioctl failed for %s\n", 916}, - {"bad active byte: 0x%x instead of 0x80\n", 917}, + or expect descriptors for them on input", 897}, + {"\ + -L [or --Linux]: do not complain about things irrelevant for Linux", 898}, + {" -q [or --quiet]: suppress warning messages", 899}, + {" You can override the detected geometry using:", 900}, + {" -C# [or --cylinders #]:set the number of cylinders to use", 901}, + {" -H# [or --heads #]: set the number of heads to use", 902}, + {" -S# [or --sectors #]: set the number of sectors to use", 903}, + {"You can disable all consistency checking with:", 904}, + {" -f [or --force]: do what I say, even if it is stupid", 905}, + {"Usage:", 906}, + {"%s device\t\t list active partitions on device\n", 907}, + {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 908}, + {"%s -An device\t activate partition n, inactivate the other ones\n", 909}, + {"no command?\n", 910}, + {"total: %d blocks\n", 911}, + {"usage: sfdisk --print-id device partition-number\n", 912}, + {"usage: sfdisk --change-id device partition-number Id\n", 913}, + {"usage: sfdisk --id device partition-number [Id]\n", 914}, + {"can specify only one device (except with -l or -s)\n", 915}, + {"cannot open %s read-write\n", 916}, + {"cannot open %s for reading\n", 917}, + {"%s: OK\n", 918}, + {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 919}, + {"BLKGETSIZE ioctl failed for %s\n", 920}, + {"bad active byte: 0x%x instead of 0x80\n", 921}, {"\ Done\n\ -\n", 918}, +\n", 922}, {"\ You have %d active primary partitions. This does not matter for LILO,\n\ -but the DOS MBR will only boot a disk with 1 active partition.\n", 919}, - {"partition %s has id %x and is not hidden\n", 920}, - {"Bad Id %lx\n", 921}, - {"This disk is currently in use.\n", 922}, - {"Fatal error: cannot find %s\n", 923}, - {"Warning: %s is not a block device\n", 924}, - {"Checking that no-one is using this disk right now ...\n", 925}, +but the DOS MBR will only boot a disk with 1 active partition.\n", 923}, + {"partition %s has id %x and is not hidden\n", 924}, + {"Bad Id %lx\n", 925}, + {"This disk is currently in use.\n", 926}, + {"Fatal error: cannot find %s\n", 927}, + {"Warning: %s is not a block device\n", 928}, + {"Checking that no-one is using this disk right now ...\n", 929}, {"\ \n\ This disk is currently in use - repartitioning is probably a bad idea.\n\ Umount all file systems, and swapoff all swap partitions on this disk.\n\ -Use the --no-reread flag to suppress this check.\n", 926}, - {"Use the --force flag to overrule all checks.\n", 927}, - {"OK\n", 928}, - {"Old situation:\n", 929}, - {"Partition %d does not exist, cannot change it\n", 930}, - {"New situation:\n", 931}, +Use the --no-reread flag to suppress this check.\n", 930}, + {"Use the --force flag to overrule all checks.\n", 931}, + {"OK\n", 932}, + {"Old situation:\n", 933}, + {"Partition %d does not exist, cannot change it\n", 934}, + {"New situation:\n", 935}, {"\ I don't like these partitions - nothing changed.\n\ -(If you really want this, use the --force option.)\n", 932}, - {"I don't like this - probably you should answer No\n", 933}, - {"Are you satisfied with this? [ynq] ", 934}, - {"Do you want to write this to disk? [ynq] ", 935}, +(If you really want this, use the --force option.)\n", 936}, + {"I don't like this - probably you should answer No\n", 937}, + {"Are you satisfied with this? [ynq] ", 938}, + {"Do you want to write this to disk? [ynq] ", 939}, {"\ \n\ -sfdisk: premature end of input\n", 936}, - {"Quitting - nothing changed\n", 937}, - {"Please answer one of y,n,q\n", 938}, +sfdisk: premature end of input\n", 940}, + {"Quitting - nothing changed\n", 941}, + {"Please answer one of y,n,q\n", 942}, {"\ Successfully wrote the new partition table\n\ -\n", 939}, +\n", 943}, {"\ If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n\ to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n\ -(See fdisk(8).)\n", 940}, - {"Try `getopt --help' for more information.\n", 941}, - {"empty long option after -l or --long argument", 942}, - {"unknown shell after -s or --shell argument", 943}, - {"Usage: getopt optstring parameters\n", 944}, - {" getopt [options] [--] optstring parameters\n", 945}, - {" getopt [options] -o|--options optstring [options] [--]\n", 946}, - {" parameters\n", 947}, - {"\ - -a, --alternative Allow long options starting with single -\n", 948}, - {" -h, --help This small usage guide\n", 949}, - {" -l, --longoptions=longopts Long options to be recognized\n", 950}, - {"\ - -n, --name=progname The name under which errors are reported\n", 951}, - {" -o, --options=optstring Short options to be recognized\n", 952}, - {" -q, --quiet Disable error reporting by getopt(3)\n", 953}, - {" -Q, --quiet-output No normal output\n", 954}, - {" -s, --shell=shell Set shell quoting conventions\n", 955}, - {" -T, --test Test for getopt(1) version\n", 956}, - {" -u, --unqote Do not quote the output\n", 957}, - {" -V, --version Output version information\n", 958}, - {"missing optstring argument", 959}, - {"getopt (enhanced) 1.1.2\n", 960}, - {"internal error, contact the author.", 961}, - {"booted from MILO\n", 962}, - {"Ruffian BCD clock\n", 963}, - {"clockport adjusted to 0x%x\n", 964}, - {"funky TOY!\n", 965}, - {"%s: atomic %s failed for 1000 iterations!", 966}, - {"Cannot open /dev/port: %s", 967}, - {"I failed to get permission because I didn't try.\n", 968}, - {"%s is unable to get I/O port access: the iopl(3) call failed.\n", 969}, - {"Probably you need root privileges.\n", 970}, - {"Assuming hardware clock is kept in %s time.\n", 971}, - {"UTC", 972}, - {"local", 973}, - {"%s: Warning: unrecognized third line in adjtime file\n", 974}, - {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 975}, - {"Last drift adjustment done at %ld seconds after 1969\n", 976}, - {"Last calibration done at %ld seconds after 1969\n", 977}, - {"Hardware clock is on %s time\n", 978}, - {"unknown", 979}, - {"Waiting for clock tick...\n", 980}, - {"...got clock tick\n", 981}, - {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 982}, - {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 983}, - {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 984}, - {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 985}, - {"Clock not changed - testing only.\n", 986}, +(See fdisk(8).)\n", 944}, + {"Try `getopt --help' for more information.\n", 945}, + {"empty long option after -l or --long argument", 946}, + {"unknown shell after -s or --shell argument", 947}, + {"Usage: getopt optstring parameters\n", 948}, + {" getopt [options] [--] optstring parameters\n", 949}, + {" getopt [options] -o|--options optstring [options] [--]\n", 950}, + {" parameters\n", 951}, + {"\ + -a, --alternative Allow long options starting with single -\n", 952}, + {" -h, --help This small usage guide\n", 953}, + {" -l, --longoptions=longopts Long options to be recognized\n", 954}, + {"\ + -n, --name=progname The name under which errors are reported\n", 955}, + {" -o, --options=optstring Short options to be recognized\n", 956}, + {" -q, --quiet Disable error reporting by getopt(3)\n", 957}, + {" -Q, --quiet-output No normal output\n", 958}, + {" -s, --shell=shell Set shell quoting conventions\n", 959}, + {" -T, --test Test for getopt(1) version\n", 960}, + {" -u, --unqote Do not quote the output\n", 961}, + {" -V, --version Output version information\n", 962}, + {"missing optstring argument", 963}, + {"getopt (enhanced) 1.1.2\n", 964}, + {"internal error, contact the author.", 965}, + {"booted from MILO\n", 966}, + {"Ruffian BCD clock\n", 967}, + {"clockport adjusted to 0x%x\n", 968}, + {"funky TOY!\n", 969}, + {"%s: atomic %s failed for 1000 iterations!", 970}, + {"Cannot open /dev/port: %s", 971}, + {"I failed to get permission because I didn't try.\n", 972}, + {"%s is unable to get I/O port access: the iopl(3) call failed.\n", 973}, + {"Probably you need root privileges.\n", 974}, + {"Assuming hardware clock is kept in %s time.\n", 975}, + {"UTC", 976}, + {"local", 977}, + {"%s: Warning: unrecognized third line in adjtime file\n", 978}, + {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 979}, + {"Last drift adjustment done at %ld seconds after 1969\n", 980}, + {"Last calibration done at %ld seconds after 1969\n", 981}, + {"Hardware clock is on %s time\n", 982}, + {"unknown", 983}, + {"Waiting for clock tick...\n", 984}, + {"...got clock tick\n", 985}, + {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 986}, + {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 987}, + {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 988}, + {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 989}, + {"Clock not changed - testing only.\n", 990}, {"\ Time elapsed since reference time has been %.6f seconds.\n\ -Delaying further to reach the next full second.\n", 987}, +Delaying further to reach the next full second.\n", 991}, {"\ The Hardware Clock registers contain values that are either invalid (e.g. \ -50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 988}, - {"%s %.6f seconds\n", 989}, - {"No --date option specified.\n", 990}, - {"--date argument too long\n", 991}, +50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 992}, + {"%s %.6f seconds\n", 993}, + {"No --date option specified.\n", 994}, + {"--date argument too long\n", 995}, {"\ The value of the --date option is not a valid date.\n\ -In particular, it contains quotation marks.\n", 992}, - {"Issuing date command: %s\n", 993}, - {"Unable to run 'date' program in /bin/sh shell. popen() failed", 994}, - {"response from date command = %s\n", 995}, +In particular, it contains quotation marks.\n", 996}, + {"Issuing date command: %s\n", 997}, + {"Unable to run 'date' program in /bin/sh shell. popen() failed", 998}, + {"response from date command = %s\n", 999}, {"\ The date command issued by %s returned unexpected results.\n\ The command was:\n\ %s\n\ The response was:\n\ - %s\n", 996}, + %s\n", 1000}, {"\ The date command issued by %s returned something other than an integer where \ the converted time value was expected.\n\ The command was:\n\ %s\n\ The response was:\n\ - %s\n", 997}, - {"date string %s equates to %ld seconds since 1969.\n", 998}, + %s\n", 1001}, + {"date string %s equates to %ld seconds since 1969.\n", 1002}, {"\ The Hardware Clock does not contain a valid time, so we cannot set the \ -System Time from it.\n", 999}, - {"Calling settimeofday:\n", 1000}, - {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1001}, - {"\ttz.tz_minuteswest = %d\n", 1002}, - {"Not setting system clock because running in test mode.\n", 1003}, - {"Must be superuser to set system clock.\n", 1004}, - {"settimeofday() failed", 1005}, +System Time from it.\n", 1003}, + {"Calling settimeofday:\n", 1004}, + {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1005}, + {"\ttz.tz_minuteswest = %d\n", 1006}, + {"Not setting system clock because running in test mode.\n", 1007}, + {"Must be superuser to set system clock.\n", 1008}, + {"settimeofday() failed", 1009}, {"\ Not adjusting drift factor because the Hardware Clock previously contained \ -garbage.\n", 1006}, +garbage.\n", 1010}, {"\ Not adjusting drift factor because it has been less than a day since the \ -last calibration.\n", 1007}, +last calibration.\n", 1011}, {"\ Clock drifted %d seconds in the past %d seconds in spite of a drift factor \ of %f seconds/day.\n\ -Adjusting drift factor by %f seconds/day\n", 1008}, - {"Time since last adjustment is %d seconds\n", 1009}, - {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1010}, - {"Not updating adjtime file because of testing mode.\n", 1011}, +Adjusting drift factor by %f seconds/day\n", 1012}, + {"Time since last adjustment is %d seconds\n", 1013}, + {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1014}, + {"Not updating adjtime file because of testing mode.\n", 1015}, {"\ Would have written the following to %s:\n\ -%s", 1012}, - {"Drift adjustment parameters not updated.\n", 1013}, +%s", 1016}, + {"Drift adjustment parameters not updated.\n", 1017}, {"\ -The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1014}, - {"Needed adjustment is less than one second, so not setting clock.\n", 1015}, - {"Using %s.\n", 1016}, - {"No usable clock interface found.\n", 1017}, - {"Unable to set system clock.\n", 1018}, +The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1018}, + {"Needed adjustment is less than one second, so not setting clock.\n", 1019}, + {"Using %s.\n", 1020}, + {"No usable clock interface found.\n", 1021}, + {"Unable to set system clock.\n", 1022}, {"\ The kernel keeps an epoch value for the Hardware Clock only on an Alpha \ machine.\n\ This copy of hwclock was built for a machine other than Alpha\n\ -(and thus is presumably not running on an Alpha now). No action taken.\n", 1019}, - {"Unable to get the epoch value from the kernel.\n", 1020}, - {"Kernel is assuming an epoch value of %lu\n", 1021}, +(and thus is presumably not running on an Alpha now). No action taken.\n", 1023}, + {"Unable to get the epoch value from the kernel.\n", 1024}, + {"Kernel is assuming an epoch value of %lu\n", 1025}, {"\ To set the epoch value, you must use the 'epoch' option to tell to what \ -value to set it.\n", 1022}, - {"Not setting the epoch to %d - testing only.\n", 1023}, - {"Unable to set the epoch value in the kernel.\n", 1024}, +value to set it.\n", 1026}, + {"Not setting the epoch to %d - testing only.\n", 1027}, + {"Unable to set the epoch value in the kernel.\n", 1028}, {"\ hwclock - query and set the hardware clock (RTC)\n\ \n\ @@ -1404,557 +1408,557 @@ Options: \n\ --epoch=year specifies the year which is the beginning of the \n\ hardware clock's epoch value\n\ --noadjfile do not access /etc/adjtime. Requires the use of\n\ - either --utc or --localtime\n", 1025}, + either --utc or --localtime\n", 1029}, {"\ --jensen, --arc, --srm, --funky-toy\n\ - tell hwclock the type of alpha you have (see hwclock(8))\n", 1026}, - {"%s takes no non-option arguments. You supplied %d.\n", 1027}, + tell hwclock the type of alpha you have (see hwclock(8))\n", 1030}, + {"%s takes no non-option arguments. You supplied %d.\n", 1031}, {"\ You have specified multiple function options.\n\ -You can only perform one function at a time.\n", 1028}, +You can only perform one function at a time.\n", 1032}, {"\ %s: The --utc and --localtime options are mutually exclusive. You specified \ -both.\n", 1029}, +both.\n", 1033}, {"\ %s: The --adjust and --noadjfile options are mutually exclusive. You \ -specified both.\n", 1030}, - {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1031}, - {"No usable set-to time. Cannot set clock.\n", 1032}, - {"Sorry, only the superuser can change the Hardware Clock.\n", 1033}, - {"Sorry, only the superuser can change the System Clock.\n", 1034}, +specified both.\n", 1034}, + {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1035}, + {"No usable set-to time. Cannot set clock.\n", 1036}, + {"Sorry, only the superuser can change the Hardware Clock.\n", 1037}, + {"Sorry, only the superuser can change the System Clock.\n", 1038}, {"\ Sorry, only the superuser can change the Hardware Clock epoch in the \ -kernel.\n", 1035}, - {"Cannot access the Hardware Clock via any known method.\n", 1036}, +kernel.\n", 1039}, + {"Cannot access the Hardware Clock via any known method.\n", 1040}, {"\ Use the --debug option to see the details of our search for an access \ -method.\n", 1037}, - {"Waiting in loop for time from KDGHWCLK to change\n", 1038}, - {"KDGHWCLK ioctl to read time failed", 1039}, - {"Timed out waiting for time change.\n", 1040}, - {"KDGHWCLK ioctl to read time failed in loop", 1041}, - {"ioctl() failed to read time from %s", 1042}, - {"ioctl KDSHWCLK failed", 1043}, - {"Can't open /dev/tty1 or /dev/vc/1", 1044}, - {"KDGHWCLK ioctl failed", 1045}, - {"ioctl() to %s to read the time failed.\n", 1046}, - {"Waiting in loop for time from %s to change\n", 1047}, - {"open() of %s failed", 1048}, - {"%s does not have interrupt functions. ", 1049}, - {"read() to %s to wait for clock tick failed", 1050}, - {"ioctl() to %s to turn off update interrupts failed", 1051}, - {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1052}, - {"Unable to open %s", 1053}, - {"ioctl() to %s to set the time failed.\n", 1054}, - {"ioctl(%s) was successful.\n", 1055}, - {"Open of %s failed", 1056}, +method.\n", 1041}, + {"Waiting in loop for time from KDGHWCLK to change\n", 1042}, + {"KDGHWCLK ioctl to read time failed", 1043}, + {"Timed out waiting for time change.\n", 1044}, + {"KDGHWCLK ioctl to read time failed in loop", 1045}, + {"ioctl() failed to read time from %s", 1046}, + {"ioctl KDSHWCLK failed", 1047}, + {"Can't open /dev/tty1 or /dev/vc/1", 1048}, + {"KDGHWCLK ioctl failed", 1049}, + {"ioctl() to %s to read the time failed.\n", 1050}, + {"Waiting in loop for time from %s to change\n", 1051}, + {"open() of %s failed", 1052}, + {"%s does not have interrupt functions. ", 1053}, + {"read() to %s to wait for clock tick failed", 1054}, + {"ioctl() to %s to turn off update interrupts failed", 1055}, + {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1056}, + {"Unable to open %s", 1057}, + {"ioctl() to %s to set the time failed.\n", 1058}, + {"ioctl(%s) was successful.\n", 1059}, + {"Open of %s failed", 1060}, {"\ To manipulate the epoch value in the kernel, we must access the Linux 'rtc' \ device driver via the device special file %s. This file does not exist on \ -this system.\n", 1057}, - {"ioctl(RTC_EPOCH_READ) to %s failed", 1058}, - {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1059}, - {"The epoch value may not be less than 1900. You requested %ld\n", 1060}, - {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1061}, - {"\ -The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1062}, - {"ioctl(RTC_EPOCH_SET) to %s failed", 1063}, - {"invalid number `%s'\n", 1064}, - {"number `%s' to `%s' out of range\n", 1065}, - {"unrecognized option `%s'\n", 1066}, - {"option `%s' requires an argument\n", 1067}, - {"option `%s' doesn't allow an argument\n", 1068}, - {"unrecognized option `-%c'\n", 1069}, - {"calling open_tty\n", 1070}, - {"calling termio_init\n", 1071}, - {"writing init string\n", 1072}, - {"before autobaud\n", 1073}, - {"waiting for cr-lf\n", 1074}, - {"read %c\n", 1075}, - {"reading login name\n", 1076}, - {"%s: can't exec %s: %m", 1077}, - {"can't malloc initstring", 1078}, - {"bad timeout value: %s", 1079}, - {"after getopt loop\n", 1080}, - {"exiting parseargs\n", 1081}, - {"entered parse_speeds\n", 1082}, - {"bad speed: %s", 1083}, - {"too many alternate speeds", 1084}, - {"exiting parsespeeds\n", 1085}, - {"/dev: chdir() failed: %m", 1086}, - {"/dev/%s: not a character device", 1087}, - {"open(2)\n", 1088}, - {"/dev/%s: cannot open as standard input: %m", 1089}, - {"%s: not open for read/write", 1090}, - {"duping\n", 1091}, - {"%s: dup problem: %m", 1092}, - {"term_io 2\n", 1093}, - {"user", 1094}, - {"users", 1095}, - {"%s: read: %m", 1096}, - {"%s: input overrun", 1097}, +this system.\n", 1061}, + {"ioctl(RTC_EPOCH_READ) to %s failed", 1062}, + {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1063}, + {"The epoch value may not be less than 1900. You requested %ld\n", 1064}, + {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1065}, + {"\ +The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1066}, + {"ioctl(RTC_EPOCH_SET) to %s failed", 1067}, + {"invalid number `%s'\n", 1068}, + {"number `%s' to `%s' out of range\n", 1069}, + {"unrecognized option `%s'\n", 1070}, + {"option `%s' requires an argument\n", 1071}, + {"option `%s' doesn't allow an argument\n", 1072}, + {"unrecognized option `-%c'\n", 1073}, + {"calling open_tty\n", 1074}, + {"calling termio_init\n", 1075}, + {"writing init string\n", 1076}, + {"before autobaud\n", 1077}, + {"waiting for cr-lf\n", 1078}, + {"read %c\n", 1079}, + {"reading login name\n", 1080}, + {"%s: can't exec %s: %m", 1081}, + {"can't malloc initstring", 1082}, + {"bad timeout value: %s", 1083}, + {"after getopt loop\n", 1084}, + {"exiting parseargs\n", 1085}, + {"entered parse_speeds\n", 1086}, + {"bad speed: %s", 1087}, + {"too many alternate speeds", 1088}, + {"exiting parsespeeds\n", 1089}, + {"/dev: chdir() failed: %m", 1090}, + {"/dev/%s: not a character device", 1091}, + {"open(2)\n", 1092}, + {"/dev/%s: cannot open as standard input: %m", 1093}, + {"%s: not open for read/write", 1094}, + {"duping\n", 1095}, + {"%s: dup problem: %m", 1096}, + {"term_io 2\n", 1097}, + {"user", 1098}, + {"users", 1099}, + {"%s: read: %m", 1100}, + {"%s: input overrun", 1101}, {"\ Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H \ login_host] baud_rate,... line [termtype]\n\ or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] \ -line baud_rate,... [termtype]\n", 1098}, - {"login: memory low, login may fail\n", 1099}, - {"can't malloc for ttyclass", 1100}, - {"can't malloc for grplist", 1101}, - {"Login on %s from %s denied by default.\n", 1102}, - {"Login on %s from %s denied.\n", 1103}, - {"%s: you (user %d) don't exist.\n", 1104}, - {"%s: user \"%s\" does not exist.\n", 1105}, - {"%s: can only change local entries; use yp%s instead.\n", 1106}, - {"Changing finger information for %s.\n", 1107}, - {"Password error.", 1108}, - {"Password: ", 1109}, - {"Incorrect password.", 1110}, - {"Finger information not changed.\n", 1111}, - {"Usage: %s [ -f full-name ] [ -o office ] ", 1112}, +line baud_rate,... [termtype]\n", 1102}, + {"login: memory low, login may fail\n", 1103}, + {"can't malloc for ttyclass", 1104}, + {"can't malloc for grplist", 1105}, + {"Login on %s from %s denied by default.\n", 1106}, + {"Login on %s from %s denied.\n", 1107}, + {"%s: you (user %d) don't exist.\n", 1108}, + {"%s: user \"%s\" does not exist.\n", 1109}, + {"%s: can only change local entries; use yp%s instead.\n", 1110}, + {"Changing finger information for %s.\n", 1111}, + {"Password error.", 1112}, + {"Password: ", 1113}, + {"Incorrect password.", 1114}, + {"Finger information not changed.\n", 1115}, + {"Usage: %s [ -f full-name ] [ -o office ] ", 1116}, {"\ [ -p office-phone ]\n\ -\t[ -h home-phone ] ", 1113}, - {"[ --help ] [ --version ]\n", 1114}, +\t[ -h home-phone ] ", 1117}, + {"[ --help ] [ --version ]\n", 1118}, {"\ \n\ -Aborted.\n", 1115}, - {"field is too long.\n", 1116}, - {"'%c' is not allowed.\n", 1117}, - {"Control characters are not allowed.\n", 1118}, - {"Finger information *NOT* changed. Try again later.\n", 1119}, - {"Finger information changed.\n", 1120}, - {"malloc failed", 1121}, - {"%s: Your shell is not in /etc/shells, shell change denied\n", 1122}, - {"Changing shell for %s.\n", 1123}, - {"New shell", 1124}, - {"Shell not changed.\n", 1125}, - {"Shell *NOT* changed. Try again later.\n", 1126}, - {"Shell changed.\n", 1127}, +Aborted.\n", 1119}, + {"field is too long.\n", 1120}, + {"'%c' is not allowed.\n", 1121}, + {"Control characters are not allowed.\n", 1122}, + {"Finger information *NOT* changed. Try again later.\n", 1123}, + {"Finger information changed.\n", 1124}, + {"malloc failed", 1125}, + {"%s: Your shell is not in /etc/shells, shell change denied\n", 1126}, + {"Changing shell for %s.\n", 1127}, + {"New shell", 1128}, + {"Shell not changed.\n", 1129}, + {"Shell *NOT* changed. Try again later.\n", 1130}, + {"Shell changed.\n", 1131}, {"\ Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n\ - [ username ]\n", 1128}, - {"%s: shell must be a full path name.\n", 1129}, - {"%s: \"%s\" does not exist.\n", 1130}, - {"%s: \"%s\" is not executable.\n", 1131}, - {"%s: '%c' is not allowed.\n", 1132}, - {"%s: Control characters are not allowed.\n", 1133}, - {"Warning: \"%s\" is not listed in /etc/shells\n", 1134}, - {"%s: \"%s\" is not listed in /etc/shells.\n", 1135}, - {"%s: use -l option to see list\n", 1136}, - {"Warning: \"%s\" is not listed in /etc/shells.\n", 1137}, - {"Use %s -l to see list.\n", 1138}, - {"No known shells.\n", 1139}, - {"couldn't open /dev/urandom", 1140}, - {"couldn't read random data from /dev/urandom", 1141}, - {"can't open %s for reading", 1142}, - {"can't stat(%s)", 1143}, - {"%s doesn't have the correct filemodes", 1144}, - {"can't read data from %s", 1145}, - {"Can't read %s, exiting.", 1146}, - {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1147}, - {" still logged in", 1148}, + [ username ]\n", 1132}, + {"%s: shell must be a full path name.\n", 1133}, + {"%s: \"%s\" does not exist.\n", 1134}, + {"%s: \"%s\" is not executable.\n", 1135}, + {"%s: '%c' is not allowed.\n", 1136}, + {"%s: Control characters are not allowed.\n", 1137}, + {"Warning: \"%s\" is not listed in /etc/shells\n", 1138}, + {"%s: \"%s\" is not listed in /etc/shells.\n", 1139}, + {"%s: use -l option to see list\n", 1140}, + {"Warning: \"%s\" is not listed in /etc/shells.\n", 1141}, + {"Use %s -l to see list.\n", 1142}, + {"No known shells.\n", 1143}, + {"couldn't open /dev/urandom", 1144}, + {"couldn't read random data from /dev/urandom", 1145}, + {"can't open %s for reading", 1146}, + {"can't stat(%s)", 1147}, + {"%s doesn't have the correct filemodes", 1148}, + {"can't read data from %s", 1149}, + {"Can't read %s, exiting.", 1150}, + {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1151}, + {" still logged in", 1152}, {"\ \n\ -wtmp begins %s", 1149}, - {"last: malloc failure.\n", 1150}, - {"last: gethostname", 1151}, +wtmp begins %s", 1153}, + {"last: malloc failure.\n", 1154}, + {"last: gethostname", 1155}, {"\ \n\ -interrupted %10.10s %5.5s \n", 1152}, - {"login: -h for super-user only.\n", 1153}, - {"usage: login [-fp] [username]\n", 1154}, - {"login: PAM Failure, aborting: %s\n", 1155}, - {"Couldn't initialize PAM: %s", 1156}, - {"login: ", 1157}, - {"FAILED LOGIN %d FROM %s FOR %s, %s", 1158}, +interrupted %10.10s %5.5s \n", 1156}, + {"login: -h for super-user only.\n", 1157}, + {"usage: login [-fp] [username]\n", 1158}, + {"login: PAM Failure, aborting: %s\n", 1159}, + {"Couldn't initialize PAM: %s", 1160}, + {"login: ", 1161}, + {"FAILED LOGIN %d FROM %s FOR %s, %s", 1162}, {"\ Login incorrect\n\ -\n", 1159}, - {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1160}, - {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1161}, +\n", 1163}, + {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1164}, + {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1165}, {"\ \n\ -Login incorrect\n", 1162}, +Login incorrect\n", 1166}, {"\ \n\ -Session setup problem, abort.\n", 1163}, - {"NULL user name in %s:%d. Abort.", 1164}, - {"Invalid user name \"%s\" in %s:%d. Abort.", 1165}, - {"login: Out of memory\n", 1166}, - {"Illegal username", 1167}, - {"%s login refused on this terminal.\n", 1168}, - {"LOGIN %s REFUSED FROM %s ON TTY %s", 1169}, - {"LOGIN %s REFUSED ON TTY %s", 1170}, - {"Login incorrect\n", 1171}, +Session setup problem, abort.\n", 1167}, + {"NULL user name in %s:%d. Abort.", 1168}, + {"Invalid user name \"%s\" in %s:%d. Abort.", 1169}, + {"login: Out of memory\n", 1170}, + {"Illegal username", 1171}, + {"%s login refused on this terminal.\n", 1172}, + {"LOGIN %s REFUSED FROM %s ON TTY %s", 1173}, + {"LOGIN %s REFUSED ON TTY %s", 1174}, + {"Login incorrect\n", 1175}, {"\ Too many users logged on already.\n\ -Try again later.\n", 1172}, - {"You have too many processes running.\n", 1173}, - {"DIALUP AT %s BY %s", 1174}, - {"ROOT LOGIN ON %s FROM %s", 1175}, - {"ROOT LOGIN ON %s", 1176}, - {"LOGIN ON %s BY %s FROM %s", 1177}, - {"LOGIN ON %s BY %s", 1178}, - {"You have new mail.\n", 1179}, - {"You have mail.\n", 1180}, - {"login: failure forking: %s", 1181}, - {"setuid() failed", 1182}, - {"No directory %s!\n", 1183}, - {"Logging in with home = \"/\".\n", 1184}, - {"login: no memory for shell script.\n", 1185}, - {"login: couldn't exec shell script: %s.\n", 1186}, - {"login: no shell: %s.\n", 1187}, +Try again later.\n", 1176}, + {"You have too many processes running.\n", 1177}, + {"DIALUP AT %s BY %s", 1178}, + {"ROOT LOGIN ON %s FROM %s", 1179}, + {"ROOT LOGIN ON %s", 1180}, + {"LOGIN ON %s BY %s FROM %s", 1181}, + {"LOGIN ON %s BY %s", 1182}, + {"You have new mail.\n", 1183}, + {"You have mail.\n", 1184}, + {"login: failure forking: %s", 1185}, + {"setuid() failed", 1186}, + {"No directory %s!\n", 1187}, + {"Logging in with home = \"/\".\n", 1188}, + {"login: no memory for shell script.\n", 1189}, + {"login: couldn't exec shell script: %s.\n", 1190}, + {"login: no shell: %s.\n", 1191}, {"\ \n\ -%s login: ", 1188}, - {"login name much too long.\n", 1189}, - {"NAME too long", 1190}, - {"login names may not start with '-'.\n", 1191}, - {"too many bare linefeeds.\n", 1192}, - {"EXCESSIVE linefeeds", 1193}, - {"Login timed out after %d seconds\n", 1194}, - {"Last login: %.*s ", 1195}, - {"from %.*s\n", 1196}, - {"on %.*s\n", 1197}, - {"LOGIN FAILURE FROM %s, %s", 1198}, - {"LOGIN FAILURE ON %s, %s", 1199}, - {"%d LOGIN FAILURES FROM %s, %s", 1200}, - {"%d LOGIN FAILURES ON %s, %s", 1201}, - {"is y\n", 1202}, - {"is n\n", 1203}, - {"usage: mesg [y | n]\n", 1204}, - {"newgrp: Who are you?", 1205}, - {"newgrp: setgid", 1206}, - {"newgrp: No such group.", 1207}, - {"newgrp: Permission denied", 1208}, - {"newgrp: setuid", 1209}, - {"No shell", 1210}, - {"The password must have at least 6 characters, try again.\n", 1211}, +%s login: ", 1192}, + {"login name much too long.\n", 1193}, + {"NAME too long", 1194}, + {"login names may not start with '-'.\n", 1195}, + {"too many bare linefeeds.\n", 1196}, + {"EXCESSIVE linefeeds", 1197}, + {"Login timed out after %d seconds\n", 1198}, + {"Last login: %.*s ", 1199}, + {"from %.*s\n", 1200}, + {"on %.*s\n", 1201}, + {"LOGIN FAILURE FROM %s, %s", 1202}, + {"LOGIN FAILURE ON %s, %s", 1203}, + {"%d LOGIN FAILURES FROM %s, %s", 1204}, + {"%d LOGIN FAILURES ON %s, %s", 1205}, + {"is y\n", 1206}, + {"is n\n", 1207}, + {"usage: mesg [y | n]\n", 1208}, + {"newgrp: Who are you?", 1209}, + {"newgrp: setgid", 1210}, + {"newgrp: No such group.", 1211}, + {"newgrp: Permission denied", 1212}, + {"newgrp: setuid", 1213}, + {"No shell", 1214}, + {"The password must have at least 6 characters, try again.\n", 1215}, {"\ The password must contain characters out of two of the following\n\ classes: upper and lower case letters, digits and non alphanumeric\n\ -characters. See passwd(1) for more information.\n", 1212}, - {"You cannot reuse the old password.\n", 1213}, - {"Please don't use something like your username as password!\n", 1214}, - {"Please don't use something like your realname as password!\n", 1215}, - {"Usage: passwd [username [password]]\n", 1216}, - {"Only root may use the one and two argument forms.\n", 1217}, - {"Usage: passwd [-foqsvV] [user [password]]\n", 1218}, - {"Can't exec %s: %s\n", 1219}, - {"Cannot find login name", 1220}, - {"Only root can change the password for others.\n", 1221}, - {"Too many arguments.\n", 1222}, - {"Can't find username anywhere. Is `%s' really a user?", 1223}, - {"Sorry, I can only change local passwords. Use yppasswd instead.", 1224}, - {"UID and username does not match, imposter!", 1225}, - {"Changing password for %s\n", 1226}, - {"Enter old password: ", 1227}, - {"Illegal password, imposter.", 1228}, - {"Enter new password: ", 1229}, - {"Password not changed.", 1230}, - {"Re-type new password: ", 1231}, - {"You misspelled it. Password not changed.", 1232}, - {"password changed, user %s", 1233}, - {"ROOT PASSWORD CHANGED", 1234}, - {"password changed by root, user %s", 1235}, - {"calling setpwnam to set password.\n", 1236}, - {"Password *NOT* changed. Try again later.\n", 1237}, - {"Password changed.\n", 1238}, - {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1239}, - {"Shutdown process aborted", 1240}, - {"%s: Only root can shut a system down.\n", 1241}, - {"That must be tomorrow, can't you wait till then?\n", 1242}, - {"for maintenance; bounce, bounce", 1243}, - {"timeout = %d, quiet = %d, reboot = %d\n", 1244}, - {"The system is being shut down within 5 minutes", 1245}, - {"Login is therefore prohibited.", 1246}, - {"rebooted by %s: %s", 1247}, - {"halted by %s: %s", 1248}, +characters. See passwd(1) for more information.\n", 1216}, + {"You cannot reuse the old password.\n", 1217}, + {"Please don't use something like your username as password!\n", 1218}, + {"Please don't use something like your realname as password!\n", 1219}, + {"Usage: passwd [username [password]]\n", 1220}, + {"Only root may use the one and two argument forms.\n", 1221}, + {"Usage: passwd [-foqsvV] [user [password]]\n", 1222}, + {"Can't exec %s: %s\n", 1223}, + {"Cannot find login name", 1224}, + {"Only root can change the password for others.\n", 1225}, + {"Too many arguments.\n", 1226}, + {"Can't find username anywhere. Is `%s' really a user?", 1227}, + {"Sorry, I can only change local passwords. Use yppasswd instead.", 1228}, + {"UID and username does not match, imposter!", 1229}, + {"Changing password for %s\n", 1230}, + {"Enter old password: ", 1231}, + {"Illegal password, imposter.", 1232}, + {"Enter new password: ", 1233}, + {"Password not changed.", 1234}, + {"Re-type new password: ", 1235}, + {"You misspelled it. Password not changed.", 1236}, + {"password changed, user %s", 1237}, + {"ROOT PASSWORD CHANGED", 1238}, + {"password changed by root, user %s", 1239}, + {"calling setpwnam to set password.\n", 1240}, + {"Password *NOT* changed. Try again later.\n", 1241}, + {"Password changed.\n", 1242}, + {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1243}, + {"Shutdown process aborted", 1244}, + {"%s: Only root can shut a system down.\n", 1245}, + {"That must be tomorrow, can't you wait till then?\n", 1246}, + {"for maintenance; bounce, bounce", 1247}, + {"timeout = %d, quiet = %d, reboot = %d\n", 1248}, + {"The system is being shut down within 5 minutes", 1249}, + {"Login is therefore prohibited.", 1250}, + {"rebooted by %s: %s", 1251}, + {"halted by %s: %s", 1252}, {"\ \n\ -Why am I still alive after reboot?", 1249}, +Why am I still alive after reboot?", 1253}, {"\ \n\ -Now you can turn off the power...", 1250}, - {"Calling kernel power-off facility...\n", 1251}, - {"Error powering off\t%s\n", 1252}, - {"Executing the program \"%s\" ...\n", 1253}, - {"Error executing\t%s\n", 1254}, - {"URGENT: broadcast message from %s:", 1255}, - {"System going down in %d hours %d minutes", 1256}, - {"System going down in 1 hour %d minutes", 1257}, - {"System going down in %d minutes\n", 1258}, - {"System going down in 1 minute\n", 1259}, - {"System going down IMMEDIATELY!\n", 1260}, - {"\t... %s ...\n", 1261}, - {"Cannot fork for swapoff. Shrug!", 1262}, - {"Cannot exec swapoff, hoping umount will do the trick.", 1263}, - {"Cannot fork for umount, trying manually.", 1264}, - {"Cannot exec %s, trying umount.\n", 1265}, - {"Cannot exec umount, giving up on umount.", 1266}, - {"Unmounting any remaining filesystems...", 1267}, - {"shutdown: Couldn't umount %s: %s\n", 1268}, - {"Booting to single user mode.\n", 1269}, - {"exec of single user shell failed\n", 1270}, - {"fork of single user shell failed\n", 1271}, - {"error opening fifo\n", 1272}, - {"error running finalprog\n", 1273}, - {"error forking finalprog\n", 1274}, +Now you can turn off the power...", 1254}, + {"Calling kernel power-off facility...\n", 1255}, + {"Error powering off\t%s\n", 1256}, + {"Executing the program \"%s\" ...\n", 1257}, + {"Error executing\t%s\n", 1258}, + {"URGENT: broadcast message from %s:", 1259}, + {"System going down in %d hours %d minutes", 1260}, + {"System going down in 1 hour %d minutes", 1261}, + {"System going down in %d minutes\n", 1262}, + {"System going down in 1 minute\n", 1263}, + {"System going down IMMEDIATELY!\n", 1264}, + {"\t... %s ...\n", 1265}, + {"Cannot fork for swapoff. Shrug!", 1266}, + {"Cannot exec swapoff, hoping umount will do the trick.", 1267}, + {"Cannot fork for umount, trying manually.", 1268}, + {"Cannot exec %s, trying umount.\n", 1269}, + {"Cannot exec umount, giving up on umount.", 1270}, + {"Unmounting any remaining filesystems...", 1271}, + {"shutdown: Couldn't umount %s: %s\n", 1272}, + {"Booting to single user mode.\n", 1273}, + {"exec of single user shell failed\n", 1274}, + {"fork of single user shell failed\n", 1275}, + {"error opening fifo\n", 1276}, + {"error running finalprog\n", 1277}, + {"error forking finalprog\n", 1278}, {"\ \n\ -Wrong password.\n", 1275}, - {"lstat of path failed\n", 1276}, - {"stat of path failed\n", 1277}, - {"open of directory failed\n", 1278}, - {"fork failed\n", 1279}, - {"exec failed\n", 1280}, - {"cannot open inittab\n", 1281}, - {"no TERM or cannot stat tty\n", 1282}, - {"error stopping service: \"%s\"", 1283}, - {"too many iov's (change code in wall/ttymsg.c)", 1284}, - {"excessively long line arg", 1285}, - {"cannot fork", 1286}, - {"fork: %s", 1287}, - {"%s: BAD ERROR", 1288}, - {"%s: the password file is busy.\n", 1289}, - {"%s: the group file is busy.\n", 1290}, - {"%s: the %s file is busy (%s present)\n", 1291}, - {"%s: can't link %s: %s\n", 1292}, - {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1293}, - {"%s: Cannot fork\n", 1294}, - {"%s: %s unchanged\n", 1295}, - {"%s: no changes made\n", 1296}, - {"You are using shadow groups on this system.\n", 1297}, - {"You are using shadow passwords on this system.\n", 1298}, - {"Would you like to edit %s now [y/n]? ", 1299}, - {"usage: %s [file]\n", 1300}, - {"%s: can't open temporary file.\n", 1301}, - {"Broadcast Message from %s@%s", 1302}, - {"%s: will not read %s - use stdin.\n", 1303}, - {"%s: can't read %s.\n", 1304}, - {"%s: can't stat temporary file.\n", 1305}, - {"%s: can't read temporary file.\n", 1306}, - {"illegal month value: use 1-12", 1307}, - {"illegal year value: use 1-9999", 1308}, - {"%s %d", 1309}, - {"usage: cal [-mjyV] [[month] year]\n", 1310}, - {"usage: %s [+format] [day month year]\n", 1311}, - {"St. Tib's Day", 1312}, - {"%s: unknown signal %s\n", 1313}, - {"%s: can't find process \"%s\"\n", 1314}, - {"%s: unknown signal %s; valid signals:\n", 1315}, - {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1316}, - {" %s -l [ signal ]\n", 1317}, - {"logger: %s: %s.\n", 1318}, - {"logger: unknown facility name: %s.\n", 1319}, - {"logger: unknown priority name: %s.\n", 1320}, - {"\ -usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1321}, - {"usage: look [-dfa] [-t char] string [file]\n", 1322}, - {"Could not open %s\n", 1323}, - {"Got %d bytes from %s\n", 1324}, - {"namei: unable to get current directory - %s\n", 1325}, - {"namei: unable to chdir to %s - %s (%d)\n", 1326}, - {"usage: namei [-mx] pathname [pathname ...]\n", 1327}, - {"namei: could not chdir to root!\n", 1328}, - {"namei: could not stat root!\n", 1329}, - {"namei: buf overflow\n", 1330}, - {" ? could not chdir into %s - %s (%d)\n", 1331}, - {" ? problems reading symlink %s - %s (%d)\n", 1332}, - {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1333}, - {"namei: unknown file type 0%06o on file %s\n", 1334}, - {"%s: out of memory\n", 1335}, - {"%s: renaming %s to %s failed: %s\n", 1336}, - {"call: %s from to files...\n", 1337}, - {"\ -Warning: `%s' is a symlink.\n\ +Wrong password.\n", 1279}, + {"lstat of path failed\n", 1280}, + {"stat of path failed\n", 1281}, + {"open of directory failed\n", 1282}, + {"fork failed\n", 1283}, + {"exec failed\n", 1284}, + {"cannot open inittab\n", 1285}, + {"no TERM or cannot stat tty\n", 1286}, + {"error stopping service: \"%s\"", 1287}, + {"too many iov's (change code in wall/ttymsg.c)", 1288}, + {"excessively long line arg", 1289}, + {"cannot fork", 1290}, + {"fork: %s", 1291}, + {"%s: BAD ERROR", 1292}, + {"%s: the password file is busy.\n", 1293}, + {"%s: the group file is busy.\n", 1294}, + {"%s: the %s file is busy (%s present)\n", 1295}, + {"%s: can't link %s: %s\n", 1296}, + {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1297}, + {"%s: Cannot fork\n", 1298}, + {"%s: %s unchanged\n", 1299}, + {"%s: no changes made\n", 1300}, + {"You are using shadow groups on this system.\n", 1301}, + {"You are using shadow passwords on this system.\n", 1302}, + {"Would you like to edit %s now [y/n]? ", 1303}, + {"usage: %s [file]\n", 1304}, + {"%s: can't open temporary file.\n", 1305}, + {"Broadcast Message from %s@%s", 1306}, + {"%s: will not read %s - use stdin.\n", 1307}, + {"%s: can't read %s.\n", 1308}, + {"%s: can't stat temporary file.\n", 1309}, + {"%s: can't read temporary file.\n", 1310}, + {"illegal month value: use 1-12", 1311}, + {"illegal year value: use 1-9999", 1312}, + {"%s %d", 1313}, + {"usage: cal [-13smjyV] [[month] year]\n", 1314}, + {"usage: %s [+format] [day month year]\n", 1315}, + {"St. Tib's Day", 1316}, + {"%s: unknown signal %s\n", 1317}, + {"%s: can't find process \"%s\"\n", 1318}, + {"%s: unknown signal %s; valid signals:\n", 1319}, + {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1320}, + {" %s -l [ signal ]\n", 1321}, + {"logger: %s: %s.\n", 1322}, + {"logger: unknown facility name: %s.\n", 1323}, + {"logger: unknown priority name: %s.\n", 1324}, + {"\ +usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1325}, + {"usage: look [-dfa] [-t char] string [file]\n", 1326}, + {"Could not open %s\n", 1327}, + {"Got %d bytes from %s\n", 1328}, + {"namei: unable to get current directory - %s\n", 1329}, + {"namei: unable to chdir to %s - %s (%d)\n", 1330}, + {"usage: namei [-mx] pathname [pathname ...]\n", 1331}, + {"namei: could not chdir to root!\n", 1332}, + {"namei: could not stat root!\n", 1333}, + {"namei: buf overflow\n", 1334}, + {" ? could not chdir into %s - %s (%d)\n", 1335}, + {" ? problems reading symlink %s - %s (%d)\n", 1336}, + {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1337}, + {"namei: unknown file type 0%06o on file %s\n", 1338}, + {"%s: out of memory\n", 1339}, + {"%s: renaming %s to %s failed: %s\n", 1340}, + {"call: %s from to files...\n", 1341}, + {"\ +Warning: `%s' is a link.\n\ Use `%s [options] %s' if you really want to use it.\n\ -Script not started.\n", 1338}, - {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1339}, - {"Script started, file is %s\n", 1340}, - {"Script started on %s", 1341}, +Script not started.\n", 1342}, + {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1343}, + {"Script started, file is %s\n", 1344}, + {"Script started on %s", 1345}, {"\ \n\ -Script done on %s", 1342}, - {"Script done, file is %s\n", 1343}, - {"openpty failed\n", 1344}, - {"Out of pty's\n", 1345}, - {"%s: Argument error, usage\n", 1346}, - {" [ -term terminal_name ]\n", 1347}, - {" [ -reset ]\n", 1348}, - {" [ -initialize ]\n", 1349}, - {" [ -cursor [on|off] ]\n", 1350}, - {" [ -snow [on|off] ]\n", 1351}, - {" [ -softscroll [on|off] ]\n", 1352}, - {" [ -repeat [on|off] ]\n", 1353}, - {" [ -appcursorkeys [on|off] ]\n", 1354}, - {" [ -linewrap [on|off] ]\n", 1355}, - {" [ -default ]\n", 1356}, - {" [ -foreground black|blue|green|cyan", 1357}, - {"|red|magenta|yellow|white|default ]\n", 1358}, - {" [ -background black|blue|green|cyan", 1359}, - {" [ -ulcolor black|grey|blue|green|cyan", 1360}, - {"|red|magenta|yellow|white ]\n", 1361}, - {" [ -ulcolor bright blue|green|cyan", 1362}, - {" [ -hbcolor black|grey|blue|green|cyan", 1363}, - {" [ -hbcolor bright blue|green|cyan", 1364}, - {" [ -standout [ attr ] ]\n", 1365}, - {" [ -inversescreen [on|off] ]\n", 1366}, - {" [ -bold [on|off] ]\n", 1367}, - {" [ -half-bright [on|off] ]\n", 1368}, - {" [ -blink [on|off] ]\n", 1369}, - {" [ -reverse [on|off] ]\n", 1370}, - {" [ -underline [on|off] ]\n", 1371}, - {" [ -store ]\n", 1372}, - {" [ -clear [all|rest] ]\n", 1373}, - {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1374}, - {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1375}, - {" [ -regtabs [1-160] ]\n", 1376}, - {" [ -blank [0-60] ]\n", 1377}, - {" [ -dump [1-NR_CONSOLES] ]\n", 1378}, - {" [ -append [1-NR_CONSOLES] ]\n", 1379}, - {" [ -file dumpfilename ]\n", 1380}, - {" [ -msg [on|off] ]\n", 1381}, - {" [ -msglevel [0-8] ]\n", 1382}, - {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1383}, - {" [ -powerdown [0-60] ]\n", 1384}, - {" [ -blength [0-2000] ]\n", 1385}, - {" [ -bfreq freqnumber ]\n", 1386}, - {"cannot (un)set powersave mode\n", 1387}, - {"klogctl error: %s\n", 1388}, - {"Error reading %s\n", 1389}, - {"Error writing screendump\n", 1390}, - {"couldn't read %s, and cannot ioctl dump\n", 1391}, - {"%s: $TERM is not defined.\n", 1392}, - {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1393}, - {"write: can't find your tty's name\n", 1394}, - {"write: you have write permission turned off.\n", 1395}, - {"write: %s is not logged in on %s.\n", 1396}, - {"write: %s has messages disabled on %s\n", 1397}, - {"usage: write user [tty]\n", 1398}, - {"write: %s is not logged in\n", 1399}, - {"write: %s has messages disabled\n", 1400}, - {"write: %s is logged in more than once; writing to %s\n", 1401}, - {"Message from %s@%s (as %s) on %s at %s ...", 1402}, - {"Message from %s@%s on %s at %s ...", 1403}, - {"warning: error reading %s: %s", 1404}, - {"warning: can't open %s: %s", 1405}, - {"mount: could not open %s - using %s instead\n", 1406}, - {"can't create lock file %s: %s (use -n flag to override)", 1407}, - {"can't link lock file %s: %s (use -n flag to override)", 1408}, - {"can't open lock file %s: %s (use -n flag to override)", 1409}, - {"Can't lock lock file %s: %s\n", 1410}, - {"can't lock lock file %s: %s", 1411}, - {"timed out", 1412}, +Script done on %s", 1346}, + {"Script done, file is %s\n", 1347}, + {"openpty failed\n", 1348}, + {"Out of pty's\n", 1349}, + {"%s: Argument error, usage\n", 1350}, + {" [ -term terminal_name ]\n", 1351}, + {" [ -reset ]\n", 1352}, + {" [ -initialize ]\n", 1353}, + {" [ -cursor [on|off] ]\n", 1354}, + {" [ -snow [on|off] ]\n", 1355}, + {" [ -softscroll [on|off] ]\n", 1356}, + {" [ -repeat [on|off] ]\n", 1357}, + {" [ -appcursorkeys [on|off] ]\n", 1358}, + {" [ -linewrap [on|off] ]\n", 1359}, + {" [ -default ]\n", 1360}, + {" [ -foreground black|blue|green|cyan", 1361}, + {"|red|magenta|yellow|white|default ]\n", 1362}, + {" [ -background black|blue|green|cyan", 1363}, + {" [ -ulcolor black|grey|blue|green|cyan", 1364}, + {"|red|magenta|yellow|white ]\n", 1365}, + {" [ -ulcolor bright blue|green|cyan", 1366}, + {" [ -hbcolor black|grey|blue|green|cyan", 1367}, + {" [ -hbcolor bright blue|green|cyan", 1368}, + {" [ -standout [ attr ] ]\n", 1369}, + {" [ -inversescreen [on|off] ]\n", 1370}, + {" [ -bold [on|off] ]\n", 1371}, + {" [ -half-bright [on|off] ]\n", 1372}, + {" [ -blink [on|off] ]\n", 1373}, + {" [ -reverse [on|off] ]\n", 1374}, + {" [ -underline [on|off] ]\n", 1375}, + {" [ -store ]\n", 1376}, + {" [ -clear [all|rest] ]\n", 1377}, + {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1378}, + {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1379}, + {" [ -regtabs [1-160] ]\n", 1380}, + {" [ -blank [0-60] ]\n", 1381}, + {" [ -dump [1-NR_CONSOLES] ]\n", 1382}, + {" [ -append [1-NR_CONSOLES] ]\n", 1383}, + {" [ -file dumpfilename ]\n", 1384}, + {" [ -msg [on|off] ]\n", 1385}, + {" [ -msglevel [0-8] ]\n", 1386}, + {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1387}, + {" [ -powerdown [0-60] ]\n", 1388}, + {" [ -blength [0-2000] ]\n", 1389}, + {" [ -bfreq freqnumber ]\n", 1390}, + {"cannot (un)set powersave mode\n", 1391}, + {"klogctl error: %s\n", 1392}, + {"Error reading %s\n", 1393}, + {"Error writing screendump\n", 1394}, + {"couldn't read %s, and cannot ioctl dump\n", 1395}, + {"%s: $TERM is not defined.\n", 1396}, + {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1397}, + {"write: can't find your tty's name\n", 1398}, + {"write: you have write permission turned off.\n", 1399}, + {"write: %s is not logged in on %s.\n", 1400}, + {"write: %s has messages disabled on %s\n", 1401}, + {"usage: write user [tty]\n", 1402}, + {"write: %s is not logged in\n", 1403}, + {"write: %s has messages disabled\n", 1404}, + {"write: %s is logged in more than once; writing to %s\n", 1405}, + {"Message from %s@%s (as %s) on %s at %s ...", 1406}, + {"Message from %s@%s on %s at %s ...", 1407}, + {"warning: error reading %s: %s", 1408}, + {"warning: can't open %s: %s", 1409}, + {"mount: could not open %s - using %s instead\n", 1410}, + {"can't create lock file %s: %s (use -n flag to override)", 1411}, + {"can't link lock file %s: %s (use -n flag to override)", 1412}, + {"can't open lock file %s: %s (use -n flag to override)", 1413}, + {"Can't lock lock file %s: %s\n", 1414}, + {"can't lock lock file %s: %s", 1415}, + {"timed out", 1416}, {"\ Cannot create link %s\n\ -Perhaps there is a stale lock file?\n", 1413}, - {"cannot open %s (%s) - mtab not updated", 1414}, - {"error writing %s: %s", 1415}, - {"error changing mode of %s: %s\n", 1416}, - {"can't rename %s to %s: %s\n", 1417}, - {"loop: can't open device %s: %s\n", 1418}, - {"loop: can't get info on device %s: %s\n", 1419}, - {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1420}, - {"mount: could not find any device /dev/loop#", 1421}, +Perhaps there is a stale lock file?\n", 1417}, + {"cannot open %s (%s) - mtab not updated", 1418}, + {"error writing %s: %s", 1419}, + {"error changing mode of %s: %s\n", 1420}, + {"can't rename %s to %s: %s\n", 1421}, + {"loop: can't open device %s: %s\n", 1422}, + {"loop: can't get info on device %s: %s\n", 1423}, + {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1424}, + {"mount: could not find any device /dev/loop#", 1425}, {"\ mount: Could not find any loop device.\n\ - Maybe /dev/loop# has a wrong major number?", 1422}, + Maybe /dev/loop# has a wrong major number?", 1426}, {"\ mount: Could not find any loop device, and, according to %s,\n\ this kernel does not know about the loop device.\n\ - (If so, then recompile or `insmod loop.o'.)", 1423}, + (If so, then recompile or `insmod loop.o'.)", 1427}, {"\ mount: Could not find any loop device. Maybe this kernel does not know\n\ about the loop device (then recompile or `insmod loop.o'), or\n\ - maybe /dev/loop# has the wrong major number?", 1424}, - {"mount: could not find any free loop device", 1425}, - {"Unsupported encryption type %s\n", 1426}, - {"Couldn't lock into memory, exiting.\n", 1427}, - {"Init (up to 16 hex digits): ", 1428}, - {"Non-hex digit '%c'.\n", 1429}, - {"Don't know how to get key for encryption system %d\n", 1430}, - {"set_loop(%s,%s,%d): success\n", 1431}, - {"loop: can't delete device %s: %s\n", 1432}, - {"del_loop(%s): success\n", 1433}, - {"This mount was compiled without loop support. Please recompile.\n", 1434}, + maybe /dev/loop# has the wrong major number?", 1428}, + {"mount: could not find any free loop device", 1429}, + {"Unsupported encryption type %s\n", 1430}, + {"Couldn't lock into memory, exiting.\n", 1431}, + {"Init (up to 16 hex digits): ", 1432}, + {"Non-hex digit '%c'.\n", 1433}, + {"Don't know how to get key for encryption system %d\n", 1434}, + {"set_loop(%s,%s,%d): success\n", 1435}, + {"loop: can't delete device %s: %s\n", 1436}, + {"del_loop(%s): success\n", 1437}, + {"This mount was compiled without loop support. Please recompile.\n", 1438}, {"\ usage:\n\ %s loop_device # give info\n\ %s -d loop_device # delete\n\ - %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1435}, - {"not enough memory", 1436}, - {"No loop support was available at compile time. Please recompile.\n", 1437}, - {"[mntent]: warning: no final newline at the end of %s\n", 1438}, - {"[mntent]: line %d in %s is bad%s\n", 1439}, - {"; rest of file ignored", 1440}, - {"mount: according to mtab, %s is already mounted on %s", 1441}, - {"mount: according to mtab, %s is mounted on %s", 1442}, - {"mount: can't open %s for writing: %s", 1443}, - {"mount: error writing %s: %s", 1444}, - {"mount: error changing mode of %s: %s", 1445}, - {"%s looks like swapspace - not mounted", 1446}, - {"mount failed", 1447}, - {"mount: only root can mount %s on %s", 1448}, - {"mount: loop device specified twice", 1449}, - {"mount: type specified twice", 1450}, - {"mount: skipping the setup of a loop device\n", 1451}, - {"mount: going to use the loop device %s\n", 1452}, - {"mount: failed setting up loop device\n", 1453}, - {"mount: setup loop device successfully\n", 1454}, - {"mount: can't open %s: %s", 1455}, - {"mount: cannot open %s for setting speed", 1456}, - {"mount: cannot set speed: %s", 1457}, - {"mount: cannot fork: %s", 1458}, - {"mount: this version was compiled without support for the type `nfs'", 1459}, - {"mount: failed with nfs mount version 4, trying 3..\n", 1460}, - {"\ -mount: I could not determine the filesystem type, and none was specified", 1461}, - {"mount: you must specify the filesystem type", 1462}, - {"mount: mount failed", 1463}, - {"mount: mount point %s is not a directory", 1464}, - {"mount: permission denied", 1465}, - {"mount: must be superuser to use mount", 1466}, - {"mount: %s is busy", 1467}, - {"mount: proc already mounted", 1468}, - {"mount: %s already mounted or %s busy", 1469}, - {"mount: mount point %s does not exist", 1470}, - {"mount: mount point %s is a symbolic link to nowhere", 1471}, - {"mount: special device %s does not exist", 1472}, + %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1439}, + {"not enough memory", 1440}, + {"No loop support was available at compile time. Please recompile.\n", 1441}, + {"[mntent]: warning: no final newline at the end of %s\n", 1442}, + {"[mntent]: line %d in %s is bad%s\n", 1443}, + {"; rest of file ignored", 1444}, + {"mount: according to mtab, %s is already mounted on %s", 1445}, + {"mount: according to mtab, %s is mounted on %s", 1446}, + {"mount: can't open %s for writing: %s", 1447}, + {"mount: error writing %s: %s", 1448}, + {"mount: error changing mode of %s: %s", 1449}, + {"%s looks like swapspace - not mounted", 1450}, + {"mount failed", 1451}, + {"mount: only root can mount %s on %s", 1452}, + {"mount: loop device specified twice", 1453}, + {"mount: type specified twice", 1454}, + {"mount: skipping the setup of a loop device\n", 1455}, + {"mount: going to use the loop device %s\n", 1456}, + {"mount: failed setting up loop device\n", 1457}, + {"mount: setup loop device successfully\n", 1458}, + {"mount: can't open %s: %s", 1459}, + {"mount: cannot open %s for setting speed", 1460}, + {"mount: cannot set speed: %s", 1461}, + {"mount: cannot fork: %s", 1462}, + {"mount: this version was compiled without support for the type `nfs'", 1463}, + {"mount: failed with nfs mount version 4, trying 3..\n", 1464}, + {"\ +mount: I could not determine the filesystem type, and none was specified", 1465}, + {"mount: you must specify the filesystem type", 1466}, + {"mount: mount failed", 1467}, + {"mount: mount point %s is not a directory", 1468}, + {"mount: permission denied", 1469}, + {"mount: must be superuser to use mount", 1470}, + {"mount: %s is busy", 1471}, + {"mount: proc already mounted", 1472}, + {"mount: %s already mounted or %s busy", 1473}, + {"mount: mount point %s does not exist", 1474}, + {"mount: mount point %s is a symbolic link to nowhere", 1475}, + {"mount: special device %s does not exist", 1476}, {"\ mount: special device %s does not exist\n\ - (a path prefix is not a directory)\n", 1473}, - {"mount: %s not mounted already, or bad option", 1474}, + (a path prefix is not a directory)\n", 1477}, + {"mount: %s not mounted already, or bad option", 1478}, {"\ mount: wrong fs type, bad option, bad superblock on %s,\n\ - or too many mounted file systems", 1475}, - {"mount table full", 1476}, - {"mount: %s: can't read superblock", 1477}, - {"mount: %s: unknown device", 1478}, - {"mount: fs type %s not supported by kernel", 1479}, - {"mount: probably you meant %s", 1480}, - {"mount: maybe you meant iso9660 ?", 1481}, - {"mount: %s has wrong device number or fs type %s not supported", 1482}, - {"mount: %s is not a block device, and stat fails?", 1483}, + or too many mounted file systems", 1479}, + {"mount table full", 1480}, + {"mount: %s: can't read superblock", 1481}, + {"mount: %s: unknown device", 1482}, + {"mount: fs type %s not supported by kernel", 1483}, + {"mount: probably you meant %s", 1484}, + {"mount: maybe you meant iso9660 ?", 1485}, + {"mount: %s has wrong device number or fs type %s not supported", 1486}, + {"mount: %s is not a block device, and stat fails?", 1487}, {"\ mount: the kernel does not recognize %s as a block device\n\ - (maybe `insmod driver'?)", 1484}, - {"mount: %s is not a block device (maybe try `-o loop'?)", 1485}, - {"mount: %s is not a block device", 1486}, - {"mount: %s is not a valid block device", 1487}, - {"block device ", 1488}, - {"mount: cannot mount %s%s read-only", 1489}, - {"mount: %s%s is write-protected but explicit `-w' flag given", 1490}, - {"mount: %s%s is write-protected, mounting read-only", 1491}, - {"mount: going to mount %s by %s\n", 1492}, - {"UUID", 1493}, - {"label", 1494}, - {"mount: no such partition found", 1495}, - {"mount: no type was given - I'll assume nfs because of the colon\n", 1496}, - {"mount: backgrounding \"%s\"\n", 1497}, - {"mount: giving up \"%s\"\n", 1498}, - {"mount: %s already mounted on %s\n", 1499}, + (maybe `insmod driver'?)", 1488}, + {"mount: %s is not a block device (maybe try `-o loop'?)", 1489}, + {"mount: %s is not a block device", 1490}, + {"mount: %s is not a valid block device", 1491}, + {"block device ", 1492}, + {"mount: cannot mount %s%s read-only", 1493}, + {"mount: %s%s is write-protected but explicit `-w' flag given", 1494}, + {"mount: %s%s is write-protected, mounting read-only", 1495}, + {"mount: going to mount %s by %s\n", 1496}, + {"UUID", 1497}, + {"label", 1498}, + {"mount: no such partition found", 1499}, + {"mount: no type was given - I'll assume nfs because of the colon\n", 1500}, + {"mount: backgrounding \"%s\"\n", 1501}, + {"mount: giving up \"%s\"\n", 1502}, + {"mount: %s already mounted on %s\n", 1503}, {"\ Usage: mount -V : print version\n\ mount -h : print this help\n\ @@ -1971,273 +1975,274 @@ Note that one does not really mount a device, one mounts\n\ a filesystem (of the given type) found on the device.\n\ One can also mount an already visible directory tree elsewhere:\n\ mount --bind olddir newdir\n\ +or move a subtree:\n\ + mount --move olddir newdir\n\ A device can be given by name, say /dev/hda1 or /dev/cdrom,\n\ or by label, using -L label or by uuid, using -U uuid .\n\ Other options: [-nfFrsvw] [-o options].\n\ -For many more details, say man 8 mount .\n", 1500}, - {"mount: only root can do that", 1501}, - {"mount: no %s found - creating it..\n", 1502}, - {"mount: mounting %s\n", 1503}, - {"nothing was mounted", 1504}, - {"mount: cannot find %s in %s", 1505}, - {"mount: can't find %s in %s or %s", 1506}, - {"\ -mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1507}, - {"mount: bad UUID", 1508}, - {"mount: error while guessing filesystem type\n", 1509}, - {"mount: you didn't specify a filesystem type for %s\n", 1510}, - {" I will try all types mentioned in %s or %s\n", 1511}, - {" and it looks like this is swapspace\n", 1512}, - {" I will try type %s\n", 1513}, - {"Trying %s\n", 1514}, - {"mount: excessively long host:dir argument\n", 1515}, - {"mount: warning: multiple hostnames not supported\n", 1516}, - {"mount: directory to mount not in host:dir format\n", 1517}, - {"mount: can't get address for %s\n", 1518}, - {"mount: got bad hp->h_length\n", 1519}, - {"mount: excessively long option argument\n", 1520}, - {"Warning: Unrecognized proto= option.\n", 1521}, - {"Warning: Option namlen is not supported.\n", 1522}, - {"unknown nfs mount parameter: %s=%d\n", 1523}, - {"Warning: option nolock is not supported.\n", 1524}, - {"unknown nfs mount option: %s%s\n", 1525}, - {"mount: got bad hp->h_length?\n", 1526}, - {"NFS over TCP is not supported.\n", 1527}, - {"nfs socket", 1528}, - {"nfs bindresvport", 1529}, - {"nfs server reported service unavailable", 1530}, - {"used portmapper to find NFS port\n", 1531}, - {"using port %d for nfs deamon\n", 1532}, - {"nfs connect", 1533}, - {"unknown nfs status return value: %d", 1534}, - {"bug in xstrndup call", 1535}, +For many more details, say man 8 mount .\n", 1504}, + {"mount: only root can do that", 1505}, + {"mount: no %s found - creating it..\n", 1506}, + {"mount: mounting %s\n", 1507}, + {"nothing was mounted", 1508}, + {"mount: cannot find %s in %s", 1509}, + {"mount: can't find %s in %s or %s", 1510}, + {"\ +mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1511}, + {"mount: bad UUID", 1512}, + {"mount: error while guessing filesystem type\n", 1513}, + {"mount: you didn't specify a filesystem type for %s\n", 1514}, + {" I will try all types mentioned in %s or %s\n", 1515}, + {" and it looks like this is swapspace\n", 1516}, + {" I will try type %s\n", 1517}, + {"Trying %s\n", 1518}, + {"mount: excessively long host:dir argument\n", 1519}, + {"mount: warning: multiple hostnames not supported\n", 1520}, + {"mount: directory to mount not in host:dir format\n", 1521}, + {"mount: can't get address for %s\n", 1522}, + {"mount: got bad hp->h_length\n", 1523}, + {"mount: excessively long option argument\n", 1524}, + {"Warning: Unrecognized proto= option.\n", 1525}, + {"Warning: Option namlen is not supported.\n", 1526}, + {"unknown nfs mount parameter: %s=%d\n", 1527}, + {"Warning: option nolock is not supported.\n", 1528}, + {"unknown nfs mount option: %s%s\n", 1529}, + {"mount: got bad hp->h_length?\n", 1530}, + {"NFS over TCP is not supported.\n", 1531}, + {"nfs socket", 1532}, + {"nfs bindresvport", 1533}, + {"nfs server reported service unavailable", 1534}, + {"used portmapper to find NFS port\n", 1535}, + {"using port %d for nfs deamon\n", 1536}, + {"nfs connect", 1537}, + {"unknown nfs status return value: %d", 1538}, + {"bug in xstrndup call", 1539}, {"\ usage: %s [-hV]\n\ %s -a [-v]\n\ %s [-v] [-p priority] special ...\n\ - %s [-s]\n", 1536}, - {"%s on %s\n", 1537}, - {"swapon: cannot stat %s: %s\n", 1538}, - {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1539}, - {"swapon: Skipping file %s - it appears to have holes.\n", 1540}, - {"%s: cannot open %s: %s\n", 1541}, - {"umount: compiled without support for -f\n", 1542}, - {"host: %s, directory: %s\n", 1543}, - {"umount: can't get address for %s\n", 1544}, - {"umount: got bad hostp->h_length\n", 1545}, - {"umount: %s: invalid block device", 1546}, - {"umount: %s: not mounted", 1547}, - {"umount: %s: can't write superblock", 1548}, - {"umount: %s: device is busy", 1549}, - {"umount: %s: not found", 1550}, - {"umount: %s: must be superuser to umount", 1551}, - {"umount: %s: block devices not permitted on fs", 1552}, - {"umount: %s: %s", 1553}, - {"no umount2, trying umount...\n", 1554}, - {"could not umount %s - trying %s instead\n", 1555}, - {"umount: %s busy - remounted read-only\n", 1556}, - {"umount: could not remount %s read-only\n", 1557}, - {"%s umounted\n", 1558}, - {"umount: cannot find list of filesystems to unmount", 1559}, + %s [-s]\n", 1540}, + {"%s on %s\n", 1541}, + {"swapon: cannot stat %s: %s\n", 1542}, + {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1543}, + {"swapon: Skipping file %s - it appears to have holes.\n", 1544}, + {"%s: cannot open %s: %s\n", 1545}, + {"umount: compiled without support for -f\n", 1546}, + {"host: %s, directory: %s\n", 1547}, + {"umount: can't get address for %s\n", 1548}, + {"umount: got bad hostp->h_length\n", 1549}, + {"umount: %s: invalid block device", 1550}, + {"umount: %s: not mounted", 1551}, + {"umount: %s: can't write superblock", 1552}, + {"umount: %s: device is busy", 1553}, + {"umount: %s: not found", 1554}, + {"umount: %s: must be superuser to umount", 1555}, + {"umount: %s: block devices not permitted on fs", 1556}, + {"umount: %s: %s", 1557}, + {"no umount2, trying umount...\n", 1558}, + {"could not umount %s - trying %s instead\n", 1559}, + {"umount: %s busy - remounted read-only\n", 1560}, + {"umount: could not remount %s read-only\n", 1561}, + {"%s umounted\n", 1562}, + {"umount: cannot find list of filesystems to unmount", 1563}, {"\ Usage: umount [-hV]\n\ umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n\ - umount [-f] [-r] [-n] [-v] special | node...\n", 1560}, - {"Trying to umount %s\n", 1561}, - {"Could not find %s in mtab\n", 1562}, - {"umount: %s is not mounted (according to mtab)", 1563}, - {"umount: it seems %s is mounted multiple times", 1564}, - {"umount: %s is not in the fstab (and you are not root)", 1565}, - {"umount: %s mount disagrees with the fstab", 1566}, - {"umount: only root can unmount %s from %s", 1567}, - {"umount: only %s can unmount %s from %s", 1568}, - {"umount: only root can do that", 1569}, - {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1570}, - {"Usage: ctrlaltdel hard|soft\n", 1571}, + umount [-f] [-r] [-n] [-v] special | node...\n", 1564}, + {"Trying to umount %s\n", 1565}, + {"Could not find %s in mtab\n", 1566}, + {"umount: %s is not mounted (according to mtab)", 1567}, + {"umount: it seems %s is mounted multiple times", 1568}, + {"umount: %s is not in the fstab (and you are not root)", 1569}, + {"umount: %s mount disagrees with the fstab", 1570}, + {"umount: only root can unmount %s from %s", 1571}, + {"umount: only root can do that", 1572}, + {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1573}, + {"Usage: ctrlaltdel hard|soft\n", 1574}, {"\ File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\ -and the maximum transfer rate in characters/second was %f\n", 1572}, +and the maximum transfer rate in characters/second was %f\n", 1575}, {"\ File %s, For threshold value %lu and timrout value %lu, Maximum characters \ in fifo were %d,\n\ -and the maximum transfer rate in characters/second was %f\n", 1573}, - {"Invalid interval value: %s\n", 1574}, - {"Invalid set value: %s\n", 1575}, - {"Invalid default value: %s\n", 1576}, - {"Invalid set time value: %s\n", 1577}, - {"Invalid default time value: %s\n", 1578}, +and the maximum transfer rate in characters/second was %f\n", 1576}, + {"Invalid interval value: %s\n", 1577}, + {"Invalid set value: %s\n", 1578}, + {"Invalid default value: %s\n", 1579}, + {"Invalid set time value: %s\n", 1580}, + {"Invalid default time value: %s\n", 1581}, {"\ Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \ -[-g|-G] file [file...]\n", 1579}, - {"Can't open %s: %s\n", 1580}, - {"Can't set %s to threshold %d: %s\n", 1581}, - {"Can't set %s to time threshold %d: %s\n", 1582}, - {"Can't get threshold for %s: %s\n", 1583}, - {"Can't get timeout for %s: %s\n", 1584}, - {"%s: %ld current threshold and %ld current timeout\n", 1585}, - {"%s: %ld default threshold and %ld default timeout\n", 1586}, - {"Can't set signal handler", 1587}, - {"gettimeofday failed", 1588}, - {"Can't issue CYGETMON on %s: %s\n", 1589}, - {"\ -%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1590}, - {" %f int/sec; %f rec, %f send (char/sec)\n", 1591}, - {"\ -%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1592}, - {" %f int/sec; %f rec (char/sec)\n", 1593}, - {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1594}, - {"invalid id: %s\n", 1595}, - {"cannot remove id %s (%s)\n", 1596}, - {"usage: %s {shm | msg | sem} id ...\n", 1597}, - {"unknown resource type: %s\n", 1598}, - {"resource(s) deleted\n", 1599}, - {"usage : %s -asmq -tclup \n", 1600}, - {"\t%s [-s -m -q] -i id\n", 1601}, - {"\t%s -h for help.\n", 1602}, - {"\ -%s provides information on ipc facilities for which you have read access.\n", 1603}, +[-g|-G] file [file...]\n", 1582}, + {"Can't open %s: %s\n", 1583}, + {"Can't set %s to threshold %d: %s\n", 1584}, + {"Can't set %s to time threshold %d: %s\n", 1585}, + {"Can't get threshold for %s: %s\n", 1586}, + {"Can't get timeout for %s: %s\n", 1587}, + {"%s: %ld current threshold and %ld current timeout\n", 1588}, + {"%s: %ld default threshold and %ld default timeout\n", 1589}, + {"Can't set signal handler", 1590}, + {"gettimeofday failed", 1591}, + {"Can't issue CYGETMON on %s: %s\n", 1592}, + {"\ +%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1593}, + {" %f int/sec; %f rec, %f send (char/sec)\n", 1594}, + {"\ +%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1595}, + {" %f int/sec; %f rec (char/sec)\n", 1596}, + {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1597}, + {"invalid id: %s\n", 1598}, + {"cannot remove id %s (%s)\n", 1599}, + {"usage: %s {shm | msg | sem} id ...\n", 1600}, + {"unknown resource type: %s\n", 1601}, + {"resource(s) deleted\n", 1602}, + {"usage : %s -asmq -tclup \n", 1603}, + {"\t%s [-s -m -q] -i id\n", 1604}, + {"\t%s -h for help.\n", 1605}, + {"\ +%s provides information on ipc facilities for which you have read access.\n", 1606}, {"\ Resource Specification:\n\ \t-m : shared_mem\n\ -\t-q : messages\n", 1604}, +\t-q : messages\n", 1607}, {"\ \t-s : semaphores\n\ -\t-a : all (default)\n", 1605}, +\t-a : all (default)\n", 1608}, {"\ Output Format:\n\ \t-t : time\n\ \t-p : pid\n\ -\t-c : creator\n", 1606}, +\t-c : creator\n", 1609}, {"\ \t-l : limits\n\ -\t-u : summary\n", 1607}, - {"-i id [-s -q -m] : details on resource identified by id\n", 1608}, - {"kernel not configured for shared memory\n", 1609}, - {"------ Shared Memory Limits --------\n", 1610}, - {"max number of segments = %ld\n", 1611}, - {"max seg size (kbytes) = %ld\n", 1612}, - {"max total shared memory (kbytes) = %ld\n", 1613}, - {"min seg size (bytes) = %ld\n", 1614}, - {"------ Shared Memory Status --------\n", 1615}, - {"segments allocated %d\n", 1616}, - {"pages allocated %ld\n", 1617}, - {"pages resident %ld\n", 1618}, - {"pages swapped %ld\n", 1619}, - {"Swap performance: %ld attempts\t %ld successes\n", 1620}, - {"------ Shared Memory Segment Creators/Owners --------\n", 1621}, - {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1622}, - {"shmid", 1623}, - {"perms", 1624}, - {"cuid", 1625}, - {"cgid", 1626}, - {"uid", 1627}, - {"gid", 1628}, - {"------ Shared Memory Attach/Detach/Change Times --------\n", 1629}, - {"%-10s %-10s %-20s %-20s %-20s\n", 1630}, - {"owner", 1631}, - {"attached", 1632}, - {"detached", 1633}, - {"changed", 1634}, - {"------ Shared Memory Creator/Last-op --------\n", 1635}, - {"%-10s %-10s %-10s %-10s\n", 1636}, - {"cpid", 1637}, - {"lpid", 1638}, - {"------ Shared Memory Segments --------\n", 1639}, - {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1640}, - {"key", 1641}, - {"bytes", 1642}, - {"nattch", 1643}, - {"status", 1644}, - {"Not set", 1645}, - {"dest", 1646}, - {"locked", 1647}, - {"kernel not configured for semaphores\n", 1648}, - {"------ Semaphore Limits --------\n", 1649}, - {"max number of arrays = %d\n", 1650}, - {"max semaphores per array = %d\n", 1651}, - {"max semaphores system wide = %d\n", 1652}, - {"max ops per semop call = %d\n", 1653}, - {"semaphore max value = %d\n", 1654}, - {"------ Semaphore Status --------\n", 1655}, - {"used arrays = %d\n", 1656}, - {"allocated semaphores = %d\n", 1657}, - {"------ Semaphore Arrays Creators/Owners --------\n", 1658}, - {"semid", 1659}, - {"------ Shared Memory Operation/Change Times --------\n", 1660}, - {"%-8s %-10s %-26.24s %-26.24s\n", 1661}, - {"last-op", 1662}, - {"last-changed", 1663}, - {"------ Semaphore Arrays --------\n", 1664}, - {"%-10s %-10s %-10s %-10s %-10s %-12s\n", 1665}, - {"nsems", 1666}, - {"kernel not configured for message queues\n", 1667}, - {"------ Messages: Limits --------\n", 1668}, - {"max queues system wide = %d\n", 1669}, - {"max size of message (bytes) = %d\n", 1670}, - {"default max size of queue (bytes) = %d\n", 1671}, - {"------ Messages: Status --------\n", 1672}, - {"allocated queues = %d\n", 1673}, - {"used headers = %d\n", 1674}, - {"used space = %d bytes\n", 1675}, - {"------ Message Queues: Creators/Owners --------\n", 1676}, - {"msqid", 1677}, - {"------ Message Queues Send/Recv/Change Times --------\n", 1678}, - {"%-8s %-10s %-20s %-20s %-20s\n", 1679}, - {"send", 1680}, - {"recv", 1681}, - {"change", 1682}, - {"------ Message Queues PIDs --------\n", 1683}, - {"lspid", 1684}, - {"lrpid", 1685}, - {"------ Message Queues --------\n", 1686}, - {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1687}, - {"used-bytes", 1688}, - {"messages", 1689}, +\t-u : summary\n", 1610}, + {"-i id [-s -q -m] : details on resource identified by id\n", 1611}, + {"kernel not configured for shared memory\n", 1612}, + {"------ Shared Memory Limits --------\n", 1613}, + {"max number of segments = %ld\n", 1614}, + {"max seg size (kbytes) = %ld\n", 1615}, + {"max total shared memory (kbytes) = %ld\n", 1616}, + {"min seg size (bytes) = %ld\n", 1617}, + {"------ Shared Memory Status --------\n", 1618}, + {"segments allocated %d\n", 1619}, + {"pages allocated %ld\n", 1620}, + {"pages resident %ld\n", 1621}, + {"pages swapped %ld\n", 1622}, + {"Swap performance: %ld attempts\t %ld successes\n", 1623}, + {"------ Shared Memory Segment Creators/Owners --------\n", 1624}, + {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1625}, + {"shmid", 1626}, + {"perms", 1627}, + {"cuid", 1628}, + {"cgid", 1629}, + {"uid", 1630}, + {"gid", 1631}, + {"------ Shared Memory Attach/Detach/Change Times --------\n", 1632}, + {"%-10s %-10s %-20s %-20s %-20s\n", 1633}, + {"owner", 1634}, + {"attached", 1635}, + {"detached", 1636}, + {"changed", 1637}, + {"------ Shared Memory Creator/Last-op --------\n", 1638}, + {"%-10s %-10s %-10s %-10s\n", 1639}, + {"cpid", 1640}, + {"lpid", 1641}, + {"------ Shared Memory Segments --------\n", 1642}, + {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1643}, + {"key", 1644}, + {"bytes", 1645}, + {"nattch", 1646}, + {"status", 1647}, + {"Not set", 1648}, + {"dest", 1649}, + {"locked", 1650}, + {"kernel not configured for semaphores\n", 1651}, + {"------ Semaphore Limits --------\n", 1652}, + {"max number of arrays = %d\n", 1653}, + {"max semaphores per array = %d\n", 1654}, + {"max semaphores system wide = %d\n", 1655}, + {"max ops per semop call = %d\n", 1656}, + {"semaphore max value = %d\n", 1657}, + {"------ Semaphore Status --------\n", 1658}, + {"used arrays = %d\n", 1659}, + {"allocated semaphores = %d\n", 1660}, + {"------ Semaphore Arrays Creators/Owners --------\n", 1661}, + {"semid", 1662}, + {"------ Shared Memory Operation/Change Times --------\n", 1663}, + {"%-8s %-10s %-26.24s %-26.24s\n", 1664}, + {"last-op", 1665}, + {"last-changed", 1666}, + {"------ Semaphore Arrays --------\n", 1667}, + {"%-10s %-10s %-10s %-10s %-10s %-12s\n", 1668}, + {"nsems", 1669}, + {"kernel not configured for message queues\n", 1670}, + {"------ Messages: Limits --------\n", 1671}, + {"max queues system wide = %d\n", 1672}, + {"max size of message (bytes) = %d\n", 1673}, + {"default max size of queue (bytes) = %d\n", 1674}, + {"------ Messages: Status --------\n", 1675}, + {"allocated queues = %d\n", 1676}, + {"used headers = %d\n", 1677}, + {"used space = %d bytes\n", 1678}, + {"------ Message Queues: Creators/Owners --------\n", 1679}, + {"msqid", 1680}, + {"------ Message Queues Send/Recv/Change Times --------\n", 1681}, + {"%-8s %-10s %-20s %-20s %-20s\n", 1682}, + {"send", 1683}, + {"recv", 1684}, + {"change", 1685}, + {"------ Message Queues PIDs --------\n", 1686}, + {"lspid", 1687}, + {"lrpid", 1688}, + {"------ Message Queues --------\n", 1689}, + {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1690}, + {"used-bytes", 1691}, + {"messages", 1692}, {"\ \n\ -Shared memory Segment shmid=%d\n", 1690}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1691}, - {"mode=%#o\taccess_perms=%#o\n", 1692}, - {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1693}, - {"att_time=%-26.24s\n", 1694}, - {"det_time=%-26.24s\n", 1695}, - {"change_time=%-26.24s\n", 1696}, +Shared memory Segment shmid=%d\n", 1693}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1694}, + {"mode=%#o\taccess_perms=%#o\n", 1695}, + {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1696}, + {"att_time=%-26.24s\n", 1697}, + {"det_time=%-26.24s\n", 1698}, + {"change_time=%-26.24s\n", 1699}, {"\ \n\ -Message Queue msqid=%d\n", 1697}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1698}, - {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1699}, - {"send_time=%-26.24s\n", 1700}, - {"rcv_time=%-26.24s\n", 1701}, +Message Queue msqid=%d\n", 1700}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1701}, + {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1702}, + {"send_time=%-26.24s\n", 1703}, + {"rcv_time=%-26.24s\n", 1704}, {"\ \n\ -Semaphore Array semid=%d\n", 1702}, - {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1703}, - {"mode=%#o, access_perms=%#o\n", 1704}, - {"nsems = %ld\n", 1705}, - {"otime = %-26.24s\n", 1706}, - {"ctime = %-26.24s\n", 1707}, - {"%-10s %-10s %-10s %-10s %-10s\n", 1708}, - {"semnum", 1709}, - {"value", 1710}, - {"ncount", 1711}, - {"zcount", 1712}, - {"pid", 1713}, - {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1714}, - {"\ - rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1715}, - {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1716}, - {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1717}, - {" rdev -r /dev/fd0 627 set the RAMDISK size", 1718}, - {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1719}, - {" rdev -o N ... use the byte offset N", 1720}, - {" rootflags ... same as rdev -R", 1721}, - {" ramsize ... same as rdev -r", 1722}, - {" vidmode ... same as rdev -v", 1723}, - {"\ -Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1724}, - {" use -R 1 to mount root readonly, -R 0 for read/write.", 1725}, - {"missing comma", 1726}, +Semaphore Array semid=%d\n", 1705}, + {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1706}, + {"mode=%#o, access_perms=%#o\n", 1707}, + {"nsems = %ld\n", 1708}, + {"otime = %-26.24s\n", 1709}, + {"ctime = %-26.24s\n", 1710}, + {"%-10s %-10s %-10s %-10s %-10s\n", 1711}, + {"semnum", 1712}, + {"value", 1713}, + {"ncount", 1714}, + {"zcount", 1715}, + {"pid", 1716}, + {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1717}, + {"\ + rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1718}, + {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1719}, + {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1720}, + {" rdev -r /dev/fd0 627 set the RAMDISK size", 1721}, + {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1722}, + {" rdev -o N ... use the byte offset N", 1723}, + {" rootflags ... same as rdev -R", 1724}, + {" ramsize ... same as rdev -r", 1725}, + {" vidmode ... same as rdev -v", 1726}, + {"\ +Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1727}, + {" use -R 1 to mount root readonly, -R 0 for read/write.", 1728}, + {"missing comma", 1729}, {"\ %s: Usage: \"%s [options]\n\ \t -m (default = \"%s\")\n\ @@ -2248,108 +2253,108 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1 \t -a print all symbols, even if count is 0\n\ \t -r reset all the counters (root only)\n\ \t -n disable byte order auto-detection\n\ -\t -V print version and exit\n", 1727}, - {"out of memory", 1728}, - {"%s Version %s\n", 1729}, - {"Sampling_step: %i\n", 1730}, - {"%s: %s(%i): wrong map line\n", 1731}, - {"%s: can't find \"_stext\" in %s\n", 1732}, - {"%s: profile address out of range. Wrong map file?\n", 1733}, - {"total", 1734}, - {"\ -usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1735}, - {"renice: %s: unknown user\n", 1736}, - {"renice: %s: bad value\n", 1737}, - {"getpriority", 1738}, - {"setpriority", 1739}, - {"%d: old priority %d, new priority %d\n", 1740}, - {"usage: %s program [arg ...]\n", 1741}, +\t -V print version and exit\n", 1730}, + {"out of memory", 1731}, + {"%s Version %s\n", 1732}, + {"Sampling_step: %i\n", 1733}, + {"%s: %s(%i): wrong map line\n", 1734}, + {"%s: can't find \"_stext\" in %s\n", 1735}, + {"%s: profile address out of range. Wrong map file?\n", 1736}, + {"total", 1737}, + {"\ +usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1738}, + {"renice: %s: unknown user\n", 1739}, + {"renice: %s: bad value\n", 1740}, + {"getpriority", 1741}, + {"setpriority", 1742}, + {"%d: old priority %d, new priority %d\n", 1743}, + {"usage: %s program [arg ...]\n", 1744}, {"\ Usage: %s [ -i | -t