summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--balkan/Makefile4
-rw-r--r--balkan/balkan.h1
-rw-r--r--balkan/byteswap.h59
-rw-r--r--balkan/dos.c7
-rw-r--r--balkan/rw.c8
-rw-r--r--balkan/sun.c132
-rw-r--r--balkan/sun.h6
-rwxr-xr-xgui.py3
-rw-r--r--installclass.py5
-rw-r--r--isys/otherinsmod.c19
-rw-r--r--iw/language.py3
-rw-r--r--iw/lilo.py11
-rw-r--r--iw/progress.py1
-rw-r--r--iw/rootpartition.py4
-rw-r--r--loader/Makefile5
-rw-r--r--loader/loader.c13
-rw-r--r--loader/module-info28
-rw-r--r--po/anaconda.pot973
-rw-r--r--todo.py2
-rwxr-xr-xupd-instroot10
-rw-r--r--utils/moddeps.c2
22 files changed, 658 insertions, 640 deletions
diff --git a/Makefile b/Makefile
index c517f58e0..627eccb27 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
ARCH := $(patsubst i%86,i386,$(shell uname -m))
ARCH := $(patsubst sparc%,sparc,$(ARCH))
-SUBDIRSHD = rpmmodule isys balkan libfdisk collage loader stubs po kudzu \
+SUBDIRSHD = rpmmodule kudzu isys balkan libfdisk collage loader stubs po \
minislang textw
SUBDIRS = $(SUBDIRSHD) gnome-map iw help pixmaps
BUILDONLYSUBDIRS = pump
diff --git a/balkan/Makefile b/balkan/Makefile
index 0aec850e3..9ed6826d8 100644
--- a/balkan/Makefile
+++ b/balkan/Makefile
@@ -1,6 +1,6 @@
PYTHONLIBDIR = $(DESTDIR)/usr/lib/python1.5/site-packages
-OBJECTS = rw.o dos.o
+OBJECTS = rw.o dos.o sun.o
TARGET = libbalkan.a
@@ -19,5 +19,7 @@ clean:
dos.o: dos.h
+sun.o: sun.h
+
install: all
cp _balkanmodule.so $(PYTHONLIBDIR)
diff --git a/balkan/balkan.h b/balkan/balkan.h
index e80094ede..6afa061c0 100644
--- a/balkan/balkan.h
+++ b/balkan/balkan.h
@@ -10,6 +10,7 @@
#define BALKAN_PART_OTHER 3
#define BALKAN_PART_NTFS 4
#define BALKAN_PART_SWAP 5
+#define BALKAN_PART_UFS 6
struct partition {
long startSector;
diff --git a/balkan/byteswap.h b/balkan/byteswap.h
new file mode 100644
index 000000000..d271146aa
--- /dev/null
+++ b/balkan/byteswap.h
@@ -0,0 +1,59 @@
+#ifndef H_BYTESWAP
+#define H_BYTESWAP 1
+
+#include <endian.h>
+#include <stdint.h>
+
+#define swab16(x) \
+ ((uint16_t)( \
+ (((uint16_t)(x) & (uint16_t)0x00ffU) << 8) | \
+ (((uint16_t)(x) & (uint16_t)0xff00U) >> 8) ))
+#define swab32(x) \
+ ((uint32_t)( \
+ (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) | \
+ (((uint32_t)(x) & (uint32_t)0x0000ff00UL) << 8) | \
+ (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >> 8) | \
+ (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24) ))
+#define swab64(x) \
+ ((uint64_t)( \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) | \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000ff000000ULL) << 8) | \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >> 8) | \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
+ (uint64_t)(((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) ))
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+
+#define cpu_to_le16(x) x
+#define cpu_to_le32(x) x
+#define cpu_to_le64(x) x
+#define le16_to_cpu(x) x
+#define le32_to_cpu(x) x
+#define le64_to_cpu(x) x
+#define cpu_to_be16(x) swab16(x)
+#define cpu_to_be32(x) swab32(x)
+#define cpu_to_be64(x) swab64(x)
+#define be16_to_cpu(x) swab16(x)
+#define be32_to_cpu(x) swab32(x)
+#define be64_to_cpu(x) swab64(x)
+
+#else
+
+#define cpu_to_le16(x) swab16(x)
+#define cpu_to_le32(x) swab32(x)
+#define cpu_to_le64(x) swab64(x)
+#define le16_to_cpu(x) swab16(x)
+#define le32_to_cpu(x) swab32(x)
+#define le64_to_cpu(x) swab64(x)
+#define cpu_to_be16(x) x
+#define cpu_to_be32(x) x
+#define cpu_to_be64(x) x
+#define be16_to_cpu(x) x
+#define be32_to_cpu(x) x
+#define be64_to_cpu(x) x
+
+#endif
+#endif
diff --git a/balkan/dos.c b/balkan/dos.c
index a0534966e..e02163790 100644
--- a/balkan/dos.c
+++ b/balkan/dos.c
@@ -4,6 +4,7 @@
#include <unistd.h>
#include "balkan.h"
+#include "byteswap.h"
struct singlePartition {
unsigned char active;
@@ -79,9 +80,9 @@ static int readNextTable(int fd, struct partitionTable * table, int nextNum,
else
thisPart = nextNum++;
- table->parts[thisPart].startSector = singleTable.parts[i].start +
- sectorOffset;
- table->parts[thisPart].size = singleTable.parts[i].size;
+ table->parts[thisPart].startSector =
+ le32_to_cpu(singleTable.parts[i].start) + sectorOffset;
+ table->parts[thisPart].size = le32_to_cpu(singleTable.parts[i].size);
table->parts[thisPart].type = singleTable.parts[i].type;
}
diff --git a/balkan/rw.c b/balkan/rw.c
index f715952e3..bd7278459 100644
--- a/balkan/rw.c
+++ b/balkan/rw.c
@@ -2,5 +2,13 @@
#include "dos.h"
int balkanReadTable(int fd, struct partitionTable * table) {
+ int ret;
+
+ /* Try sun labels first: they contain
+ both magic (tho 16bit) and checksum. */
+ ret = sunpReadTable(fd, table);
+ if (ret != BALKAN_ERROR_BADMAGIC)
+ return ret;
+
return dospReadTable(fd, table);
}
diff --git a/balkan/sun.c b/balkan/sun.c
new file mode 100644
index 000000000..67e30eb56
--- /dev/null
+++ b/balkan/sun.c
@@ -0,0 +1,132 @@
+/* Sun style partitioning */
+
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "balkan.h"
+#include "byteswap.h"
+
+struct singlePartitionTable {
+ unsigned char info[128]; /* Informative text string */
+ unsigned char spare0[14];
+ struct sun_info {
+ unsigned char spare1;
+ unsigned char id;
+ unsigned char spare2;
+ unsigned char flags;
+ } infos[8];
+ unsigned char spare1[246]; /* Boot information etc. */
+ unsigned short rspeed; /* Disk rotational speed */
+ unsigned short pcylcount; /* Physical cylinder count */
+ unsigned short sparecyl; /* extra sects per cylinder */
+ unsigned char spare2[4]; /* More magic... */
+ unsigned short ilfact; /* Interleave factor */
+ unsigned short ncyl; /* Data cylinder count */
+ unsigned short nacyl; /* Alt. cylinder count */
+ unsigned short ntrks; /* Tracks per cylinder */
+ unsigned short nsect; /* Sectors per track */
+ unsigned char spare3[4]; /* Even more magic... */
+ struct sun_partition {
+ unsigned int start_cylinder;
+ unsigned int num_sectors;
+ } parts[8];
+ unsigned short magic; /* Magic number */
+ unsigned short csum; /* Label xor'd checksum */
+};
+
+#define SUN_LABEL_MAGIC 0xDABE
+#define SECTOR_SIZE 512
+#define WHOLE_DISK 5
+#define UFS_SUPER_MAGIC 0x00011954
+
+long long llseek(int fd, long long offset, int whence);
+
+int sunpReadTable(int fd, struct partitionTable * table) {
+ struct singlePartitionTable singleTable;
+ int i, rc, magic;
+ unsigned short *p, csum;
+
+ table->maxNumPartitions = 8;
+
+ for (i = 0; i < table->maxNumPartitions; i++)
+ table->parts[i].type = -1;
+
+ table->sectorSize = SECTOR_SIZE;
+
+ if (lseek(fd, 0, SEEK_SET) < 0)
+ return BALKAN_ERROR_ERRNO;
+
+ if (read(fd, &singleTable, sizeof(singleTable)) != sizeof(singleTable))
+ return BALKAN_ERROR_ERRNO;
+
+ if (be16_to_cpu(singleTable.magic) != SUN_LABEL_MAGIC)
+ return BALKAN_ERROR_BADMAGIC;
+
+ for (p = (unsigned short *)&singleTable, csum = 0;
+ p < (unsigned short *)(&singleTable+1);)
+ csum ^= *p++;
+
+ if (csum)
+ return BALKAN_ERROR_BADMAGIC;
+
+ for (i = 0; i < 8; i++) {
+ if (!singleTable.parts[i].num_sectors) continue;
+
+ table->parts[i].startSector =
+ be32_to_cpu(singleTable.parts[i].start_cylinder) *
+ be16_to_cpu(singleTable.nsect) *
+ be16_to_cpu(singleTable.ntrks);
+ table->parts[i].size =
+ be32_to_cpu(singleTable.parts[i].num_sectors);
+ table->parts[i].type = singleTable.infos[i].id;
+ }
+
+ for (i = 0; i < 8; i++) {
+ if (table->parts[i].type == -1) continue;
+
+ switch (table->parts[i].type) {
+ case 0x83:
+ table->parts[i].type = BALKAN_PART_EXT2;
+ break;
+
+ case 0x82:
+ table->parts[i].type = BALKAN_PART_SWAP;
+ break;
+
+ default:
+ if (table->parts[i].type != WHOLE_DISK &&
+ llseek(fd, (8192 + 0x55c + SECTOR_SIZE *
+ (unsigned long long)table->parts[i].startSector),
+ SEEK_SET) >= 0 &&
+ read(fd, &magic, 4) == 4 &&
+ (magic == UFS_SUPER_MAGIC ||
+ swab32(magic) == UFS_SUPER_MAGIC))
+ table->parts[i].type = BALKAN_PART_UFS;
+ else
+ table->parts[i].type = BALKAN_PART_OTHER;
+ break;
+ }
+ }
+
+ return 0;
+}
+
+#ifdef STANDALONE_TEST
+
+void main() {
+ int fd;
+ int i;
+ struct partitionTable table;
+
+ fd = open("/dev/hda", O_RDONLY);
+
+ printf("rc= %d\n", sunpReadTable(fd, &table));
+
+ for (i = 0; i < table.maxNumPartitions; i++) {
+ if (table.parts[i].type == -1) continue;
+
+ printf("%d: %x %d\n", i, table.parts[i].type, table.parts[i].size);
+ }
+}
+
+#endif
diff --git a/balkan/sun.h b/balkan/sun.h
new file mode 100644
index 000000000..5d7bdcb5e
--- /dev/null
+++ b/balkan/sun.h
@@ -0,0 +1,6 @@
+#ifndef H_DOS
+#define H_DOS 1
+
+int sunpReadTable(int fd, struct partitionTable * table);
+
+#endif;
diff --git a/gui.py b/gui.py
index cadaa7a7e..4ed8ce8f9 100755
--- a/gui.py
+++ b/gui.py
@@ -277,7 +277,7 @@ class InstallControlWindow (Thread):
buttons["prev"].set_sensitive (ics.getPrevEnabled ())
buttons["next"].set_sensitive (ics.getNextEnabled ())
-
+
if ics.getHelpEnabled () == FALSE:
if self.displayHelp:
self.helpClicked (self.hideHelpButton)
@@ -379,7 +379,6 @@ class InstallControlWindow (Thread):
class InstallControlState:
-
def __init__ (self, cw, ii, todo, title = "Install Window",
prevEnabled = 1, nextEnabled = 0, html = ""):
self.searchPath = [ "/usr/share/anaconda/", "./" ]
diff --git a/installclass.py b/installclass.py
index 5b180cb54..1c80636ec 100644
--- a/installclass.py
+++ b/installclass.py
@@ -58,6 +58,11 @@ class InstallClass:
def setClearParts(self, clear, warningText = None):
self.clearParts = clear
+ # XXX hack for install help text in GUI mode
+ if clear == FSEDIT_CLEAR_LINUX:
+ self.clearType = "wkst"
+ if clear == FSEDIT_CLEAR_ALL:
+ self.clearType = "svr"
self.clearPartText = warningText
def getLiloInformation(self):
diff --git a/isys/otherinsmod.c b/isys/otherinsmod.c
index 190a36cf5..d83dc13f9 100644
--- a/isys/otherinsmod.c
+++ b/isys/otherinsmod.c
@@ -11,6 +11,7 @@
/* hack */
int insmod_main(int argc, char ** argv);
+int insmod64_main(int argc, char ** argv);
int rmmod_main(int argc, char ** argv);
int ourInsmodCommand(int argc, char ** argv) {
@@ -57,21 +58,11 @@ int ourInsmodCommand(int argc, char ** argv) {
argv[1] = file;
#ifdef __sparc__
- if (sparc64) {
- int pid, status;
-
- if (!(pid = fork())) {
- execv("/bin/insmod64", argv);
- exit(-1);
- }
- waitpid(pid, &status, 0);
- if (WIFEXITED(status))
- rc = WEXITSTATUS(status);
- else
- rc = -1;
- } else
+ if (sparc64)
+ rc = insmod64_main(argc, argv);
+ else
#endif
- rc = insmod_main(argc, argv);
+ rc = insmod_main(argc, argv);
if (rmObj) unlink(file);
diff --git a/iw/language.py b/iw/language.py
index dd1539d55..c6e67470a 100644
--- a/iw/language.py
+++ b/iw/language.py
@@ -10,8 +10,7 @@ class LanguageWindow (InstallWindow):
ics.setTitle (_("Language Selection"))
ics.setPrevEnabled (0)
ics.setNextEnabled (1)
- ics.setHTML ("<HTML><BODY BGCOLOR=\"#FFFFFF\">Select which language you would like"
- "to use for the system default.</BODY></HTML>")
+ ics.readHTML ("lang")
self.question = (_("What language should be used during the "
"installation process?"))
diff --git a/iw/lilo.py b/iw/lilo.py
index e0b6a3691..fb0f39be9 100644
--- a/iw/lilo.py
+++ b/iw/lilo.py
@@ -18,13 +18,16 @@ class LiloWindow (InstallWindow):
ics.setTitle (_("Lilo Configuration"))
ics.setNextEnabled (1)
self.type = None
+ self.bootdisk = None
def getNext (self):
- if self.bootdisk.get_active ():
- self.todo.bootdisk = 1
- else:
- self.todo.bootdisk = 0
+ if self.bootdisk:
+ if self.bootdisk.get_active ():
+ self.todo.bootdisk = 1
+ else:
+ self.todo.bootdisk = 0
+ # XXX why is this here?
return
if self.lilo.get_active ():
self.todo.setLiloLocation (None)
diff --git a/iw/progress.py b/iw/progress.py
index 24b65e416..b0ed5e85c 100644
--- a/iw/progress.py
+++ b/iw/progress.py
@@ -24,6 +24,7 @@ class InstallProgressWindow (InstallWindow):
InstallWindow.__init__ (self, ics)
ics.setTitle (_("Installing Packages"))
+ ics.readHTML ("installing")
ics.setPrevEnabled (0)
self.todo = ics.getToDo ()
diff --git a/iw/rootpartition.py b/iw/rootpartition.py
index fb6e1b5c2..310d585ca 100644
--- a/iw/rootpartition.py
+++ b/iw/rootpartition.py
@@ -85,6 +85,7 @@ class AutoPartitionWindow(InstallWindow):
self.todo = ics.getToDo ()
ics.setTitle (_("Automatic Partitioning"))
ics.setNextEnabled (TRUE)
+ self.ics = ics
def getNext(self):
from gnomepyfsedit import fsedit
@@ -100,6 +101,9 @@ class AutoPartitionWindow(InstallWindow):
def getScreen (self):
from gnomepyfsedit import fsedit
+ # XXX hack
+ print self.todo.instClass.clearType
+ self.ics.readHTML (self.todo.instClass.clearType)
todo = self.todo
diff --git a/loader/Makefile b/loader/Makefile
index e9af5797c..7e3697670 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -9,6 +9,7 @@ SOURCES = $(subst .o,.c,$(OBJS) $(LOADEROBJS))
BINS = init
DIRS =
NETOBJS = net.o
+KON = 1
PCMCIAOBJS = pcmcia.o $(NETOBJS)
ALLOBJS = $(OBJS) $(PCMCIAOBJS)
@@ -19,6 +20,10 @@ DIRS += pcmcia-install
OBJS += stubs.o
endif
+ifeq (1, $(KON))
+OBJS += ./kon2/src/libkon.a ./kon2/src/display.a ./kon2/lib/libgon.a
+endif
+
ifeq (alpha, $(ARCH))
BINS += loader
endif
diff --git a/loader/loader.c b/loader/loader.c
index 7a792ed64..086f60c4c 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -58,6 +58,7 @@ int probe_main(int argc, char ** argv);
int rmmod_main(int argc, char ** argv);
int cardmgr_main(int argc, char ** argv);
int ourInsmodCommand(int argc, char ** argv);
+int kon_main(int argc, char ** argv);
struct knownDevices devices;
@@ -977,7 +978,7 @@ static char * doMountImage(char * location, struct knownDevices * kd,
free(class);
}
-#if !defined(__i386__)
+#if defined(__alpha__)
for (i = 0; i < numMethods; i++) {
installNames[numValidMethods] = installMethods[i].name;
validMethods[numValidMethods++] = i;
@@ -1038,7 +1039,7 @@ static char * doMountImage(char * location, struct knownDevices * kd,
30, 10, 20, 6, installNames,
&methodNum, _("Ok"), NULL);
- if (rc) continue;
+ if (rc && rc != 1) continue;
url = installMethods[validMethods[methodNum]].mountImage(
installMethods + validMethods[methodNum], location,
@@ -1381,9 +1382,13 @@ int main(int argc, char ** argv) {
return ourInsmodCommand(argc, argv);
else if (!strcmp(argv[0] + strlen(argv[0]) - 5, "rmmod"))
return rmmod_main(argc, argv);
- else if (!strcmp(argv[0] + strlen(argv[0]) - 8, "modprobe")) {
+ else if (!strcmp(argv[0] + strlen(argv[0]) - 8, "modprobe"))
return ourInsmodCommand(argc, argv);
- }
+
+#ifdef INCLUDE_KON
+ if (!strcmp(argv[0] + strlen(argv[0]) - 3, "kon"))
+ return kon_main(argc, argv);
+#endif
#ifdef INCLUDE_PCMCIA
if (!strcmp(argv[0] + strlen(argv[0]) - 7, "cardmgr"))
diff --git a/loader/module-info b/loader/module-info
index 619dc2d18..d402446da 100644
--- a/loader/module-info
+++ b/loader/module-info
@@ -261,6 +261,10 @@ lne390
eth
"Mylex LNE390 EISA"
+myri_sbus
+ eth
+ "MyriCOM MyriNET SBUS"
+
ne
eth
"NE1000, NE2000, and compatible"
@@ -369,6 +373,18 @@ strip
# eth
# "Linux/Sparc/Lance Ethernet"
+sunbmac
+ eth
+ "Sun BigMac Ethernet"
+
+sunhme
+ eth
+ "Sun Happy Meal Ethernet"
+
+sunqe
+ eth
+ "Sun Quad Ethernet"
+
tlan
eth
"ThunderLAN"
@@ -473,6 +489,10 @@ eata_pio
scsi_hostadapter
"All PIO-capable DPT SCSI"
+fcal
+ scsi_hostadapter
+ "Sun Enterprise Network Array (FC-AL)"
+
# not a module
# esp
@@ -509,6 +529,10 @@ pas16
scsi_hostadapter
"Pro Audio Spectrum/Studio 16"
+pluto
+ scsi_hostadapter
+ "SparcSTORAGE Array"
+
# <SIGH>
#ppa
#scsi_hostadapter
@@ -531,6 +555,10 @@ qlogicisp
scsi_hostadapter
"QLogic ISP1020 SCSI"
+qlogicpti
+ scsi_hostadapter
+ "QLogic ISP1020 SCSI SBUS"
+
#scsi
# Can kerneld actually request this?
# scsi
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 7d76595d3..6baebcd0d 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-09 01:26-0400\n"
+"POT-Creation-Date: 1999-09-11 11:16-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,309 +14,176 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#. code to create dialog in gtk+
-#: ../libfdisk/fsedit.c:605 ../libfdisk/fsedit.c:612 ../libfdisk/fsedit.c:619
-#: ../libfdisk/fsedit.c:628 ../libfdisk/fsedit.c:640 ../libfdisk/fsedit.c:650
-#: ../libfdisk/fsedit.c:679 ../libfdisk/fsedit.c:695 ../libfdisk/fsedit.c:1022
-#: ../libfdisk/gnomefsedit.c:616 ../libfdisk/gnomefsedit.c:961
-#: ../libfdisk/gnomefsedit.c:987 ../libfdisk/gnomefsedit.c:1023
-#: ../libfdisk/gnomefsedit.c:1228 ../libfdisk/gnomefsedit.c:1322
-#: ../libfdisk/gnomefsedit.c:1340 ../libfdisk/gnomefsedit.c:1580
-#: ../libfdisk/gnomefsedit.c:1807 ../libfdisk/gnomefsedit.c:1815
-#: ../libfdisk/gnomefsedit.c:1829 ../libfdisk/gnomefsedit.c:1840
-#: ../libfdisk/gnomefsedit.c:1847 ../libfdisk/gnomefsedit.c:1862
-#: ../libfdisk/gnomefsedit.c:1871 ../libfdisk/gnomefsedit.c:1928
-#: ../libfdisk/gnomefsedit.c:2089 ../libfdisk/newtfsedit.c:116
-#: ../libfdisk/newtfsedit.c:449 ../libfdisk/newtfsedit.c:527
-#: ../libfdisk/newtfsedit.c:545 ../libfdisk/newtfsedit.c:581
-#: ../libfdisk/newtfsedit.c:1297 ../libfdisk/newtfsedit.c:1305
-#: ../libfdisk/newtfsedit.c:1430 ../libfdisk/newtfsedit.c:1451
-#: ../libfdisk/newtfsedit.c:1545 ../text.py:19 ../text.py:64 ../text.py:1110
-#: ../text.py:1123 ../text.py:1178 ../text.py:1271
-msgid "Ok"
-msgstr ""
-
-#: ../gui.py:292 ../libfdisk/fsedit.c:929 ../libfdisk/newtfsedit.c:1297
-#: ../libfdisk/newtfsedit.c:1305 ../text.py:19 ../text.py:64 ../text.py:65
-#: ../text.py:80 ../text.py:103 ../text.py:131 ../text.py:134 ../text.py:157
-#: ../text.py:184 ../text.py:198 ../text.py:200 ../text.py:219 ../text.py:221
-#: ../text.py:255 ../text.py:367 ../text.py:398 ../text.py:466 ../text.py:468
-#: ../text.py:488 ../text.py:621 ../text.py:672 ../text.py:674 ../text.py:696
-#: ../text.py:733 ../text.py:842 ../text.py:882 ../text.py:947 ../text.py:998
-#: ../text.py:1007 ../text.py:1023 ../text.py:1032 ../text.py:1049
-#: ../text.py:1092 ../text.py:1099 ../text.py:1179 ../text.py:1237
-#: ../text.py:1239 ../text.py:1259 ../text.py:1262 ../text.py:1271
-#: ../text.py:1323 ../text.py:1324 ../text.py:1545 ../text.py:1567
-msgid "Back"
-msgstr ""
-
-#: ../iw/language.py:10 ../text.py:29 ../text.py:1619
+#: ../iw/language.py:10 ../text.py:39 ../text.py:818
msgid "Language Selection"
msgstr ""
-#: ../text.py:30
+#: ../text.py:40
msgid "What language would you like to use during the installation process?"
msgstr ""
-#: ../text.py:32 ../text.py:80 ../text.py:131 ../text.py:157 ../text.py:198
-#: ../text.py:255 ../text.py:269 ../text.py:274 ../text.py:308 ../text.py:320
-#: ../text.py:328 ../text.py:337 ../text.py:398 ../text.py:466 ../text.py:488
-#: ../text.py:621 ../text.py:641 ../text.py:672 ../text.py:842 ../text.py:882
-#: ../text.py:947 ../text.py:998 ../text.py:1048 ../text.py:1092
-#: ../text.py:1237 ../text.py:1259 ../text.py:1323 ../text.py:1343
-#: ../text.py:1355 ../text.py:1367 ../text.py:1545 ../text.py:1588
-#: ../text.py:1592
+#: ../text.py:42 ../text.py:90 ../text.py:141 ../text.py:167 ../text.py:208
+#: ../text.py:253 ../text.py:343 ../text.py:363 ../text.py:394 ../text.py:435
+#: ../text.py:457 ../text.py:522 ../text.py:542 ../text.py:554 ../text.py:566
+#: ../text.py:744 ../text.py:787 ../text.py:791
msgid "OK"
msgstr ""
-#: ../text.py:44
+#: ../text.py:54
msgid "/dev/ttyS0 (COM1 under DOS)"
msgstr ""
-#: ../text.py:45
+#: ../text.py:55
msgid "/dev/ttyS1 (COM2 under DOS)"
msgstr ""
-#: ../text.py:46
+#: ../text.py:56
msgid "/dev/ttyS2 (COM3 under DOS)"
msgstr ""
-#: ../text.py:47
+#: ../text.py:57
msgid "/dev/ttyS3 (COM4 under DOS)"
msgstr ""
-#: ../iw/lilo.py:171 ../text.py:62 ../text.py:1105 ../text.py:1163
+#: ../iw/lilo.py:174 ../text.py:72
msgid "Device"
msgstr ""
-#: ../text.py:63
+#: ../text.py:73
#, c-format
msgid "What device is your mouse located on? %s %i"
msgstr ""
-#: ../text.py:82
+#. code to create dialog in gtk+
+#: ../libfdisk/fsedit.c:605 ../libfdisk/fsedit.c:612 ../libfdisk/fsedit.c:619
+#: ../libfdisk/fsedit.c:628 ../libfdisk/fsedit.c:640 ../libfdisk/fsedit.c:650
+#: ../libfdisk/fsedit.c:679 ../libfdisk/fsedit.c:695 ../libfdisk/fsedit.c:1048
+#: ../libfdisk/gnomefsedit.c:655 ../libfdisk/gnomefsedit.c:1000
+#: ../libfdisk/gnomefsedit.c:1026 ../libfdisk/gnomefsedit.c:1062
+#: ../libfdisk/gnomefsedit.c:1267 ../libfdisk/gnomefsedit.c:1361
+#: ../libfdisk/gnomefsedit.c:1379 ../libfdisk/gnomefsedit.c:1619
+#: ../libfdisk/gnomefsedit.c:1846 ../libfdisk/gnomefsedit.c:1854
+#: ../libfdisk/gnomefsedit.c:1868 ../libfdisk/gnomefsedit.c:1879
+#: ../libfdisk/gnomefsedit.c:1886 ../libfdisk/gnomefsedit.c:1901
+#: ../libfdisk/gnomefsedit.c:1910 ../libfdisk/gnomefsedit.c:1967
+#: ../libfdisk/gnomefsedit.c:2128 ../libfdisk/newtfsedit.c:116
+#: ../libfdisk/newtfsedit.c:449 ../libfdisk/newtfsedit.c:527
+#: ../libfdisk/newtfsedit.c:545 ../libfdisk/newtfsedit.c:581
+#: ../libfdisk/newtfsedit.c:1297 ../libfdisk/newtfsedit.c:1305
+#: ../libfdisk/newtfsedit.c:1430 ../libfdisk/newtfsedit.c:1451
+#: ../libfdisk/newtfsedit.c:1545 ../text.py:74 ../text.py:469
+msgid "Ok"
+msgstr ""
+
+#: ../gui.py:312 ../libfdisk/fsedit.c:955 ../libfdisk/newtfsedit.c:1297
+#: ../libfdisk/newtfsedit.c:1305 ../text.py:74 ../text.py:75 ../text.py:90
+#: ../text.py:113 ../text.py:141 ../text.py:144 ../text.py:167 ../text.py:194
+#: ../text.py:208 ../text.py:210 ../text.py:229 ../text.py:231 ../text.py:253
+#: ../text.py:255 ../text.py:343 ../text.py:394 ../text.py:396 ../text.py:415
+#: ../text.py:424 ../text.py:435 ../text.py:437 ../text.py:457 ../text.py:460
+#: ../text.py:469 ../text.py:522 ../text.py:523 ../text.py:744 ../text.py:766
+msgid "Back"
+msgstr ""
+
+#: ../text.py:92
msgid "Which model mouse is attached to this computer?"
msgstr ""
-#: ../text.py:91
+#: ../text.py:101
msgid "Emulate 3 Buttons?"
msgstr ""
-#: ../text.py:93
+#: ../text.py:103
msgid "Mouse Selection"
msgstr ""
-#: ../text.py:129 ../text.py:1621
+#: ../text.py:139 ../text.py:820
msgid "Keyboard Selection"
msgstr ""
-#: ../text.py:130
+#: ../text.py:140
msgid "Which model keyboard is attached to this computer?"
msgstr ""
-#: ../text.py:150
+#: ../text.py:160
msgid "Install GNOME Workstation"
msgstr ""
-#: ../text.py:151
+#: ../text.py:161
msgid "Install KDE Workstation"
msgstr ""
-#: ../text.py:152
+#: ../text.py:162
msgid "Install Server System"
msgstr ""
-#: ../text.py:153
+#: ../text.py:163
msgid "Install Custom System"
msgstr ""
-#: ../text.py:154
+#: ../text.py:164
msgid "Upgrade Existing Installation"
msgstr ""
-#: ../text.py:155 ../text.py:1624
+#: ../text.py:165 ../text.py:823
msgid "Installation Type"
msgstr ""
-#: ../text.py:156
+#: ../text.py:166
msgid "What type of system would you like to install?"
msgstr ""
-#: ../libfdisk/newtfsedit.c:1545 ../text.py:181 ../text.py:1363
+#: ../libfdisk/newtfsedit.c:1545 ../text.py:191 ../text.py:562
msgid "Error"
msgstr ""
-#: ../text.py:182
+#: ../text.py:192
msgid "You don't have any Linux partitions. You can't upgrade this system!"
msgstr ""
-#: ../text.py:195
+#: ../text.py:205
msgid "System to Upgrade"
msgstr ""
-#: ../text.py:196
+#: ../text.py:206
msgid "What partition holds the root partition of your installation?"
msgstr ""
-#: ../text.py:211
+#: ../text.py:221
msgid "Customize Packages to Upgrade"
msgstr ""
-#: ../text.py:212
+#: ../text.py:222
msgid ""
"The packages you have installed, and any other packages which are needed to "
"satisfy their dependencies, have been selected for installation. Would you "
"like to customize the set of packages that will be upgraded?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:541 ../libfdisk/gnomefsedit.c:917
-#: ../libfdisk/gnomefsedit.c:1041 ../libfdisk/gnomefsedit.c:1981
-#: ../libfdisk/gnomefsedit.c:2251 ../libfdisk/gnomefsedit.c:2304
+#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/gnomefsedit.c:956
+#: ../libfdisk/gnomefsedit.c:1080 ../libfdisk/gnomefsedit.c:2020
+#: ../libfdisk/gnomefsedit.c:2290 ../libfdisk/gnomefsedit.c:2343
#: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
#: ../libfdisk/newtfsedit.c:1483 ../libfdisk/newtfsedit.c:1501
-#: ../libfdisk/newtfsedit.c:1586 ../text.py:219 ../text.py:805 ../text.py:1023
-#: ../text.py:1026
+#: ../libfdisk/newtfsedit.c:1586 ../text.py:229 ../text.py:415 ../text.py:418
msgid "Yes"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:541 ../libfdisk/gnomefsedit.c:917
-#: ../libfdisk/gnomefsedit.c:1041 ../libfdisk/gnomefsedit.c:1981
-#: ../libfdisk/gnomefsedit.c:2251 ../libfdisk/gnomefsedit.c:2304
+#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/gnomefsedit.c:956
+#: ../libfdisk/gnomefsedit.c:1080 ../libfdisk/gnomefsedit.c:2020
+#: ../libfdisk/gnomefsedit.c:2290 ../libfdisk/gnomefsedit.c:2343
#: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
#: ../libfdisk/newtfsedit.c:1483 ../libfdisk/newtfsedit.c:1501
-#: ../libfdisk/newtfsedit.c:1586 ../text.py:219 ../text.py:224 ../text.py:805
-#: ../text.py:1023 ../text.py:1029
+#: ../libfdisk/newtfsedit.c:1586 ../text.py:229 ../text.py:234 ../text.py:415
+#: ../text.py:421
msgid "No"
msgstr ""
-#: ../text.py:234 ../text.py:1657
-msgid "Root Password"
-msgstr ""
-
-#: ../text.py:236
-msgid ""
-"Pick a root password. You must type it twice to ensure you know what it is "
-"and didn't make a mistake in typing. Remember that the root password is a "
-"critical part of system security!"
-msgstr ""
-
-#: ../text.py:249
-msgid "Password:"
-msgstr ""
-
-#: ../text.py:250
-msgid "Password (again):"
-msgstr ""
-
-#: ../text.py:266 ../text.py:317
-msgid "Password Length"
-msgstr ""
-
-#: ../text.py:267
-msgid "The root password must be at least 6 characters long."
-msgstr ""
-
-#: ../text.py:271 ../text.py:325
-msgid "Password Mismatch"
-msgstr ""
-
-#: ../text.py:272 ../text.py:326
-msgid "The passwords you entered were different. Please try again."
-msgstr ""
-
-#: ../libfdisk/gnomefsedit.c:616 ../libfdisk/gnomefsedit.c:1580
-#: ../libfdisk/gnomefsedit.c:2089 ../libfdisk/newtfsedit.c:450
-#: ../libfdisk/newtfsedit.c:1501 ../text.py:288 ../text.py:1110
-#: ../text.py:1128
-msgid "Cancel"
-msgstr ""
-
-#: ../text.py:297
-msgid "Edit User"
-msgstr ""
-
-#: ../text.py:299
-msgid "Add User"
-msgstr ""
-
-#: ../text.py:304
-msgid "User ID"
-msgstr ""
-
-#: ../iw/account.py:171 ../iw/account.py:192 ../text.py:305 ../text.py:386
-msgid "Full Name"
-msgstr ""
-
-#: ../iw/account.py:166 ../text.py:306
-msgid "Password"
-msgstr ""
-
-#: ../iw/account.py:168 ../text.py:307
-msgid "Password (confirm)"
-msgstr ""
-
-#: ../text.py:318
-msgid "The password must be at least 6 characters long."
-msgstr ""
-
-#: ../text.py:335
-msgid "User Exists"
-msgstr ""
-
-#: ../text.py:336
-msgid "This user id already exists. Choose another."
-msgstr ""
-
-#: ../text.py:363
-msgid ""
-"You should use a normal user account for most activities on your system. By "
-"not using the root account casually, you'll reduce the chance of disrupting "
-"your system's configuration."
-msgstr ""
-
-#: ../text.py:374 ../text.py:1659
-msgid "User Account Setup"
-msgstr ""
-
-#: ../text.py:376
-msgid ""
-"What user account would you like to have on the system? You should have at "
-"least one non-root account for normal work, but multi-user systems can have "
-"any number of accounts set up."
-msgstr ""
-
-#: ../text.py:386
-msgid "User name"
-msgstr ""
-
-#: ../iw/account.py:178 ../libfdisk/newtfsedit.c:1303 ../text.py:397
-msgid "Add"
-msgstr ""
-
-#: ../iw/account.py:182 ../libfdisk/newtfsedit.c:1296
-#: ../libfdisk/newtfsedit.c:1304 ../text.py:397
-msgid "Delete"
-msgstr ""
-
-#: ../iw/account.py:180 ../libfdisk/newtfsedit.c:1296
-#: ../libfdisk/newtfsedit.c:1304 ../text.py:398 ../text.py:732 ../text.py:1178
-#: ../text.py:1199
-msgid "Edit"
-msgstr ""
-
-#: ../text.py:410
-msgid "Enter the information for the user."
-msgstr ""
-
-#: ../text.py:422
-msgid "Change the information for this user."
-msgstr ""
-
-#: ../text.py:457
+#: ../text.py:244
msgid "Red Hat Linux"
msgstr ""
-#: ../text.py:458
+#: ../text.py:245
msgid ""
"Welcome to Red Hat Linux!\n"
"\n"
@@ -328,202 +195,57 @@ msgid ""
"purchase through our web site, http://www.redhat.com/."
msgstr ""
-#: ../iw/auth.py:11 ../text.py:490
-msgid "Authentication Configuration"
-msgstr ""
-
-#: ../text.py:491
-msgid "Use Shadow Passwords"
-msgstr ""
-
-#: ../text.py:493
-msgid "Enable MD5 Passwords"
-msgstr ""
-
-#: ../iw/auth.py:53 ../text.py:495
-msgid "Enable NIS"
-msgstr ""
-
-#: ../text.py:500
-msgid "NIS Domain:"
-msgstr ""
-
-#: ../text.py:502
-msgid "NIS Server:"
-msgstr ""
-
-#: ../text.py:504
-msgid "or use:"
-msgstr ""
-
-#: ../text.py:507
-msgid "Request server via broadcast"
-msgstr ""
-
-#: ../text.py:593
+#: ../text.py:315
msgid "Use bootp/dhcp"
msgstr ""
-#: ../text.py:598
+#: ../text.py:320
msgid "IP address:"
msgstr ""
-#: ../text.py:599
+#: ../text.py:321
msgid "Netmask:"
msgstr ""
-#: ../text.py:600
+#: ../text.py:322
msgid "Default gateway (IP):"
msgstr ""
-#: ../text.py:601
+#: ../text.py:323
msgid "Primary nameserver:"
msgstr ""
-#: ../text.py:623
+#: ../text.py:345
msgid "Network Configuration"
msgstr ""
-#: ../text.py:639
+#: ../text.py:361
msgid "Invalid information"
msgstr ""
-#: ../text.py:640
+#: ../text.py:362
msgid "You must enter valid IP information to continue"
msgstr ""
-#: ../text.py:668
+#: ../text.py:390
msgid "Hostname Configuration"
msgstr ""
-#: ../text.py:669
+#: ../text.py:391
msgid ""
"The hostname is the name of your computer. If your computer is attached to "
"a network, this may be assigned by your network administrator."
msgstr ""
-#: ../iw/network.py:180 ../text.py:672
+#: ../iw/network.py:180 ../text.py:394
msgid "Hostname"
msgstr ""
-#: ../text.py:687 ../text.py:726
-msgid "Disk Setup"
-msgstr ""
-
-#: ../text.py:688
-msgid ""
-"Disk Druid is a tool for partitioning and setting up mount points. It is "
-"designed to be easier to use than Linux's traditional disk partitioning "
-"sofware, fdisk, as well as more powerful. However, there are some cases "
-"where fdisk may be preferred.\n"
-"\n"
-"Which tool would you like to use?"
-msgstr ""
-
-#: ../text.py:695
-msgid "Disk Druid"
-msgstr ""
-
-#: ../text.py:695
-msgid "fdisk"
-msgstr ""
-
-#: ../text.py:727
-msgid ""
-"To install Red Hat Linux, you must have at least one partition of 150 MB "
-"dedicated to Linux. We suggest placing that partition on one of the first "
-"two hard drives in your system so you can boot into Linux with LILO."
-msgstr ""
-
-#: ../text.py:732
-msgid "Done"
-msgstr ""
-
-#: ../iw/rootpartition.py:74 ../text.py:767
-msgid "Automatic Partitioning"
-msgstr ""
-
-#: ../iw/rootpartition.py:110 ../text.py:768
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"If you don't want to do this, you can continue with this install by "
-"partitioning manually, or you can go back and perform a fully customized "
-"installation."
-msgstr ""
-
-#: ../text.py:772 ../text.py:773
-msgid "Continue"
-msgstr ""
-
-#: ../iw/rootpartition.py:125 ../text.py:772
-msgid "Manually partition"
-msgstr ""
-
-#: ../text.py:800
-msgid "Low Memory"
-msgstr ""
-
-#: ../text.py:801
-msgid ""
-"As you don't have much memory in this machine, we need to turn on swap space "
-"immediately. To do this we'll have to write your new partition table to the "
-"disk immediately. Is that okay?"
-msgstr ""
-
-#: ../text.py:820
-msgid ""
-"What partitions would you like to format? We strongly suggest formatting all "
-"of the system partitions, including /, /usr, and /var. There is no need to "
-"format /home or /usr/local if they have already been configured during a "
-"previous install."
-msgstr ""
-
-#: ../text.py:840
-msgid "Check for bad blocks during format"
-msgstr ""
-
-#: ../text.py:844
-msgid "Choose Partitions to Format"
-msgstr ""
-
-#: ../iw/package.py:445 ../text.py:880
-msgid "Select individual packages"
-msgstr ""
-
-#: ../iw/package.py:377 ../text.py:884 ../text.py:949
-msgid "Package Group Selection"
-msgstr ""
-
-#: ../text.py:976 ../text.py:1667
-msgid "Package Dependencies"
-msgstr ""
-
-#: ../text.py:977
-msgid ""
-"Some of the packages you have selected to install require packages you have "
-"not selected. If you just select Ok all of those required packages will be "
-"installed."
-msgstr ""
-
-#: ../iw/dependencies.py:29 ../iw/progress.py:112 ../text.py:983
-msgid "Package"
-msgstr ""
-
-#: ../iw/dependencies.py:29 ../text.py:983
-msgid "Requirement"
-msgstr ""
-
-#: ../iw/dependencies.py:36 ../text.py:995
-msgid "Install packages to satisfy dependencies"
-msgstr ""
-
-#: ../text.py:1013 ../text.py:1351 ../text.py:1676
+#: ../text.py:405 ../text.py:550 ../text.py:875
msgid "Bootdisk"
msgstr ""
-#: ../text.py:1014
+#: ../text.py:406
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without "
"depending on the normal bootloader. This is useful if you don't want to "
@@ -535,98 +257,45 @@ msgid ""
"Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../text.py:1040
-msgid ""
-"A few systems will need to pass special options to the kernel at boot time "
-"for the system to function properly. If you need to pass boot options to the "
-"kernel, enter them now. If you don't need any or aren't sure, leave this "
-"blank."
-msgstr ""
-
-#: ../iw/lilo.py:138 ../text.py:1046
-msgid "Use linear mode (needed for some SCSI drives)"
-msgstr ""
-
-#: ../text.py:1048 ../text.py:1355 ../text.py:1356 ../text.py:1367
-#: ../text.py:1368
-msgid "Skip"
-msgstr ""
-
-#: ../text.py:1051 ../text.py:1089 ../text.py:1186 ../text.py:1641
-#: ../text.py:1643 ../text.py:1645
-msgid "LILO Configuration"
-msgstr ""
-
-#: ../text.py:1090
-msgid "Where do you want to install the bootloader?"
-msgstr ""
-
-#: ../iw/lilo.py:171 ../iw/lilo.py:206 ../text.py:1106 ../text.py:1163
-msgid "Boot label"
-msgstr ""
-
-#: ../text.py:1110 ../text.py:1130
-msgid "Clear"
-msgstr ""
-
-#: ../text.py:1118
-msgid "Edit Boot Label"
-msgstr ""
-
-#: ../iw/lilo.py:171 ../text.py:1163
-msgid "Partition type"
-msgstr ""
-
-#: ../iw/lilo.py:171 ../text.py:1163
-msgid "Default"
-msgstr ""
-
-#: ../text.py:1181
-msgid ""
-"The boot manager Red Hat uses can boot other operating systems as well. You "
-"need to tell me what partitions you would like to be able to boot and what "
-"label you want to use for each of them."
-msgstr ""
-
-#: ../text.py:1235
+#: ../text.py:433
msgid "X probe results"
msgstr ""
-#: ../text.py:1248 ../text.py:1267
+#: ../text.py:446 ../text.py:465
msgid "Unlisted Card"
msgstr ""
-#: ../text.py:1256
+#: ../text.py:454
msgid "Video Card Selection"
msgstr ""
-#: ../text.py:1257
+#: ../text.py:455
msgid "Which video card do you have?"
msgstr ""
-#: ../text.py:1269
+#: ../text.py:467
msgid "X Server Selection"
msgstr ""
-#: ../text.py:1269
+#: ../text.py:467
msgid "Choose a server"
msgstr ""
-#: ../text.py:1319
+#: ../text.py:518
msgid "Installation to begin"
msgstr ""
-#: ../text.py:1320
+#: ../text.py:519
msgid ""
"A complete log of your installation will be in /tmp/install.log after "
"rebooting your system. You may want to keep this file for later reference."
msgstr ""
-#: ../text.py:1335
+#: ../text.py:534
msgid "Complete"
msgstr ""
-#: ../iw/congrats.py:17 ../text.py:1336
+#: ../iw/congrats.py:17 ../text.py:535
msgid ""
"Congratulations, installation is complete.\n"
"\n"
@@ -638,189 +307,209 @@ msgid ""
"chapter of the Official Red Hat Linux User's Guide."
msgstr ""
-#: ../iw/bootdisk.py:40 ../text.py:1352
+#: ../iw/bootdisk.py:40 ../text.py:551
msgid ""
"Insert a blank floppy in the first floppy drive. All data on this disk will "
"be erased during creation of the boot disk."
msgstr ""
-#: ../iw/bootdisk.py:44 ../text.py:1364
+#: ../text.py:554 ../text.py:555 ../text.py:566 ../text.py:567
+msgid "Skip"
+msgstr ""
+
+#: ../iw/bootdisk.py:44 ../text.py:563
msgid ""
"An error occured while making the boot disk. Please make sure that there is "
"a formatted floppy in the first floppy drive."
msgstr ""
-#: ../text.py:1426
+#: ../text.py:625
msgid "Package Installation"
msgstr ""
-#: ../text.py:1428
+#: ../text.py:627
msgid "Name : "
msgstr ""
-#: ../text.py:1429
+#: ../text.py:628
msgid "Size : "
msgstr ""
-#: ../text.py:1430
+#: ../text.py:629
msgid "Summary: "
msgstr ""
-#: ../text.py:1456
+#: ../text.py:655
msgid " Packages"
msgstr ""
-#: ../text.py:1457
+#: ../text.py:656
msgid " Bytes"
msgstr ""
-#: ../text.py:1458
+#: ../text.py:657
msgid " Time"
msgstr ""
-#: ../text.py:1460
+#: ../text.py:659
msgid "Total :"
msgstr ""
-#: ../text.py:1467
+#: ../text.py:666
msgid "Completed: "
msgstr ""
-#: ../text.py:1477
+#: ../text.py:676
msgid "Remaining: "
msgstr ""
-#: ../text.py:1547
+#: ../text.py:746
msgid "What time zone are you located in?"
msgstr ""
-#: ../text.py:1555
+#: ../text.py:754
msgid "Hardware clock set to GMT?"
msgstr ""
-#: ../iw/timezone.py:29 ../text.py:1557
+#: ../iw/timezone.py:29 ../text.py:756
msgid "Time Zone Selection"
msgstr ""
-#: ../text.py:1592 ../text.py:1593
+#: ../text.py:791 ../text.py:792
msgid "Debug"
msgstr ""
-#: ../text.py:1605
+#: ../text.py:804
msgid "Red Hat Linux (C) 1999 Red Hat, Inc."
msgstr ""
-#: ../text.py:1607
+#: ../text.py:806
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next "
"screen"
msgstr ""
-#: ../text.py:1623
+#: ../text.py:822
msgid "Welcome"
msgstr ""
-#: ../iw/lilo.py:91 ../iw/lilo.py:194 ../text.py:1629 ../text.py:1635
+#: ../iw/lilo.py:94 ../iw/lilo.py:197 ../text.py:828 ../text.py:834
msgid "Partition"
msgstr ""
-#: ../text.py:1631
+#: ../text.py:830
msgid "Manually Partition"
msgstr ""
-#: ../text.py:1633
+#: ../text.py:832
msgid "Automatic Partition"
msgstr ""
-#: ../text.py:1637
+#: ../text.py:836
msgid "Swap"
msgstr ""
-#: ../text.py:1639
+#: ../text.py:838
msgid "Filesystem Formatting"
msgstr ""
-#: ../text.py:1647
+#: ../text.py:840 ../text.py:842 ../text.py:844
+msgid "LILO Configuration"
+msgstr ""
+
+#: ../text.py:846
msgid "Hostname Setup"
msgstr ""
-#: ../text.py:1649
+#: ../text.py:848
msgid "Network Setup"
msgstr ""
-#: ../text.py:1651 ../text.py:1653
+#: ../text.py:850 ../text.py:852
msgid "Mouse Configuration"
msgstr ""
-#: ../text.py:1655
+#: ../text.py:854
msgid "Time Zone Setup"
msgstr ""
-#: ../text.py:1661
+#: ../text.py:856
+msgid "Root Password"
+msgstr ""
+
+#: ../text.py:858
+msgid "User Account Setup"
+msgstr ""
+
+#: ../text.py:860
msgid "Authentication"
msgstr ""
-#: ../text.py:1663
+#: ../text.py:862
msgid "Package Groups"
msgstr ""
-#: ../text.py:1665 ../text.py:1685
+#: ../text.py:864 ../text.py:885
msgid "Individual Packages"
msgstr ""
-#: ../iw/xconfig.py:91 ../text.py:1669 ../text.py:1677
+#: ../text.py:866
+msgid "Package Dependencies"
+msgstr ""
+
+#: ../iw/xconfig.py:91 ../text.py:868 ../text.py:876
msgid "X Configuration"
msgstr ""
-#: ../text.py:1671
+#: ../text.py:870
msgid "Boot Disk"
msgstr ""
-#: ../text.py:1673
+#: ../text.py:872
msgid "Installation Begins"
msgstr ""
-#: ../text.py:1675
+#: ../text.py:874
msgid "Install System"
msgstr ""
-#: ../text.py:1678
+#: ../text.py:878
msgid "Installation Complete"
msgstr ""
-#: ../text.py:1683
+#: ../text.py:883
msgid "Examine System"
msgstr ""
-#: ../text.py:1684
+#: ../text.py:884
msgid "Customize Upgrade"
msgstr ""
-#: ../text.py:1686
+#: ../text.py:886
msgid "Upgrade System"
msgstr ""
-#: ../text.py:1687
+#: ../text.py:887
msgid "Upgrade Complete"
msgstr ""
-#: ../gui.py:286
+#: ../gui.py:306
msgid "Red Hat Linux Installer"
msgstr ""
-#: ../gui.py:295
+#: ../gui.py:315
msgid "Finish"
msgstr ""
-#: ../gui.py:296
+#: ../gui.py:316
msgid "Hide Help"
msgstr ""
-#: ../gui.py:297
+#: ../gui.py:317
msgid "Show Help"
msgstr ""
-#: ../gui.py:318
+#: ../gui.py:338
msgid "Online Help"
msgstr ""
@@ -840,10 +529,40 @@ msgstr ""
msgid "Account Name"
msgstr ""
+#: ../iw/account.py:166
+msgid "Password"
+msgstr ""
+
+#: ../iw/account.py:168
+msgid "Password (confirm)"
+msgstr ""
+
+#: ../iw/account.py:171 ../iw/account.py:192
+msgid "Full Name"
+msgstr ""
+
+#: ../iw/account.py:178 ../libfdisk/newtfsedit.c:1303
+msgid "Add"
+msgstr ""
+
+#: ../iw/account.py:180 ../libfdisk/newtfsedit.c:1296
+#: ../libfdisk/newtfsedit.c:1304
+msgid "Edit"
+msgstr ""
+
+#: ../iw/account.py:182 ../libfdisk/newtfsedit.c:1296
+#: ../libfdisk/newtfsedit.c:1304
+msgid "Delete"
+msgstr ""
+
#: ../iw/account.py:184
msgid "New"
msgstr ""
+#: ../iw/auth.py:11
+msgid "Authentication Configuration"
+msgstr ""
+
#: ../iw/auth.py:50
msgid "Enable MD5 passwords"
msgstr ""
@@ -852,6 +571,10 @@ msgstr ""
msgid "Enable shadow passwords"
msgstr ""
+#: ../iw/auth.py:53
+msgid "Enable NIS"
+msgstr ""
+
#: ../iw/auth.py:54
msgid "Use broadcast to find NIS server"
msgstr ""
@@ -884,6 +607,18 @@ msgstr ""
msgid "Unresolved Dependencies"
msgstr ""
+#: ../iw/dependencies.py:29 ../iw/progress.py:113
+msgid "Package"
+msgstr ""
+
+#: ../iw/dependencies.py:29
+msgid "Requirement"
+msgstr ""
+
+#: ../iw/dependencies.py:36
+msgid "Install packages to satisfy dependencies"
+msgstr ""
+
#: ../iw/examine.py:11
msgid "Upgrade Examine"
msgstr ""
@@ -914,8 +649,8 @@ msgstr ""
msgid "KDE Workstation"
msgstr ""
-#: ../iw/installpath.py:36 ../libfdisk/gnomefsedit.c:2157
-#: ../libfdisk/gnomefsedit.c:2177
+#: ../iw/installpath.py:36 ../libfdisk/gnomefsedit.c:2196
+#: ../libfdisk/gnomefsedit.c:2216
msgid "Server"
msgstr ""
@@ -951,7 +686,7 @@ msgstr ""
msgid "Variant"
msgstr ""
-#: ../iw/language.py:15
+#: ../iw/language.py:14
msgid "What language should be used during the installation process?"
msgstr ""
@@ -959,34 +694,50 @@ msgstr ""
msgid "Lilo Configuration"
msgstr ""
-#: ../iw/lilo.py:96 ../iw/lilo.py:195
+#: ../iw/lilo.py:99 ../iw/lilo.py:198
msgid "Type"
msgstr ""
-#: ../iw/lilo.py:125
+#: ../iw/lilo.py:128
msgid "Install LILO boot record on:"
msgstr ""
-#: ../iw/lilo.py:130
+#: ../iw/lilo.py:133
msgid "Master Boot Record (MBR)"
msgstr ""
-#: ../iw/lilo.py:134
+#: ../iw/lilo.py:137
msgid "First sector of boot partition"
msgstr ""
#: ../iw/lilo.py:141
+msgid "Use linear mode (needed for some SCSI drives)"
+msgstr ""
+
+#: ../iw/lilo.py:144
msgid "Kernel parameters"
msgstr ""
-#: ../iw/lilo.py:156
+#: ../iw/lilo.py:159
msgid "Create boot disk"
msgstr ""
-#: ../iw/lilo.py:160
+#: ../iw/lilo.py:163
msgid "Do not install LILO"
msgstr ""
+#: ../iw/lilo.py:174
+msgid "Default"
+msgstr ""
+
+#: ../iw/lilo.py:174
+msgid "Partition type"
+msgstr ""
+
+#: ../iw/lilo.py:174 ../iw/lilo.py:209
+msgid "Boot label"
+msgstr ""
+
#: ../iw/network.py:127
msgid "Configure using DHCP"
msgstr ""
@@ -1051,39 +802,47 @@ msgstr ""
msgid "Select Package For Installation"
msgstr ""
+#: ../iw/package.py:377
+msgid "Package Group Selection"
+msgstr ""
+
+#: ../iw/package.py:445
+msgid "Select individual packages"
+msgstr ""
+
#: ../iw/progress.py:26
msgid "Installing Packages"
msgstr ""
-#: ../iw/progress.py:113 ../iw/progress.py:148
+#: ../iw/progress.py:114 ../iw/progress.py:149
msgid "Size"
msgstr ""
-#: ../iw/progress.py:114
+#: ../iw/progress.py:115
msgid "Summary"
msgstr ""
-#: ../iw/progress.py:148
+#: ../iw/progress.py:149
msgid "Status"
msgstr ""
-#: ../iw/progress.py:148
+#: ../iw/progress.py:149
msgid "Packages"
msgstr ""
-#: ../iw/progress.py:148
+#: ../iw/progress.py:149
msgid "Time"
msgstr ""
-#: ../iw/progress.py:153
+#: ../iw/progress.py:154
msgid "Total"
msgstr ""
-#: ../iw/progress.py:154
+#: ../iw/progress.py:155
msgid "Completed"
msgstr ""
-#: ../iw/progress.py:155
+#: ../iw/progress.py:156
msgid "Remaining"
msgstr ""
@@ -1095,10 +854,28 @@ msgstr ""
msgid "Root Partition Selection"
msgstr ""
-#: ../iw/rootpartition.py:122
+#: ../iw/rootpartition.py:86
+msgid "Automatic Partitioning"
+msgstr ""
+
+#: ../iw/rootpartition.py:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"If you don't want to do this, you can continue with this install by "
+"partitioning manually, or you can go back and perform a fully customized "
+"installation."
+msgstr ""
+
+#: ../iw/rootpartition.py:136
msgid "Remove data"
msgstr ""
+#: ../iw/rootpartition.py:139
+msgid "Manually partition"
+msgstr ""
+
#: ../iw/timezone.py:110
msgid "View:"
msgstr ""
@@ -1253,7 +1030,7 @@ msgid ""
"filesystems. Please check your hardware for the cause of this problem."
msgstr ""
-#: ../libfdisk/fsedit.c:924
+#: ../libfdisk/fsedit.c:950
#, c-format
msgid ""
"A disk with a corrupt Sun disklabel has been found while reading block "
@@ -1261,157 +1038,164 @@ msgid ""
"device."
msgstr ""
-#: ../libfdisk/fsedit.c:928
+#: ../libfdisk/fsedit.c:954
msgid "Corrupt Sun disklabel"
msgstr ""
-#: ../libfdisk/fsedit.c:929 ../libfdisk/fsedit.c:985 ../libfdisk/fsedit.c:1010
+#: ../libfdisk/fsedit.c:955 ../libfdisk/fsedit.c:1011
+#: ../libfdisk/fsedit.c:1036
msgid "Skip Drive"
msgstr ""
-#: ../libfdisk/fsedit.c:938 ../libfdisk/fsedit.c:1006
+#: ../libfdisk/fsedit.c:964 ../libfdisk/fsedit.c:1032
#, c-format
msgid ""
"An error occurred reading the partition table for the block device %s. The "
"error was"
msgstr ""
-#: ../libfdisk/fsedit.c:979
+#: ../libfdisk/fsedit.c:1005
#, c-format
msgid ""
"The partition table on device %s is corrupted. To create new partitions it "
"must be initialized, causing the loss of ALL DATA on this drive."
msgstr ""
-#: ../libfdisk/fsedit.c:984
+#: ../libfdisk/fsedit.c:1010
msgid "Bad Partition Table"
msgstr ""
-#: ../libfdisk/fsedit.c:985
+#: ../libfdisk/fsedit.c:1011
msgid "Initialize"
msgstr ""
-#: ../libfdisk/fsedit.c:1010
+#: ../libfdisk/fsedit.c:1036
msgid "Retry"
msgstr ""
-#: ../libfdisk/fsedit.c:1022
+#: ../libfdisk/fsedit.c:1048
msgid "BSD Disklabel"
msgstr ""
-#: ../libfdisk/fsedit.c:1022
+#: ../libfdisk/fsedit.c:1048
msgid ""
"A disk with a BSD disklabel has been found. The Red Hat installation only "
"supports BSD Disklabels in read-only mode, so you must use a custom install "
"and fdisk (instead of Disk Druid) for machines with BSD Disklabels."
msgstr ""
-#: ../libfdisk/fsedit.c:1052
+#: ../libfdisk/fsedit.c:1078
#, c-format
msgid "System error %d"
msgstr ""
-#: ../libfdisk/fsedit.c:1061 ../libfdisk/fsedit.c:1063
+#: ../libfdisk/fsedit.c:1087 ../libfdisk/fsedit.c:1089
msgid "Fdisk Error"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:478 ../libfdisk/gnomefsedit.c:647
+#: ../libfdisk/gnomefsedit.c:517 ../libfdisk/gnomefsedit.c:686
msgid "<Swap Partition>"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:486 ../libfdisk/gnomefsedit.c:649
+#: ../libfdisk/gnomefsedit.c:525 ../libfdisk/gnomefsedit.c:688
msgid "<RAID Partition>"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:541 ../libfdisk/newtfsedit.c:697
+#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/newtfsedit.c:697
msgid "Delete Partition"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:542 ../libfdisk/newtfsedit.c:698
+#: ../libfdisk/gnomefsedit.c:581 ../libfdisk/newtfsedit.c:698
msgid "Are you sure you want to delete this partition?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:600 ../libfdisk/gnomefsedit.c:606
-#: ../libfdisk/gnomefsedit.c:610 ../libfdisk/gnomefsedit.c:612
+#: ../libfdisk/gnomefsedit.c:639 ../libfdisk/gnomefsedit.c:645
+#: ../libfdisk/gnomefsedit.c:649 ../libfdisk/gnomefsedit.c:651
#: ../libfdisk/newtfsedit.c:263 ../libfdisk/newtfsedit.c:269
#: ../libfdisk/newtfsedit.c:273 ../libfdisk/newtfsedit.c:275
msgid "Edit Partition"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:627 ../libfdisk/gnomefsedit.c:1589
+#: ../libfdisk/gnomefsedit.c:655 ../libfdisk/gnomefsedit.c:1619
+#: ../libfdisk/gnomefsedit.c:2128 ../libfdisk/newtfsedit.c:450
+#: ../libfdisk/newtfsedit.c:1501
+msgid "Cancel"
+msgstr ""
+
+#: ../libfdisk/gnomefsedit.c:666 ../libfdisk/gnomefsedit.c:1628
msgid "Mount Point:"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:662
+#: ../libfdisk/gnomefsedit.c:701
msgid "Size (Megs):"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:693
+#: ../libfdisk/gnomefsedit.c:732
msgid "Grow to fill disk?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:712 ../libfdisk/newtfsedit.c:335
+#: ../libfdisk/gnomefsedit.c:751 ../libfdisk/newtfsedit.c:335
msgid "Allocation Status:"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:716 ../libfdisk/newtfsedit.c:337
+#: ../libfdisk/gnomefsedit.c:755 ../libfdisk/newtfsedit.c:337
msgid "Successful"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:719 ../libfdisk/newtfsedit.c:339
+#: ../libfdisk/gnomefsedit.c:758 ../libfdisk/newtfsedit.c:339
msgid "Failed"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:731 ../libfdisk/newtfsedit.c:344
+#: ../libfdisk/gnomefsedit.c:770 ../libfdisk/newtfsedit.c:344
msgid "Failure Reason:"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:745 ../libfdisk/gnomefsedit.c:1615
+#: ../libfdisk/gnomefsedit.c:784 ../libfdisk/gnomefsedit.c:1654
msgid "Partition Type:"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:812
+#: ../libfdisk/gnomefsedit.c:851
msgid "Allowable Drives:"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:917 ../libfdisk/gnomefsedit.c:1807
+#: ../libfdisk/gnomefsedit.c:956 ../libfdisk/gnomefsedit.c:1846
#: ../libfdisk/newtfsedit.c:486
msgid "No Mount Point"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:918 ../libfdisk/newtfsedit.c:487
+#: ../libfdisk/gnomefsedit.c:957 ../libfdisk/newtfsedit.c:487
msgid ""
"You have not selected a mount point for this partition. Are you sure you "
"want to do this?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:961 ../libfdisk/gnomefsedit.c:1815
+#: ../libfdisk/gnomefsedit.c:1000 ../libfdisk/gnomefsedit.c:1854
#: ../libfdisk/newtfsedit.c:527
msgid "Mount Point Error"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:962 ../libfdisk/newtfsedit.c:528
+#: ../libfdisk/gnomefsedit.c:1001 ../libfdisk/newtfsedit.c:528
msgid ""
"The mount point requested is either an illegal path or is already in use. "
"Please select a valid mount point."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:987 ../libfdisk/newtfsedit.c:545
+#: ../libfdisk/gnomefsedit.c:1026 ../libfdisk/newtfsedit.c:545
msgid "Size Error"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:988 ../libfdisk/newtfsedit.c:546
+#: ../libfdisk/gnomefsedit.c:1027 ../libfdisk/newtfsedit.c:546
msgid ""
"The size requested is illegal. Make sure the size is greater and zero (0), "
"and is specified int decimal (base 10) format."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1023 ../libfdisk/gnomefsedit.c:1928
+#: ../libfdisk/gnomefsedit.c:1062 ../libfdisk/gnomefsedit.c:1967
#: ../libfdisk/newtfsedit.c:581
msgid "Swap Size Error"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1024 ../libfdisk/gnomefsedit.c:1929
+#: ../libfdisk/gnomefsedit.c:1063 ../libfdisk/gnomefsedit.c:1968
#: ../libfdisk/newtfsedit.c:582
#, c-format
msgid ""
@@ -1419,22 +1203,22 @@ msgid ""
"swap partition is %ld Megabytes."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1040 ../libfdisk/gnomefsedit.c:1047
+#: ../libfdisk/gnomefsedit.c:1079 ../libfdisk/gnomefsedit.c:1086
msgid "No RAID Drive Constraint"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1042
+#: ../libfdisk/gnomefsedit.c:1081
msgid ""
"You have configured a RAID partition without constraining the partition to a "
"single drive.\n"
" Are you sure you want to do this?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1048
+#: ../libfdisk/gnomefsedit.c:1087
msgid "Close"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1049
+#: ../libfdisk/gnomefsedit.c:1088
msgid ""
"You have configured a RAID partition without constraining the partition to a "
"single drive. Please select one drive to constrain this partition to."
@@ -1442,11 +1226,11 @@ msgstr ""
#. XXXXX - for now destroy the raid entry since it
#. now contains unallocated partitions!
-#: ../libfdisk/gnomefsedit.c:1228
+#: ../libfdisk/gnomefsedit.c:1267
msgid "RAID Entry Incomplete"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1229
+#: ../libfdisk/gnomefsedit.c:1268
#, c-format
msgid ""
"The raid device /dev/%s now contains partitions which are unallocated. The "
@@ -1455,12 +1239,12 @@ msgid ""
msgstr ""
#. build list of why they all failed
-#: ../libfdisk/gnomefsedit.c:1322 ../libfdisk/gnomefsedit.c:1341
+#: ../libfdisk/gnomefsedit.c:1361 ../libfdisk/gnomefsedit.c:1380
#: ../libfdisk/newtfsedit.c:84 ../libfdisk/newtfsedit.c:1482
msgid "Unallocated Partitions"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1326 ../libfdisk/gnomefsedit.c:1336
+#: ../libfdisk/gnomefsedit.c:1365 ../libfdisk/gnomefsedit.c:1375
#: ../libfdisk/newtfsedit.c:88
msgid ""
"There are currently unallocated partition(s) present in the list of "
@@ -1468,80 +1252,80 @@ msgid ""
"with the reason they were not allocated."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1601
+#: ../libfdisk/gnomefsedit.c:1640
msgid "<Swap Partition"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1659
+#: ../libfdisk/gnomefsedit.c:1698
msgid "RAID Device: /dev/"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1682
+#: ../libfdisk/gnomefsedit.c:1721
msgid "RAID Type:"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1719
+#: ../libfdisk/gnomefsedit.c:1758
msgid "Partitions For RAID Array:"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1808
+#: ../libfdisk/gnomefsedit.c:1847
msgid "You have not selected a mount point. A mount point is required."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1816
+#: ../libfdisk/gnomefsedit.c:1855
msgid ""
"The mount point requested is already in use. Please select a valid mount "
"point."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1829
+#: ../libfdisk/gnomefsedit.c:1868
msgid "Booting From RAID Warning"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1830
+#: ../libfdisk/gnomefsedit.c:1869
msgid ""
"You have made this raid device mount as a booting partition. Please make "
"sure all the component partitions are bootable."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1840
+#: ../libfdisk/gnomefsedit.c:1879
msgid "No RAID Device"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1841
+#: ../libfdisk/gnomefsedit.c:1880
msgid "You need to selected a RAID device."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1847
+#: ../libfdisk/gnomefsedit.c:1886
msgid "Used Raid Device"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1848
+#: ../libfdisk/gnomefsedit.c:1887
#, c-format
msgid ""
"The raid device \"/dev/%s\" is already configured as a raid device. Please "
"select another."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1861
+#: ../libfdisk/gnomefsedit.c:1900
msgid "Not Enough Partitions"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1863
+#: ../libfdisk/gnomefsedit.c:1902
msgid ""
"You have not configured enough partitions for the RAID type you have "
"selected."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1870
+#: ../libfdisk/gnomefsedit.c:1909
msgid "Illegal /boot RAID Type"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1872
+#: ../libfdisk/gnomefsedit.c:1911
msgid "Boot partitions (/boot) are only allowed on RAID-1."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1973
+#: ../libfdisk/gnomefsedit.c:2012
#, c-format
msgid ""
"The partition %s is a pre-existing partition in the set of partitions for "
@@ -1549,140 +1333,115 @@ msgid ""
"possible to boot from this partition?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:1980
+#: ../libfdisk/gnomefsedit.c:2019
msgid "Use Pre-existing Partition?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2089
+#: ../libfdisk/gnomefsedit.c:2128
msgid "Auto-Partition"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2096
+#: ../libfdisk/gnomefsedit.c:2135
msgid "Using Existing Disk Space"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2115
+#: ../libfdisk/gnomefsedit.c:2154
msgid "Remove Linux partitions"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2126
+#: ../libfdisk/gnomefsedit.c:2165
msgid "Use existing free space"
msgstr ""
#. workstation or server?
-#: ../libfdisk/gnomefsedit.c:2138
+#: ../libfdisk/gnomefsedit.c:2177
msgid "Intended Use"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2177
+#: ../libfdisk/gnomefsedit.c:2216
msgid "Workstation"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2251
+#: ../libfdisk/gnomefsedit.c:2290
msgid "Delete RAID Device?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2252
+#: ../libfdisk/gnomefsedit.c:2291
msgid "Are you sure you want to remove this RAID device?"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2303 ../libfdisk/newtfsedit.c:1585
+#: ../libfdisk/gnomefsedit.c:2342 ../libfdisk/newtfsedit.c:1585
msgid "Reset Partition Table"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2305 ../libfdisk/newtfsedit.c:1587
+#: ../libfdisk/gnomefsedit.c:2344 ../libfdisk/newtfsedit.c:1587
msgid "Reset partition table to original contents? "
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2341 ../libfdisk/gnomefsedit.c:2392
+#: ../libfdisk/gnomefsedit.c:2380 ../libfdisk/gnomefsedit.c:2431
msgid "<Swap>"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2343
+#: ../libfdisk/gnomefsedit.c:2382
msgid "<RAID>"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2345
+#: ../libfdisk/gnomefsedit.c:2384
msgid "<not set>"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2902
+#: ../libfdisk/gnomefsedit.c:2941
msgid "Unallocated Partitions Exist..."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2913
+#: ../libfdisk/gnomefsedit.c:2952
msgid ""
"You must assign a root (/) partition to a Linux native partition (ext2) or a "
"RAID partition for the install to proceed."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2927 ../libfdisk/gnomefsedit.c:2940
+#: ../libfdisk/gnomefsedit.c:2966 ../libfdisk/gnomefsedit.c:2979
msgid ""
"You must assign a boot (/boot) partition to a Linux native partition (ext2) "
"or a RAID-1 partition for the install to proceed."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:2955
+#: ../libfdisk/gnomefsedit.c:2994
msgid ""
"Because you have assigned the root partition (/) to a RAID device, you must "
"also assign a boot (/boot) partition to a Linux native partition (ext2) or a "
"RAID-1 partition for the install to proceed."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:3028
+#: ../libfdisk/gnomefsedit.c:3067
msgid "Partitions"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:3072
+#: ../libfdisk/gnomefsedit.c:3111
msgid "_Add..."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:3084
+#: ../libfdisk/gnomefsedit.c:3123
msgid "_Edit..."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:3085
+#: ../libfdisk/gnomefsedit.c:3124
msgid "_Delete"
msgstr ""
-#: ../libfdisk/gnomefsedit.c:3086
+#: ../libfdisk/gnomefsedit.c:3125
msgid "_Reset"
msgstr ""
-#. XXXX - uncomment if you want the add raid button
-#.
-#. if (!context->dontPartition) {
-#. #ifdef GNOME_FSEDIT_USE_BUTTON_BOX
-#. buttonbox2 = gtk_hbutton_box_new ();
-#. gtk_button_box_set_child_size (GTK_BUTTON_BOX (buttonbox2),
-#. GTK_BUTTONBOX_DEFAULT, 0);
-#. gtk_box_pack_start (GTK_BOX (vbox2), buttonbox2, FALSE, FALSE, 0);
-#. gtk_widget_show (buttonbox2);
-#. #endif
-#.
-#. addraid_button = accel_button (accelgroup, _("_Make RAID Device"));
-#. #ifdef GNOME_FSEDIT_USE_BUTTON_BOX
-#. gtk_container_add (GTK_CONTAINER (buttonbox2), addraid_button);
-#. #else
-#. gtk_box_pack_start (GTK_BOX (hbox), addraid_button, TRUE, FALSE, 0);
-#. #endif
-#. gtk_signal_connect (GTK_OBJECT (addraid_button), "clicked",
-#. GTK_SIGNAL_FUNC (addraid_button_cb), context);
-#.
-#. auto_button = accel_button (accelgroup, _("Auto Partition"));
-#.
-#. uncomment to get auto-partition button to be packed
-#.
-#. #ifdef GNOME_FSEDIT_USE_BUTTON_BOX
-#. gtk_container_add (GTK_CONTAINER (buttonbox2), auto_button);
-#. #else
-#. gtk_box_pack_start (GTK_BOX (hbox), auto_button, TRUE, FALSE, 0);
-#. #endif
-#. gtk_signal_connect (GTK_OBJECT (auto_button), "clicked",
-#. GTK_SIGNAL_FUNC (auto_button_cb), context);
-#. }
-#.
-#: ../libfdisk/gnomefsedit.c:3139
+#: ../libfdisk/gnomefsedit.c:3154
+msgid "_Make RAID Device"
+msgstr ""
+
+#: ../libfdisk/gnomefsedit.c:3163
+msgid "Auto Partition"
+msgstr ""
+
+#: ../libfdisk/gnomefsedit.c:3176
msgid "Drive Summary"
msgstr ""
diff --git a/todo.py b/todo.py
index eafe90a19..8171b2304 100644
--- a/todo.py
+++ b/todo.py
@@ -544,7 +544,7 @@ class ToDo:
f.write (format % ( '/dev/' + dev, mntpoint, fs, 'noauto,owner,ro', 0, 0))
else:
f.write (format % ( '/dev/' + dev, mntpoint, fs, 'defaults', 0, 0))
- f.write (format % ("/dev/fd0", "/mnt/floppy", 'ext', 'noauto,owner', 0, 0))
+ f.write (format % ("/dev/fd0", "/mnt/floppy", 'ext2', 'noauto,owner', 0, 0))
f.write (format % ("none", "/proc", 'proc', 'defaults', 0, 0))
f.write (format % ("none", "/dev/pts", 'devpts', 'gid=5,mode=620', 0, 0))
f.close ()
diff --git a/upd-instroot b/upd-instroot
index 39fc2bd10..49f0bbd2e 100755
--- a/upd-instroot
+++ b/upd-instroot
@@ -13,11 +13,15 @@ echo HOMEDIR $HOMEDIR
pythondeps() {
DIR=$1
+ mkdir -p $DIR/proc
+ mount -t proc /proc $DIR/proc
(chroot $DIR /usr/bin/anaconda -m dir://mnt/source --test --text --traceonly; \
cd $DIR; find usr/lib/python* -type f | sed 's,^,/,' ) | sort | uniq -u |
sed s,^,./, | while read fn; do
[ ! -d $DIR/$fn ] && rm $DIR/$fn
done
+ umount $DIR/proc
+ rmdir $DIR/proc
}
SRC=$1/RedHat/RPMS
@@ -36,7 +40,8 @@ echo "DESTGR is $DESTGR"
PACKAGES="glibc-2 ldconfig setup e2fsprogs-1 XFree86-libs XFree86-SVGA
XFree86-S3 XFree86-S3V XFree86-Mach32 XFree86-Mach64
XFree86-FBDev XFree86-75dpi-fonts XFree86-I128
- XFree86-3DLabs XFree86-VGA16 XFree86-3. xpm-3 glib- gtk+-
+ XFree86-3DLabs XFree86-VGA16 XFree86-Sun
+ XFree86-3. xpm-3 glib- gtk+-
gnome-libs python-1 newt imlib-1 libpng libtiff libjpeg-
libtermcap-2 zlib rpm rpm-devel ash- bash- pygtk- pygnome-
util-linux procps esound-0 audiofile-0 kernel-pcmcia-cs
@@ -121,6 +126,9 @@ usr/X11R6/bin/XF86_SVGA
usr/X11R6/bin/XF86_S3
usr/X11R6/bin/XF86_S3V
usr/X11R6/bin/XF86_VGA16
+usr/X11R6/bin/XsunMono
+usr/X11R6/bin/Xsun
+usr/X11R6/bin/Xsun24
usr/X11R6/bin/Xtest
usr/X11R6/lib/X11/fonts/75dpi/cour*
usr/X11R6/lib/X11/fonts/75dpi/helv*
diff --git a/utils/moddeps.c b/utils/moddeps.c
index 2230e9817..64aa7bc76 100644
--- a/utils/moddeps.c
+++ b/utils/moddeps.c
@@ -55,3 +55,5 @@ int main(int argc, char ** argv) {
return 0;
}
+void logMessage(const char * s, ...) {
+}
generated by cgit (git 2.34.1) at 2024-09-30 02:23:44 +0000