ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Imported from util-linux-2.12q-pre1 tarball.

This commit is contained in:
Karel Zak 2006-12-07 00:26:36 +01:00
parent bf3baa9907
commit cf3f26bf24
10 changed files with 4113 additions and 3309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY
View File

@ -1,3 +1,9 @@
util-linux 2.12q-pre1
* new maintainer
* sfdisk: add -G option (Andries Brouwer)
* updated translations: de, es, ru, sv, tr
util-linux 2.12p
* cfdisk: fix number of new partition when partitions not in disk order

3
MAINTAINER
View File

@ -1,5 +1,4 @@
Maintainer: Andries Brouwer <aeb@cwi.nl>
Use a Subject line with [util-linux] .
Maintainer: Adrian Bunk <bunk@stusta.de>
Maintainer of getopt: Frodo Looijaard <frodol@dds.nl>
Maintainer of simpleinit: Richard Gooch <rgooch@atnf.csiro.au>

2
VERSION
View File

@ -1 +1 @@
2.12p
2.12q-pre1

4
fdisk/sfdisk.8
View File

@ -167,6 +167,10 @@ List the size of a partition.
.BR \-g " or " \-\-show\-geometry
List the kernel's idea of the geometry of the indicated disk(s).
.TP
.BR \-G " or " \-\-show\-pt\-geometry
List the geometry of the indicated disks guessed by looking at
the partition table.
.TP
.BR \-l " or " \-\-list
List the partitions of a device.
.TP

50
fdisk/sfdisk.c
View File

