From a2c5f3cadcfd2ceab9d37fc847fa0d800a95633a Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 7 Dec 2006 00:25:56 +0100 Subject: [PATCH] Imported from util-linux-2.11r tarball. --- HISTORY | 17 +- MCONFIG | 5 +- VERSION | 2 +- disk-utils/mkswap.c | 4 +- fdisk/README.fdisk | 2 +- fdisk/cfdisk.c | 1 - fdisk/common.h | 11 + fdisk/fdisk.c | 30 +- fdisk/fdiskbsdlabel.c | 2 - fdisk/fdiskbsdlabel.h | 2 +- fdisk/fdisksgilabel.c | 1 - fdisk/fdisksunlabel.c | 1 - fdisk/sfdisk.c | 5 +- hwclock/hwclock.8 | 20 +- login-utils/login.1 | 7 +- misc-utils/cal.c | 2 +- po/cat-id-tbl.c | 685 ++++----- po/cs.po | 1581 ++++++++++---------- po/da.po | 1581 ++++++++++---------- po/de.po | 3207 +++++++++++++++++++++-------------------- po/es.po | 1640 ++++++++++----------- po/et.po | 2346 ++++++++++++++++-------------- po/fr.po | 1581 ++++++++++---------- po/it.po | 1581 ++++++++++---------- po/ja.po | 1581 ++++++++++---------- po/nl.po | 1581 ++++++++++---------- po/pt_BR.po | 1581 ++++++++++---------- po/sv.po | 1649 ++++++++++----------- po/tr.po | 1641 ++++++++++----------- sys-utils/ipcrm.c | 1 + 30 files changed, 11393 insertions(+), 10955 deletions(-) diff --git a/HISTORY b/HISTORY index b07312da..8fed606b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,18 @@ +util-linux 2.11r + +* Estonian messages (Meelis Roos) +* No French messages with permission to distribute (Michel Robitaille) +* German messages (Michael Piefel) +* Spanish messages (Santiago Vila Doncel) +* Swedish messages (Christian Rose) +* Turkish messages (Nilgün Belma Bugüner) +* MCONFIG: move $(CFLAGS) to the end to allow overrides (Kevin P. Fleming) +* cal: tiny fix (Mitsuru Chinen) +* fdisk: avoid +* fdisk: x86_64 patch (Mads Martin Jørgensen) +* hwclock.8: zoneinfo is now in /usr/share +* mkswap: report in KiB instead of bytes. + util-linux 2.11q * fdisk: geometry improvement @@ -17,7 +32,7 @@ util-linux 2.11p * ipcrm: make POSIX compatible (Andre Corwin Mazzone) * ipcrm.8: idem * kill: fixed Makefile -* login: setsid fixes(?) +* login: setsid fixes * mkswap: max size of swap space is very large (Peter Chubb) * mount: JFS support for mount-by-label (hch) * nfsmount: check for (hch) diff --git a/MCONFIG b/MCONFIG index 54e5e6d6..e09ec2af 100644 --- a/MCONFIG +++ b/MCONFIG @@ -198,14 +198,15 @@ INSTALLMAN= $(INSTALL) -m $(MANMODE) INSTALLDAT= $(INSTALL) -m $(DATMODE) INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root -CFLAGS := $(CFLAGS) $(OPT) -I$(LIB) $(WARNFLAGS) \ +CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \ $(CURSESFLAGS) $(SLANGFLAGS) \ -D_FILE_OFFSET_BITS=64 \ -DSBINDIR=\"$(SBIN_DIR)\" \ -DUSRSBINDIR=\"$(USRSBIN_DIR)\" \ -DLOGDIR=\"$(LOG_DIR)\" \ -DVARPATH=\"$(VAR_PATH)\" \ - -DLOCALEDIR=\"$(LOCALE_DIR)\" + -DLOCALEDIR=\"$(LOCALE_DIR)\" \ + $(CFLAGS) %.o: %.c diff --git a/VERSION b/VERSION index 462c6ad9..cb5cbc12 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.11q +2.11r diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index b02e8ff9..69d1872c 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -608,8 +608,8 @@ the -f option to force it.\n"), goodpages = PAGES - badpages - 1; if (goodpages <= 0) die(_("Unable to set up swap-space: unreadable")); - printf(_("Setting up swapspace version %d, size = %lu bytes\n"), - version, (unsigned long)goodpages * pagesize); + printf(_("Setting up swapspace version %d, size = %lu KiB\n"), + version, (unsigned long)goodpages * pagesize / 1024); write_signature((version == 0) ? "SWAP-SPACE" : "SWAPSPACE2"); offset = ((version == 0) ? 0 : 1024); diff --git a/fdisk/README.fdisk b/fdisk/README.fdisk index b02d6aa2..69cfff67 100644 --- a/fdisk/README.fdisk +++ b/fdisk/README.fdisk @@ -165,7 +165,7 @@ file system. You may prefer to have a separate partition for `/usr', which contains most of the executable files, or for `/home', which contains most of your private files. You may also wish to set aside a partition to use for swap space, depending on the amount of memory your -PC has. You will certainly need swap space if you have less than 4 Mb +PC has. You will certainly need swap space if you have less than 4 MB of RAM and wish to compile anything substantial. You can reserve swap space in a file, but you need a partition big enough to hold it, and this will probably be less efficient than having a partition devoted to diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index d69dba5e..e6007766 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -77,7 +77,6 @@ #include #include #include -#include #include "nls.h" #include "xstrncpy.h" diff --git a/fdisk/common.h b/fdisk/common.h index 86802c41..0e5da96c 100644 --- a/fdisk/common.h +++ b/fdisk/common.h @@ -7,6 +7,17 @@ #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ #define BLKSSZGET _IO(0x12,104) /* get block device sector size */ +/* including also fails */ +struct hd_geometry { + unsigned char heads; + unsigned char sectors; + unsigned short cylinders; + unsigned long start; +}; + +#define HDIO_GETGEO 0x0301 /* get device geometry */ + + struct systypes { unsigned char type; char *name; diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c index ce0bdaba..8000bd27 100644 --- a/fdisk/fdisk.c +++ b/fdisk/fdisk.c @@ -29,8 +29,6 @@ #include #include -#include /* for HDIO_GETGEO */ - #include "nls.h" #include "common.h" #include "fdisk.h" @@ -179,6 +177,7 @@ int sun_label = 0; /* looking at sun disklabel */ int sgi_label = 0; /* looking at sgi disklabel */ int aix_label = 0; /* looking at aix disklabel */ int osf_label = 0; /* looking at osf disklabel */ + jmp_buf listingbuf; void fatal(enum failure why) { @@ -459,14 +458,16 @@ static int get_sysid(int i) { return ( sun_label ? sunlabel->infos[i].id : - sgi_label ? sgi_get_sysid(i) : ptes[i].part_table->sys_ind); + sgi_label ? sgi_get_sysid(i) : + ptes[i].part_table->sys_ind); } static struct systypes * get_sys_types(void) { return ( sun_label ? sun_sys_types : - sgi_label ? sgi_sys_types : i386_sys_types); + sgi_label ? sgi_sys_types : + i386_sys_types); } char *partition_type(unsigned char type) @@ -707,7 +708,6 @@ create_doslabel(void) { _("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")); - sun_nolabel(); /* otherwise always recognised as sun */ sgi_nolabel(); /* otherwise always recognised as sgi */ aix_label = osf_label = 0; @@ -810,9 +810,7 @@ get_geometry(int fd, struct geom *g) { get_sectorsize(fd); sec_fac = sector_size / 512; - guess_device_type(fd); - heads = cylinders = sectors = 0; kern_heads = kern_sectors = 0; pt_heads = pt_sectors = 0; @@ -1126,13 +1124,13 @@ get_partition(int warn, int max) { i = read_int(1, 0, max, 0, _("Partition number")) - 1; pe = &ptes[i]; - if (warn && ( - (!sun_label && !sgi_label && !pe->part_table->sys_ind) + if (warn + && ((!sun_label && !sgi_label && !pe->part_table->sys_ind) || (sun_label && (!sunlabel->partitions[i].num_sectors || !sunlabel->infos[i].id)) - || (sgi_label && (!sgi_get_num_sectors(i))) - )) fprintf(stderr, _("Warning: partition %d has empty type\n"), i+1); + || (sgi_label && (!sgi_get_num_sectors(i)))) + ) fprintf(stderr, _("Warning: partition %d has empty type\n"), i+1); return i; } @@ -1295,7 +1293,6 @@ change_sysid(void) { "as IRIX expects it.\n\n")); if (sys == origsys) break; - if (sun_label) { sun_change_sysid(i, sys); } else @@ -1970,7 +1967,8 @@ write_table(void) { write_sector(fd, pe->offset, pe->sectorbuffer); } } - } else if (sgi_label) { + } + else if (sgi_label) { /* no test on change? the printf below might be mistaken */ sgi_write_table(); } else if (sun_label) { @@ -2105,7 +2103,7 @@ xselect(void) { break; case 'c': user_cylinders = cylinders = - read_int(1, cylinders, 131071, 0, + read_int(1, cylinders, 1048576, 0, _("Number of cylinders")); if (sun_label) sun_set_ncyl(cylinders); @@ -2120,7 +2118,8 @@ xselect(void) { sgi_set_xcyl(); else if (sun_label) sun_set_xcyl(); - else if (dos_label) + else + if (dos_label) x_list_table(1); break; case 'f': @@ -2409,7 +2408,6 @@ main(int argc, char **argv) { bselect(); } #endif - while (1) { putchar('\n'); c = tolower(read_char(_("Command (m for help): "))); diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c index a47b7d5d..60029b91 100644 --- a/fdisk/fdiskbsdlabel.c +++ b/fdisk/fdiskbsdlabel.c @@ -55,8 +55,6 @@ #include #include -#include /* for HDIO_GETGEO */ - #include "common.h" #include "fdisk.h" #define FREEBSD_PARTITION 0xa5 diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h index c2e4bb98..2421585e 100644 --- a/fdisk/fdiskbsdlabel.h +++ b/fdisk/fdiskbsdlabel.h @@ -43,7 +43,7 @@ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" -#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) +#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) #define BSD_LABELSECTOR 1 #define BSD_LABELOFFSET 0 #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c index 11ff31b9..f5f7373d 100644 --- a/fdisk/fdisksgilabel.c +++ b/fdisk/fdisksgilabel.c @@ -20,7 +20,6 @@ #include #include "nls.h" #include /* FLOPPY_MAJOR */ -#include /* HDIO_GETGEO */ #include "common.h" #include "fdisk.h" diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c index b4968676..0036c109 100644 --- a/fdisk/fdisksunlabel.c +++ b/fdisk/fdisksunlabel.c @@ -26,7 +26,6 @@ #undef u_char #endif #include /* FLOPPY_MAJOR */ -#include /* HDIO_GETGEO */ #include "common.h" #include "fdisk.h" diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c index ddd553dd..a3549028 100644 --- a/fdisk/sfdisk.c +++ b/fdisk/sfdisk.c @@ -47,7 +47,6 @@ #include #include #include /* _syscall */ -#include /* HDIO_GETGEO */ #include "nls.h" #include "common.h" @@ -131,7 +130,7 @@ fatal(char *s, ...) { * * Note: we use 512-byte sectors here, irrespective of the hardware ss. */ -#if !defined (__alpha__) && !defined (__ia64__) +#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) static _syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, loff_t *, res, uint, wh); @@ -143,7 +142,7 @@ sseek(char *dev, unsigned int fd, unsigned long s) { in = ((loff_t) s << 9); out = 1; -#if !defined (__alpha__) && !defined (__ia64__) +#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) { #else if ((out = lseek(fd, in, SEEK_SET)) != in) { diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8 index d8cf5b03..d62f5035 100644 --- a/hwclock/hwclock.8 +++ b/hwclock/hwclock.8 @@ -68,7 +68,7 @@ Set the System Time from the Hardware Clock. Also set the kernel's timezone value to the local timezone as indicated by the TZ environment variable and/or -.IR /usr/lib/zoneinfo , +.IR /usr/share/zoneinfo , as .BR tzset (3) would interpret them. @@ -107,16 +107,16 @@ option for details. Print the version of .B hwclock on Standard Output. -.br -You need the following option if you specify -.B \-\-set -option. Otherwise, it is ignored. .TP .B \-\-date=date_string -Specifies the time to which to set the Hardware Clock. The value of this -option is an argument to the +You need this option if you specify the +.B \-\-set +option. Otherwise, it is ignored. +This specifies the time to which to set the Hardware Clock. +The value of this option is an argument to the .BR date (1) -program. For example, +program. +For example, .sp .I hwclock --set --date="9/22/96 16:45:05" .sp @@ -573,7 +573,9 @@ ISA" method of accessing the Hardware Clock. .SH FILES .I /etc/adjtime -.I /usr/lib/zoneinfo/ +.I /usr/share/zoneinfo/ +.RI ( /usr/lib/zoneinfo +on old systems) .I /dev/rtc .I /dev/port .I /dev/tty1 diff --git a/login-utils/login.1 b/login-utils/login.1 index d21a41ef..17b26933 100644 --- a/login-utils/login.1 +++ b/login-utils/login.1 @@ -115,10 +115,11 @@ of a tty device without the /dev/ prefix must be specified on each line. If the file does not exist, root is allowed to log in on any tty. .PP -The file +On most modern Linux systems PAM (Pluggable Authentication Modules) +is used. On systems that do not use PAM, the file .I /etc/usertty -specifies additional access restrictions for specific users. If this -file does not exist, no additional access restrictions are +specifies additional access restrictions for specific users. +If this file does not exist, no additional access restrictions are imposed. The file consists of a sequence of sections. There are three possible section types: CLASSES, GROUPS and USERS. A CLASSES section defines classes of ttys and hostname patterns, A GROUPS section diff --git a/misc-utils/cal.c b/misc-utils/cal.c index b71a72e8..d017f2b1 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -222,7 +222,7 @@ main(int argc, char **argv) { #endif yflag = 0; - while ((ch = getopt(argc, argv, "13mjyV")) != -1) + while ((ch = getopt(argc, argv, "13mjsyV")) != -1) switch(ch) { case '1': num_months = 1; /* default */ diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index f187b10a..e87d3b6f 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -225,7 +225,7 @@ This probably means creating v0 swap would destroy your partition table\n\ No swap created. If you really want to create swap v0 on that device, use\n\ the -f option to force it.\n", 189}, {"Unable to set up swap-space: unreadable", 190}, - {"Setting up swapspace version %d, size = %lu bytes\n", 191}, + {"Setting up swapspace version %d, size = %lu KiB\n", 191}, {"unable to rewind swap-device", 192}, {"unable to write signature page", 193}, {"fsync failed", 194}, @@ -1953,14 +1953,16 @@ mount: the kernel does not recognize %s as a block device\n\ {"mount: cannot mount %s%s read-only", 1495}, {"mount: %s%s is write-protected but explicit `-w' flag given", 1496}, {"mount: %s%s is write-protected, mounting read-only", 1497}, - {"mount: going to mount %s by %s\n", 1498}, - {"UUID", 1499}, - {"label", 1500}, - {"mount: no such partition found", 1501}, - {"mount: no type was given - I'll assume nfs because of the colon\n", 1502}, - {"mount: backgrounding \"%s\"\n", 1503}, - {"mount: giving up \"%s\"\n", 1504}, - {"mount: %s already mounted on %s\n", 1505}, + {"mount: the label %s occurs on both %s and %s\n", 1498}, + {"mount: %s duplicate - not mounted", 1499}, + {"mount: going to mount %s by %s\n", 1500}, + {"UUID", 1501}, + {"label", 1502}, + {"mount: no such partition found", 1503}, + {"mount: no type was given - I'll assume nfs because of the colon\n", 1504}, + {"mount: backgrounding \"%s\"\n", 1505}, + {"mount: giving up \"%s\"\n", 1506}, + {"mount: %s already mounted on %s\n", 1507}, {"\ Usage: mount -V : print version\n\ mount -h : print this help\n\ @@ -1982,284 +1984,285 @@ or move a subtree:\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", 1506}, - {"mount: only root can do that", 1507}, - {"mount: no %s found - creating it..\n", 1508}, - {"mount: mounting %s\n", 1509}, - {"nothing was mounted", 1510}, - {"mount: cannot find %s in %s", 1511}, - {"mount: can't find %s in %s or %s", 1512}, - {"\ -mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1513}, - {"mount: bad UUID", 1514}, - {"mount: error while guessing filesystem type\n", 1515}, - {"mount: you didn't specify a filesystem type for %s\n", 1516}, - {" I will try all types mentioned in %s or %s\n", 1517}, - {" and it looks like this is swapspace\n", 1518}, - {" I will try type %s\n", 1519}, - {"Trying %s\n", 1520}, - {"mount: excessively long host:dir argument\n", 1521}, - {"mount: warning: multiple hostnames not supported\n", 1522}, - {"mount: directory to mount not in host:dir format\n", 1523}, - {"mount: can't get address for %s\n", 1524}, - {"mount: got bad hp->h_length\n", 1525}, - {"mount: excessively long option argument\n", 1526}, - {"Warning: Unrecognized proto= option.\n", 1527}, - {"Warning: Option namlen is not supported.\n", 1528}, - {"unknown nfs mount parameter: %s=%d\n", 1529}, - {"Warning: option nolock is not supported.\n", 1530}, - {"unknown nfs mount option: %s%s\n", 1531}, - {"mount: got bad hp->h_length?\n", 1532}, - {"NFS over TCP is not supported.\n", 1533}, - {"nfs socket", 1534}, - {"nfs bindresvport", 1535}, - {"nfs server reported service unavailable", 1536}, - {"used portmapper to find NFS port\n", 1537}, - {"using port %d for nfs deamon\n", 1538}, - {"nfs connect", 1539}, - {"unknown nfs status return value: %d", 1540}, - {"bug in xstrndup call", 1541}, +For many more details, say man 8 mount .\n", 1508}, + {"mount: only root can do that", 1509}, + {"mount: no %s found - creating it..\n", 1510}, + {"mount: the label %s occurs on both %s and %s - not mounted\n", 1511}, + {"mount: mounting %s\n", 1512}, + {"nothing was mounted", 1513}, + {"mount: cannot find %s in %s", 1514}, + {"mount: can't find %s in %s or %s", 1515}, + {"\ +mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1516}, + {"mount: bad UUID", 1517}, + {"mount: error while guessing filesystem type\n", 1518}, + {"mount: you didn't specify a filesystem type for %s\n", 1519}, + {" I will try all types mentioned in %s or %s\n", 1520}, + {" and it looks like this is swapspace\n", 1521}, + {" I will try type %s\n", 1522}, + {"Trying %s\n", 1523}, + {"mount: excessively long host:dir argument\n", 1524}, + {"mount: warning: multiple hostnames not supported\n", 1525}, + {"mount: directory to mount not in host:dir format\n", 1526}, + {"mount: can't get address for %s\n", 1527}, + {"mount: got bad hp->h_length\n", 1528}, + {"mount: excessively long option argument\n", 1529}, + {"Warning: Unrecognized proto= option.\n", 1530}, + {"Warning: Option namlen is not supported.\n", 1531}, + {"unknown nfs mount parameter: %s=%d\n", 1532}, + {"Warning: option nolock is not supported.\n", 1533}, + {"unknown nfs mount option: %s%s\n", 1534}, + {"mount: got bad hp->h_length?\n", 1535}, + {"NFS over TCP is not supported.\n", 1536}, + {"nfs socket", 1537}, + {"nfs bindresvport", 1538}, + {"nfs server reported service unavailable", 1539}, + {"used portmapper to find NFS port\n", 1540}, + {"using port %d for nfs deamon\n", 1541}, + {"nfs connect", 1542}, + {"unknown nfs status return value: %d", 1543}, + {"bug in xstrndup call", 1544}, {"\ usage: %s [-hV]\n\ %s -a [-v]\n\ %s [-v] [-p priority] special ...\n\ - %s [-s]\n", 1542}, - {"%s on %s\n", 1543}, - {"swapon: cannot stat %s: %s\n", 1544}, - {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1545}, - {"swapon: Skipping file %s - it appears to have holes.\n", 1546}, - {"%s: cannot open %s: %s\n", 1547}, - {"umount: compiled without support for -f\n", 1548}, - {"host: %s, directory: %s\n", 1549}, - {"umount: can't get address for %s\n", 1550}, - {"umount: got bad hostp->h_length\n", 1551}, - {"umount: %s: invalid block device", 1552}, - {"umount: %s: not mounted", 1553}, - {"umount: %s: can't write superblock", 1554}, - {"umount: %s: device is busy", 1555}, - {"umount: %s: not found", 1556}, - {"umount: %s: must be superuser to umount", 1557}, - {"umount: %s: block devices not permitted on fs", 1558}, - {"umount: %s: %s", 1559}, - {"no umount2, trying umount...\n", 1560}, - {"could not umount %s - trying %s instead\n", 1561}, - {"umount: %s busy - remounted read-only\n", 1562}, - {"umount: could not remount %s read-only\n", 1563}, - {"%s umounted\n", 1564}, - {"umount: cannot find list of filesystems to unmount", 1565}, + %s [-s]\n", 1545}, + {"%s on %s\n", 1546}, + {"swapon: cannot stat %s: %s\n", 1547}, + {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1548}, + {"swapon: Skipping file %s - it appears to have holes.\n", 1549}, + {"%s: cannot open %s: %s\n", 1550}, + {"umount: compiled without support for -f\n", 1551}, + {"host: %s, directory: %s\n", 1552}, + {"umount: can't get address for %s\n", 1553}, + {"umount: got bad hostp->h_length\n", 1554}, + {"umount: %s: invalid block device", 1555}, + {"umount: %s: not mounted", 1556}, + {"umount: %s: can't write superblock", 1557}, + {"umount: %s: device is busy", 1558}, + {"umount: %s: not found", 1559}, + {"umount: %s: must be superuser to umount", 1560}, + {"umount: %s: block devices not permitted on fs", 1561}, + {"umount: %s: %s", 1562}, + {"no umount2, trying umount...\n", 1563}, + {"could not umount %s - trying %s instead\n", 1564}, + {"umount: %s busy - remounted read-only\n", 1565}, + {"umount: could not remount %s read-only\n", 1566}, + {"%s umounted\n", 1567}, + {"umount: cannot find list of filesystems to unmount", 1568}, {"\ Usage: umount [-hV]\n\ umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n\ - umount [-f] [-r] [-n] [-v] special | node...\n", 1566}, - {"Trying to umount %s\n", 1567}, - {"Could not find %s in mtab\n", 1568}, - {"umount: %s is not mounted (according to mtab)", 1569}, - {"umount: it seems %s is mounted multiple times", 1570}, - {"umount: %s is not in the fstab (and you are not root)", 1571}, - {"umount: %s mount disagrees with the fstab", 1572}, - {"umount: only root can unmount %s from %s", 1573}, - {"umount: only root can do that", 1574}, - {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1575}, - {"Usage: ctrlaltdel hard|soft\n", 1576}, + umount [-f] [-r] [-n] [-v] special | node...\n", 1569}, + {"Trying to umount %s\n", 1570}, + {"Could not find %s in mtab\n", 1571}, + {"umount: %s is not mounted (according to mtab)", 1572}, + {"umount: it seems %s is mounted multiple times", 1573}, + {"umount: %s is not in the fstab (and you are not root)", 1574}, + {"umount: %s mount disagrees with the fstab", 1575}, + {"umount: only root can unmount %s from %s", 1576}, + {"umount: only root can do that", 1577}, + {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1578}, + {"Usage: ctrlaltdel hard|soft\n", 1579}, {"\ File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\ -and the maximum transfer rate in characters/second was %f\n", 1577}, +and the maximum transfer rate in characters/second was %f\n", 1580}, {"\ 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", 1578}, - {"Invalid interval value: %s\n", 1579}, - {"Invalid set value: %s\n", 1580}, - {"Invalid default value: %s\n", 1581}, - {"Invalid set time value: %s\n", 1582}, - {"Invalid default time value: %s\n", 1583}, +and the maximum transfer rate in characters/second was %f\n", 1581}, + {"Invalid interval value: %s\n", 1582}, + {"Invalid set value: %s\n", 1583}, + {"Invalid default value: %s\n", 1584}, + {"Invalid set time value: %s\n", 1585}, + {"Invalid default time value: %s\n", 1586}, {"\ Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \ -[-g|-G] file [file...]\n", 1584}, - {"Can't open %s: %s\n", 1585}, - {"Can't set %s to threshold %d: %s\n", 1586}, - {"Can't set %s to time threshold %d: %s\n", 1587}, - {"Can't get threshold for %s: %s\n", 1588}, - {"Can't get timeout for %s: %s\n", 1589}, - {"%s: %ld current threshold and %ld current timeout\n", 1590}, - {"%s: %ld default threshold and %ld default timeout\n", 1591}, - {"Can't set signal handler", 1592}, - {"gettimeofday failed", 1593}, - {"Can't issue CYGETMON on %s: %s\n", 1594}, - {"\ -%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1595}, - {" %f int/sec; %f rec, %f send (char/sec)\n", 1596}, - {"\ -%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1597}, - {" %f int/sec; %f rec (char/sec)\n", 1598}, - {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1599}, - {"invalid id: %s\n", 1600}, - {"cannot remove id %s (%s)\n", 1601}, - {"deprecated usage: %s {shm | msg | sem} id ...\n", 1602}, - {"unknown resource type: %s\n", 1603}, - {"resource(s) deleted\n", 1604}, +[-g|-G] file [file...]\n", 1587}, + {"Can't open %s: %s\n", 1588}, + {"Can't set %s to threshold %d: %s\n", 1589}, + {"Can't set %s to time threshold %d: %s\n", 1590}, + {"Can't get threshold for %s: %s\n", 1591}, + {"Can't get timeout for %s: %s\n", 1592}, + {"%s: %ld current threshold and %ld current timeout\n", 1593}, + {"%s: %ld default threshold and %ld default timeout\n", 1594}, + {"Can't set signal handler", 1595}, + {"gettimeofday failed", 1596}, + {"Can't issue CYGETMON on %s: %s\n", 1597}, + {"\ +%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1598}, + {" %f int/sec; %f rec, %f send (char/sec)\n", 1599}, + {"\ +%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1600}, + {" %f int/sec; %f rec (char/sec)\n", 1601}, + {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1602}, + {"invalid id: %s\n", 1603}, + {"cannot remove id %s (%s)\n", 1604}, + {"deprecated usage: %s {shm | msg | sem} id ...\n", 1605}, + {"unknown resource type: %s\n", 1606}, + {"resource(s) deleted\n", 1607}, {"\ usage: %s [ [-q msqid] [-m shmid] [-s semid]\n\ - [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1605}, - {"%s: illegal option -- %c\n", 1606}, - {"%s: illegal key (%s)\n", 1607}, - {"permission denied for key", 1608}, - {"already removed key", 1609}, - {"invalid key", 1610}, - {"unknown error in key", 1611}, - {"permission denied for id", 1612}, - {"invalid id", 1613}, - {"already removed id", 1614}, - {"unknown error in id", 1615}, - {"%s: %s (%s)\n", 1616}, - {"%s: unknown argument: %s\n", 1617}, - {"usage : %s -asmq -tclup \n", 1618}, - {"\t%s [-s -m -q] -i id\n", 1619}, - {"\t%s -h for help.\n", 1620}, - {"\ -%s provides information on ipc facilities for which you have read access.\n", 1621}, + [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1608}, + {"%s: illegal option -- %c\n", 1609}, + {"%s: illegal key (%s)\n", 1610}, + {"permission denied for key", 1611}, + {"already removed key", 1612}, + {"invalid key", 1613}, + {"unknown error in key", 1614}, + {"permission denied for id", 1615}, + {"invalid id", 1616}, + {"already removed id", 1617}, + {"unknown error in id", 1618}, + {"%s: %s (%s)\n", 1619}, + {"%s: unknown argument: %s\n", 1620}, + {"usage : %s -asmq -tclup \n", 1621}, + {"\t%s [-s -m -q] -i id\n", 1622}, + {"\t%s -h for help.\n", 1623}, + {"\ +%s provides information on ipc facilities for which you have read access.\n", 1624}, {"\ Resource Specification:\n\ \t-m : shared_mem\n\ -\t-q : messages\n", 1622}, +\t-q : messages\n", 1625}, {"\ \t-s : semaphores\n\ -\t-a : all (default)\n", 1623}, +\t-a : all (default)\n", 1626}, {"\ Output Format:\n\ \t-t : time\n\ \t-p : pid\n\ -\t-c : creator\n", 1624}, +\t-c : creator\n", 1627}, {"\ \t-l : limits\n\ -\t-u : summary\n", 1625}, - {"-i id [-s -q -m] : details on resource identified by id\n", 1626}, - {"kernel not configured for shared memory\n", 1627}, - {"------ Shared Memory Limits --------\n", 1628}, - {"max number of segments = %ld\n", 1629}, - {"max seg size (kbytes) = %ld\n", 1630}, - {"max total shared memory (kbytes) = %ld\n", 1631}, - {"min seg size (bytes) = %ld\n", 1632}, - {"------ Shared Memory Status --------\n", 1633}, - {"segments allocated %d\n", 1634}, - {"pages allocated %ld\n", 1635}, - {"pages resident %ld\n", 1636}, - {"pages swapped %ld\n", 1637}, - {"Swap performance: %ld attempts\t %ld successes\n", 1638}, - {"------ Shared Memory Segment Creators/Owners --------\n", 1639}, - {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1640}, - {"shmid", 1641}, - {"perms", 1642}, - {"cuid", 1643}, - {"cgid", 1644}, - {"uid", 1645}, - {"gid", 1646}, - {"------ Shared Memory Attach/Detach/Change Times --------\n", 1647}, - {"%-10s %-10s %-20s %-20s %-20s\n", 1648}, - {"owner", 1649}, - {"attached", 1650}, - {"detached", 1651}, - {"changed", 1652}, - {"------ Shared Memory Creator/Last-op --------\n", 1653}, - {"%-10s %-10s %-10s %-10s\n", 1654}, - {"cpid", 1655}, - {"lpid", 1656}, - {"------ Shared Memory Segments --------\n", 1657}, - {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1658}, - {"key", 1659}, - {"bytes", 1660}, - {"nattch", 1661}, - {"status", 1662}, - {"Not set", 1663}, - {"dest", 1664}, - {"locked", 1665}, - {"kernel not configured for semaphores\n", 1666}, - {"------ Semaphore Limits --------\n", 1667}, - {"max number of arrays = %d\n", 1668}, - {"max semaphores per array = %d\n", 1669}, - {"max semaphores system wide = %d\n", 1670}, - {"max ops per semop call = %d\n", 1671}, - {"semaphore max value = %d\n", 1672}, - {"------ Semaphore Status --------\n", 1673}, - {"used arrays = %d\n", 1674}, - {"allocated semaphores = %d\n", 1675}, - {"------ Semaphore Arrays Creators/Owners --------\n", 1676}, - {"semid", 1677}, - {"------ Shared Memory Operation/Change Times --------\n", 1678}, - {"%-8s %-10s %-26.24s %-26.24s\n", 1679}, - {"last-op", 1680}, - {"last-changed", 1681}, - {"------ Semaphore Arrays --------\n", 1682}, - {"%-10s %-10s %-10s %-10s %-10s %-12s\n", 1683}, - {"nsems", 1684}, - {"kernel not configured for message queues\n", 1685}, - {"------ Messages: Limits --------\n", 1686}, - {"max queues system wide = %d\n", 1687}, - {"max size of message (bytes) = %d\n", 1688}, - {"default max size of queue (bytes) = %d\n", 1689}, - {"------ Messages: Status --------\n", 1690}, - {"allocated queues = %d\n", 1691}, - {"used headers = %d\n", 1692}, - {"used space = %d bytes\n", 1693}, - {"------ Message Queues: Creators/Owners --------\n", 1694}, - {"msqid", 1695}, - {"------ Message Queues Send/Recv/Change Times --------\n", 1696}, - {"%-8s %-10s %-20s %-20s %-20s\n", 1697}, - {"send", 1698}, - {"recv", 1699}, - {"change", 1700}, - {"------ Message Queues PIDs --------\n", 1701}, - {"lspid", 1702}, - {"lrpid", 1703}, - {"------ Message Queues --------\n", 1704}, - {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1705}, - {"used-bytes", 1706}, - {"messages", 1707}, +\t-u : summary\n", 1628}, + {"-i id [-s -q -m] : details on resource identified by id\n", 1629}, + {"kernel not configured for shared memory\n", 1630}, + {"------ Shared Memory Limits --------\n", 1631}, + {"max number of segments = %ld\n", 1632}, + {"max seg size (kbytes) = %ld\n", 1633}, + {"max total shared memory (kbytes) = %ld\n", 1634}, + {"min seg size (bytes) = %ld\n", 1635}, + {"------ Shared Memory Status --------\n", 1636}, + {"segments allocated %d\n", 1637}, + {"pages allocated %ld\n", 1638}, + {"pages resident %ld\n", 1639}, + {"pages swapped %ld\n", 1640}, + {"Swap performance: %ld attempts\t %ld successes\n", 1641}, + {"------ Shared Memory Segment Creators/Owners --------\n", 1642}, + {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1643}, + {"shmid", 1644}, + {"perms", 1645}, + {"cuid", 1646}, + {"cgid", 1647}, + {"uid", 1648}, + {"gid", 1649}, + {"------ Shared Memory Attach/Detach/Change Times --------\n", 1650}, + {"%-10s %-10s %-20s %-20s %-20s\n", 1651}, + {"owner", 1652}, + {"attached", 1653}, + {"detached", 1654}, + {"changed", 1655}, + {"------ Shared Memory Creator/Last-op --------\n", 1656}, + {"%-10s %-10s %-10s %-10s\n", 1657}, + {"cpid", 1658}, + {"lpid", 1659}, + {"------ Shared Memory Segments --------\n", 1660}, + {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1661}, + {"key", 1662}, + {"bytes", 1663}, + {"nattch", 1664}, + {"status", 1665}, + {"Not set", 1666}, + {"dest", 1667}, + {"locked", 1668}, + {"kernel not configured for semaphores\n", 1669}, + {"------ Semaphore Limits --------\n", 1670}, + {"max number of arrays = %d\n", 1671}, + {"max semaphores per array = %d\n", 1672}, + {"max semaphores system wide = %d\n", 1673}, + {"max ops per semop call = %d\n", 1674}, + {"semaphore max value = %d\n", 1675}, + {"------ Semaphore Status --------\n", 1676}, + {"used arrays = %d\n", 1677}, + {"allocated semaphores = %d\n", 1678}, + {"------ Semaphore Arrays Creators/Owners --------\n", 1679}, + {"semid", 1680}, + {"------ Shared Memory Operation/Change Times --------\n", 1681}, + {"%-8s %-10s %-26.24s %-26.24s\n", 1682}, + {"last-op", 1683}, + {"last-changed", 1684}, + {"------ Semaphore Arrays --------\n", 1685}, + {"%-10s %-10s %-10s %-10s %-10s %-12s\n", 1686}, + {"nsems", 1687}, + {"kernel not configured for message queues\n", 1688}, + {"------ Messages: Limits --------\n", 1689}, + {"max queues system wide = %d\n", 1690}, + {"max size of message (bytes) = %d\n", 1691}, + {"default max size of queue (bytes) = %d\n", 1692}, + {"------ Messages: Status --------\n", 1693}, + {"allocated queues = %d\n", 1694}, + {"used headers = %d\n", 1695}, + {"used space = %d bytes\n", 1696}, + {"------ Message Queues: Creators/Owners --------\n", 1697}, + {"msqid", 1698}, + {"------ Message Queues Send/Recv/Change Times --------\n", 1699}, + {"%-8s %-10s %-20s %-20s %-20s\n", 1700}, + {"send", 1701}, + {"recv", 1702}, + {"change", 1703}, + {"------ Message Queues PIDs --------\n", 1704}, + {"lspid", 1705}, + {"lrpid", 1706}, + {"------ Message Queues --------\n", 1707}, + {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1708}, + {"used-bytes", 1709}, + {"messages", 1710}, {"\ \n\ -Shared memory Segment shmid=%d\n", 1708}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1709}, - {"mode=%#o\taccess_perms=%#o\n", 1710}, - {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1711}, - {"att_time=%-26.24s\n", 1712}, - {"det_time=%-26.24s\n", 1713}, - {"change_time=%-26.24s\n", 1714}, +Shared memory Segment shmid=%d\n", 1711}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1712}, + {"mode=%#o\taccess_perms=%#o\n", 1713}, + {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1714}, + {"att_time=%-26.24s\n", 1715}, + {"det_time=%-26.24s\n", 1716}, + {"change_time=%-26.24s\n", 1717}, {"\ \n\ -Message Queue msqid=%d\n", 1715}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1716}, - {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1717}, - {"send_time=%-26.24s\n", 1718}, - {"rcv_time=%-26.24s\n", 1719}, +Message Queue msqid=%d\n", 1718}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1719}, + {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1720}, + {"send_time=%-26.24s\n", 1721}, + {"rcv_time=%-26.24s\n", 1722}, {"\ \n\ -Semaphore Array semid=%d\n", 1720}, - {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1721}, - {"mode=%#o, access_perms=%#o\n", 1722}, - {"nsems = %ld\n", 1723}, - {"otime = %-26.24s\n", 1724}, - {"ctime = %-26.24s\n", 1725}, - {"%-10s %-10s %-10s %-10s %-10s\n", 1726}, - {"semnum", 1727}, - {"value", 1728}, - {"ncount", 1729}, - {"zcount", 1730}, - {"pid", 1731}, - {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1732}, - {"\ - rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1733}, - {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1734}, - {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1735}, - {" rdev -r /dev/fd0 627 set the RAMDISK size", 1736}, - {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1737}, - {" rdev -o N ... use the byte offset N", 1738}, - {" rootflags ... same as rdev -R", 1739}, - {" ramsize ... same as rdev -r", 1740}, - {" vidmode ... same as rdev -v", 1741}, - {"\ -Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1742}, - {" use -R 1 to mount root readonly, -R 0 for read/write.", 1743}, - {"missing comma", 1744}, +Semaphore Array semid=%d\n", 1723}, + {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1724}, + {"mode=%#o, access_perms=%#o\n", 1725}, + {"nsems = %ld\n", 1726}, + {"otime = %-26.24s\n", 1727}, + {"ctime = %-26.24s\n", 1728}, + {"%-10s %-10s %-10s %-10s %-10s\n", 1729}, + {"semnum", 1730}, + {"value", 1731}, + {"ncount", 1732}, + {"zcount", 1733}, + {"pid", 1734}, + {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1735}, + {"\ + rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1736}, + {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1737}, + {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1738}, + {" rdev -r /dev/fd0 627 set the RAMDISK size", 1739}, + {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1740}, + {" rdev -o N ... use the byte offset N", 1741}, + {" rootflags ... same as rdev -R", 1742}, + {" ramsize ... same as rdev -r", 1743}, + {" vidmode ... same as rdev -v", 1744}, + {"\ +Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1745}, + {" use -R 1 to mount root readonly, -R 0 for read/write.", 1746}, + {"missing comma", 1747}, {"\ %s: Usage: \"%s [options]\n\ \t -m (default = \"%s\")\n\ @@ -2270,108 +2273,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", 1745}, - {"out of memory", 1746}, - {"%s Version %s\n", 1747}, - {"Sampling_step: %i\n", 1748}, - {"%s: %s(%i): wrong map line\n", 1749}, - {"%s: can't find \"_stext\" in %s\n", 1750}, - {"%s: profile address out of range. Wrong map file?\n", 1751}, - {"total", 1752}, - {"\ -usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1753}, - {"renice: %s: unknown user\n", 1754}, - {"renice: %s: bad value\n", 1755}, - {"getpriority", 1756}, - {"setpriority", 1757}, - {"%d: old priority %d, new priority %d\n", 1758}, - {"usage: %s program [arg ...]\n", 1759}, +\t -V print version and exit\n", 1748}, + {"out of memory", 1749}, + {"%s Version %s\n", 1750}, + {"Sampling_step: %i\n", 1751}, + {"%s: %s(%i): wrong map line\n", 1752}, + {"%s: can't find \"_stext\" in %s\n", 1753}, + {"%s: profile address out of range. Wrong map file?\n", 1754}, + {"total", 1755}, + {"\ +usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1756}, + {"renice: %s: unknown user\n", 1757}, + {"renice: %s: bad value\n", 1758}, + {"getpriority", 1759}, + {"setpriority", 1760}, + {"%d: old priority %d, new priority %d\n", 1761}, + {"usage: %s program [arg ...]\n", 1762}, {"\ Usage: %s [ -i | -t