@ -505,7 +505,7 @@ get_cylindersize(char *dev, int fd, int silent) {
"[Use the --force option if you really want this]\n"), R.start);
exit(1);
}
#if 0
if (R.heads && B.heads != R.heads)
warn(_("Warning: HDIO_GETGEO says that there are %lu heads\n"),
R.heads);
@ -516,6 +516,7 @@ get_cylindersize(char *dev, int fd, int silent) {
&& B.cylinders < 65536 && R.cylinders < 65536)
warn(_("Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"),
R.cylinders);
#endif
if (B.sectors > 63)
warn(_("Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@ -2353,7 +2354,7 @@ unhide_usage(char *progn) {
exit(1);
}
static char short_opts[] = "cdfgilnqsu:vx?1A::C:DH:I:LN:O:RS:TU::V";
static char short_opts[] = "cdfgilnqsu:vx?1A::C:DGH:I:LN:O:RS:TU::V";
#define PRINT_ID 0400
#define CHANGE_ID 01000
@ -2377,6 +2378,7 @@ static const struct option long_opts[] = {
{ "cylinders", required_argument, NULL, 'C' },
{ "heads", required_argument, NULL, 'H' },
{ "sectors", required_argument, NULL, 'S' },
{ "show-pt-geometry", no_argument, NULL, 'G' },
{ "activate", optional_argument, NULL, 'A' },
{ "DOS", no_argument, NULL, 'D' },
{ "DOS-extended", no_argument, NULL, 'E' },
@ -2480,6 +2482,7 @@ nextproc(void) {
static void do_list(char *dev, int silent);
static void do_size(char *dev, int silent);
static void do_geom(char *dev, int silent);
static void do_pt_geom(char *dev, int silent);
static void do_fdisk(char *dev);
static void do_reread(char *dev);
static void do_change_id(char *dev, char *part, char *id);
@ -2495,6 +2498,7 @@ main(int argc, char **argv) {
char *dev;
int opt_size = 0;
int opt_out_geom = 0;
int opt_out_pt_geom = 0;
int opt_reread = 0;
int activate = 0;
int do_id = 0;
@ -2528,6 +2532,8 @@ main(int argc, char **argv) {
force = 1; break; /* does not imply quiet */
case 'g':
opt_out_geom = 1; break;
case 'G':
opt_out_pt_geom = 1; break;
case 'i':
increment = 1; break;
case 'c':
@ -2610,7 +2616,8 @@ main(int argc, char **argv) {
}
}
if (optind == argc && (opt_list || opt_out_geom || opt_size || verify)) {
if (optind == argc &&
(opt_list || opt_out_geom || opt_out_pt_geom || opt_size || verify)) {
/* try all known devices */
total_size = 0;
openproc();
@ -2619,6 +2626,8 @@ main(int argc, char **argv) {
continue;
if (opt_out_geom)
do_geom(dev, 1);
if (opt_out_pt_geom)
do_pt_geom(dev, 1);
if (opt_size)
do_size(dev, 1);
if (opt_list || verify)
@ -2640,10 +2649,12 @@ main(int argc, char **argv) {
usage();
}
if (opt_list || opt_out_geom || opt_size || verify) {
if (opt_list || opt_out_geom || opt_out_pt_geom || opt_size || verify) {
while (optind < argc) {
if (opt_out_geom)
do_geom(argv[optind], 0);
if (opt_out_pt_geom)
do_pt_geom(argv[optind], 0);
if (opt_size)
do_size(argv[optind], 0);
if (opt_list || verify)
@ -2748,6 +2759,37 @@ do_geom (char *dev, int silent) {
dev, R.cylinders, R.heads, R.sectors);
}
static void
do_pt_geom (char *dev, int silent) {
int fd;
struct disk_desc *z;
struct geometry R;
fd = my_open(dev, 0, silent);
if (fd < 0)
return;
z = &oldp;
free_sectors();
get_cylindersize(dev, fd, 1);
get_partitions(dev, fd, z);
R = B;
if (z->partno != 0 && get_fdisk_geometry(z)) {
R.heads = F.heads;
R.sectors = F.sectors;
R.cylindersize = R.heads * R.sectors;
R.cylinders = (R.cylindersize == 0) ? 0 :
R.total_size / R.cylindersize;
}
if (R.cylinders)
printf(_("%s: %ld cylinders, %ld heads, %ld sectors/track\n"),
dev, R.cylinders, R.heads, R.sectors);
}
/* for compatibility with earlier fdisk: provide option -s */
static void
do_size (char *dev, int silent) {

45
po/de.po
View File

@ -3,55 +3,49 @@
# Michael Piefel <piefel@informatik.hu-berlin.de>, 2002, 2004.
# Karl Eichwalder <ke@suse.de>, 2001-2002.
# Elrond <Elrond@Wunder-Nett.org>, 1999-2001.
# Adrian Bunk <bunk@kernel.org>, 2004.
#
# Note:
# =====
# Changes done by Karl Eichwalder are put into the Public Domain.
# Mine too. MPi
#
# As requested here is the unmodified header:
#
# -=-=-=-=-=-=-=-=-=-=-=-=-=- cut here -=-=-=-=-=-=-=-=-=-=-=-=-=-
# German translation for util-linux.
# Copyright (C) 1999, 2000, 2001 Elrond <Elrond@Wunder-Nett.org>.
# Elrond <Elrond@Wunder-Nett.org>, 1999-2001.
#
# $Revision: 1.42 $
#
# Permission is granted to freely copy and distribute
# this file and modified versions, provided, that this
# header is not removed and modified versions are marked
# as such.
#
# If you have additions/changes/other requests, please
# send them to me (Elrond <Elrond@Wunder-Nett.org>)!
#
# People who helped or contributed (in historical order):
# Martin Schulze <joey@infodrom.north.de>
# Daniel Egger <Daniel.Egger@suse.de>
# deliA <deliA@Wunder-Nett.org>
#
# Martin Schulze <joey@infodrom.north.de>
# Daniel Egger <Daniel.Egger@suse.de>
# deliA <deliA@Wunder-Nett.org>
# Submitted to the TP 2001-07-18 14:32:47 CEST -ke-
#
# -=-=-=-=-=-=-=-=-=-=-=-=-=- cut here -=-=-=-=-=-=-=-=-=-=-=-=-=-
#
# Hinweise zur Übersetzung:
# =========================
# command – Befehl
# bad – beschädigt (z. B. „beschädigte Blöcke“)
# bzw. ungültig (z. B. „ungültige ‚magic number‘ im Superblock“)
#
# bzw. ungültig (z. B. „ungültige ‚magic number‘ im Superblock“)
# Michael Piefel <piefel@informatik.hu-berlin.de>, 2004.
#
#
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.12j\n"
"Project-Id-Version: util-linux 2.12q-pre1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-12-22 10:56+0100\n"
"PO-Revision-Date: 2004-12-13 14:51 +0100\n"
"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
"PO-Revision-Date: 2004-12-31 16:13+0100\n"
"Last-Translator: Adrian Bunk <bunk@kernel.org>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: disk-utils/blockdev.c:62
msgid "set read-only"
@ -8557,9 +8551,9 @@ msgid "%s on %s\n"
msgstr "%s für %s\n"
#: mount/swapon.c:178 mount/swapon.c:244
#, fuzzy, c-format
#, c-format
msgid "%s: cannot find the device for %s\n"
msgstr "%s: Konnte „_stext“ nicht in %s finden\n"
msgstr "%s: Kann das Gerät für %s nicht finden\n"
# stat
#: mount/swapon.c:185
@ -8568,10 +8562,10 @@ msgid "%s: cannot stat %s: %s\n"
msgstr "swapon: Konnte „stat“ nicht auf %s anwenden: %s\n"
#: mount/swapon.c:196
#, fuzzy, c-format
#, c-format
msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
"swapon: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
"%s: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
# holes
#: mount/swapon.c:208
@ -8698,9 +8692,8 @@ msgstr ""
#. "" would be expanded to `pwd`
#: mount/umount.c:553
#, fuzzy
msgid "Cannot umount \"\"\n"
msgstr "Kann nicht öffnen "
msgstr "Kann nicht öffnen \"\"\n"
#: mount/umount.c:559
#, c-format

1551
po/es.po
View File

File diff suppressed because it is too large Load Diff

3164
po/ru.po
View File

File diff suppressed because it is too large Load Diff

1308
po/sv.po
View File

File diff suppressed because it is too large Load Diff

1289
po/tr.po
View File

File diff suppressed because it is too large Load Diff