summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xanaconda-stub6
-rw-r--r--comps.py6
-rw-r--r--installclass.py4
-rw-r--r--isys/Makefile14
-rw-r--r--isys/imount.c4
-rw-r--r--isys/otherinsmod.c52
-rw-r--r--iw/silo.py34
-rw-r--r--kickstart.py3
-rw-r--r--loader/Makefile4
-rw-r--r--loader/loader.c100
-rw-r--r--po/anaconda.pot312
-rw-r--r--todo.py10
-rwxr-xr-xupd-instroot15
-rw-r--r--utils/Makefile2
14 files changed, 352 insertions, 214 deletions
diff --git a/anaconda-stub b/anaconda-stub
index 665c485f6..eefd9c98c 100755
--- a/anaconda-stub
+++ b/anaconda-stub
@@ -2,6 +2,8 @@
cd /mnt/runtime/modules
rm *
+cd /modules
+rm *
rm /bin/loader
cd /tmp
@@ -29,6 +31,10 @@ for n in *.cgz; do
rm $n
done
+cd /usr/sbin
+uncpio < sbin.cgz
+rm sbin.cgz
+
cd /lib
uncpio < libs.cgz
rm libs.cgz
diff --git a/comps.py b/comps.py
index 16cef771f..07f2118be 100644
--- a/comps.py
+++ b/comps.py
@@ -11,7 +11,8 @@ XFreeServerPackages = { 'XFree86-3DLabs' : 1, 'XFree86-8514' : 1,
'XFree86-Mach8' : 1, 'XFree86-Mono' : 1,
'XFree86-P9000' : 1, 'XFree86-S3' : 1,
'XFree86-S3V' : 1, 'XFree86-SVGA' : 1,
- 'XFree86-W32' : 1 }
+ 'XFree86-W32' : 1, 'XFree86-Sun' : 1,
+ 'XFree86-SunMono' : 1, 'XFree86-Sun24' : 1 }
class Package:
def __getitem__(self, item):
@@ -228,7 +229,8 @@ class ComponentSet:
comp = Component(l, default == '1', hidden)
elif (l == "}"):
if conditional:
- conditional.dependents.append (comp)
+ if comp.conditional.has_key (conditional):
+ conditional.dependents.append (comp)
conditional = None
else:
self.comps.append(comp)
diff --git a/installclass.py b/installclass.py
index b750db555..22158583a 100644
--- a/installclass.py
+++ b/installclass.py
@@ -90,7 +90,7 @@ class InstallClass:
def addToSkipList(self, type):
# this throws an exception if there is a problem
- [ "lilo", "mouse", "network", "authentication", "complete", "complete",
+ [ "lilo", "silo", "mouse", "network", "authentication", "complete", "complete",
"package-selection", "bootdisk", "partition", "format", "timezone",
"accounts", "dependencies", "language", "keyboard", "xconfig",
"welcome", "installtype", "mouse", "confirm-install" ].index(type)
@@ -232,6 +232,7 @@ class Workstation(InstallClass):
InstallClass.__init__(self)
self.setHostname("localhost.localdomain")
self.addToSkipList("lilo")
+ self.addToSkipList("silo")
self.addToSkipList("authentication")
self.addToSkipList("bootdisk")
self.addToSkipList("partition")
@@ -265,6 +266,7 @@ class Server(InstallClass):
self.setGroups(["Server"])
self.setHostname("localhost.localdomain")
self.addToSkipList("lilo")
+ self.addToSkipList("silo")
self.addToSkipList("package-selection")
self.addToSkipList("authentication")
self.addToSkipList("bootdisk")
diff --git a/isys/Makefile b/isys/Makefile
index 8f5dcb808..eab8420ba 100644
--- a/isys/Makefile
+++ b/isys/Makefile
@@ -1,3 +1,5 @@
+ARCH := $(patsubst i%86,i386,$(shell uname -m))
+ARCH := $(patsubst sparc%,sparc,$(ARCH))
CFLAGS = -I/usr/include/python1.5 -I.. -g
OBJECTS = nfsmount.o dns.o mount_clnt.o mount_xdr.o imount.o \
smp.o moduleinfo.o devnodes.o cpio.o probe.o
@@ -6,12 +8,20 @@ STATICLIBS = ../kudzu/libkudzu.a
LOADLIBES = -lrpm -lbz2 -lresolv -lz -lpci -lpopt
SUBDIRS = modutils pci
PYTHONLIBDIR = $(DESTDIR)/usr/lib/python1.5/site-packages
+PYMODULES = _isys.so
-all: subdirs _isys.so libisys.a
+ifeq ($(ARCH),sparc)
+PYMODULES += _silo.so
+endif
+
+all: subdirs $(PYMODULES) libisys.a
_isys.so: isys.o $(OBJECTS) $(STATICLIBS)
gcc -shared -g -o $@ isys.o $(OBJECTS) $(STATICLIBS) $(LOADLIBES)
+_silo.so: silo.c
+ gcc -shared $(CFLAGS) -fpic -o $@ silo.c
+
libisys.a: libisys.a($(OBJECTS) $(STATICOBJS))
clean:
@@ -19,7 +29,7 @@ clean:
for d in $(SUBDIRS); do make TOPDIR=../$(TOPDIR) -C $$d clean; done
install: all
- cp _isys.so isys.py $(PYTHONLIBDIR)
+ cp $(PYMODULES) isys.py $(PYTHONLIBDIR)
subdirs:
for d in $(SUBDIRS); do make TOPDIR=../$(TOPDIR) -C $$d; done
diff --git a/isys/imount.c b/isys/imount.c
index 0d7e24d26..66b4e0948 100644
--- a/isys/imount.c
+++ b/isys/imount.c
@@ -84,6 +84,10 @@ int doPwMount(char * dev, char * where, char * fs, int rdonly, int istty,
if (!strncmp(fs, "vfat", 4))
mount_opt="check=relaxed";
+ #ifdef __sparc__
+ if (!strncmp(fs, "ufs", 3))
+ mount_opt="ufstype=sun";
+ #endif
/*logMessage("calling mount(%s, %s, %s, %ld, %p)", buf, where, fs,
flag, mount_opt);*/
diff --git a/isys/otherinsmod.c b/isys/otherinsmod.c
index 96be30093..814d60286 100644
--- a/isys/otherinsmod.c
+++ b/isys/otherinsmod.c
@@ -20,7 +20,7 @@ int ourInsmodCommand(int argc, char ** argv) {
char * chptr;
FD_t fd;
int rc, rmObj = 0;
- int sparc64 = 0;
+ int sparc64 = 0, i;
char * ballPath = NULL;
char fullName[100];
struct utsname u;
@@ -44,33 +44,47 @@ int ourInsmodCommand(int argc, char ** argv) {
argv += 2;
argc -= 2;
} else {
- ballPath = sparc64 ?
- "/modules/modules64.cgz" : "/modules/modules.cgz";
+ ballPath = strdup(sparc64 ?
+ "/modules/modules64.cgz" :
+ "/modules/modules.cgz");
}
file = argv[1];
if (access(file, R_OK)) {
- /* it might be having a ball */
- fd = fdOpen(ballPath, O_RDONLY, 0);
- if (fdFileno(fd) < 0) {
- return 1;
+ /* Try two balls on sparc64, one elsewhere */
+ for (i = 0; ; i++) {
+ /* it might be having a ball */
+ fd = fdOpen(ballPath, O_RDONLY, 0);
+ if (fdFileno(fd) < 0) {
+ free(ballPath);
+ return 1;
+ }
+
+ chptr = strrchr(file, '/');
+ if (chptr) file = chptr + 1;
+ sprintf(finalName, "/tmp/%s", file);
+
+ sprintf(fullName, "%s/%s", u.release, file);
+
+ if (installCpioFile(fd, fullName, finalName, 0)) {
+ if (i < sparc64) {
+ ballPath[strlen(ballPath)-5] = '5';
+ continue;
+ }
+ free(ballPath);
+ return 1;
+ }
+
+ rmObj = 1;
+ file = finalName;
+ break;
}
-
- chptr = strrchr(file, '/');
- if (chptr) file = chptr + 1;
- sprintf(finalName, "/tmp/%s", file);
-
- sprintf(fullName, "%s/%s", u.release, file);
-
- if (installCpioFile(fd, fullName, finalName, 0))
- return 1;
-
- rmObj = 1;
- file = finalName;
}
+ free(ballPath);
+
argv[0] = "insmod";
argv[1] = file;
diff --git a/iw/silo.py b/iw/silo.py
index 2021e04c1..b0ee4036b 100644
--- a/iw/silo.py
+++ b/iw/silo.py
@@ -20,6 +20,8 @@ class SiloWindow (InstallWindow):
self.type = None
self.bootdisk = None
self.silo = None
+ self.linuxAlias = None
+ self.bootDevice = None
def getNext (self):
# XXX
@@ -108,15 +110,15 @@ class SiloWindow (InstallWindow):
self.ignoreSignals = 0
def getScreen (self):
- self.images = self.todo.getLiloImages()
+ self.images = self.todo.silo.getSiloImages()
self.ignoreSignals = 0
if '/' not in self.todo.mounts.keys (): return None
- (bootpart, boothd) = self.todo.getLiloOptions()
+ (bootpart, boothd) = self.todo.silo.getSiloOptions()
format = "/dev/%s"
- self.radioBox = GtkTable(2, 6)
+ self.radioBox = GtkTable(2, 7)
self.radioBox.set_border_width (5)
spacer = GtkLabel("")
@@ -129,12 +131,28 @@ class SiloWindow (InstallWindow):
part = GtkRadioButton(None,
("/dev/%s %s" % (bootpart,
- _("First sector of boot partition (recommended)"))))
+ _("First sector of boot partition"))))
self.mbr = GtkRadioButton(part,
("/dev/%s %s" % (boothd, _("Master Boot Record (MBR)"))))
self.radioBox.attach(part, 1, 2, 2, 3)
self.radioBox.attach(self.mbr, 1, 2, 3, 4)
+ print "bootpart ", bootpart, " ", self.todo.silo.disk2PromPath(bootpart)
+
+ # FIXME: Position this correctly
+ self.linuxAlias = GtkCheckButton(
+ ("%s: linux %s" % (_("Create PROM alias"), self.todo.silo.disk2PromPath(bootpart))))
+ self.radioBox.attach(self.linuxAlias, 0, 2, 4, 5)
+ if (self.todo.silo.hasAliases()):
+ self.linuxAlias.set_active (TRUE)
+ else:
+ self.linuxAlias.set_active (FALSE)
+ self.linuxAlias.set_sensitive (FALSE)
+
+ self.bootDevice = GtkCheckButton(_("Set default PROM boot device to linux"))
+ self.radioBox.attach(self.bootDevice, 0, 2, 4, 6)
+ self.bootDevice.set_active (TRUE)
+
label = GtkLabel(_("Kernel parameters") + ":")
label.set_alignment(0.0, 0.5)
self.appendEntry = GtkEntry(15)
@@ -144,14 +162,18 @@ class SiloWindow (InstallWindow):
alignment = GtkAlignment()
alignment.set(0.0, 0.5, 0, 1.0)
alignment.add(box)
- self.radioBox.attach(alignment, 0, 2, 5, 6)
+ self.radioBox.attach(alignment, 0, 2, 5, 7)
box = GtkVBox (FALSE, 0)
optionBox = GtkVBox (FALSE, 5)
optionBox.set_border_width (5)
self.bootdisk = GtkCheckButton (_("Create boot disk"))
- self.bootdisk.set_active (TRUE)
+ if self.todo.silo.hasUsableFloppy():
+ self.bootdisk.set_active (TRUE)
+ else:
+ self.bootdisk.set_active (FALSE)
+ self.bootdisk.set_sensitive (FALSE)
optionBox.pack_start (self.bootdisk)
self.silo = GtkCheckButton (_("Do not install SILO"))
diff --git a/kickstart.py b/kickstart.py
index 47d5d30b2..ce7155116 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -195,7 +195,8 @@ class Kickstart(InstallClass):
"msbm" : "Microsoft - Bus Mouse" ,
"mousesystems" : "Mouse Systems - Mouse (serial)" ,
"mmseries" : "MM - Series (serial)" ,
- "mmhittab" : "MM - HitTablet (serial)"
+ "mmhittab" : "MM - HitTablet (serial)" ,
+ "sun" : "Sun - Mouse"
}
(args, extra) = isys.getopt(args, '', [ 'device=', 'emulthree',
diff --git a/loader/Makefile b/loader/Makefile
index 9e5194497..fb6f14365 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -39,7 +39,7 @@ BINS += loader
endif
ifeq (sparc, $(ARCH))
-BINS += loader
+BINS += loader loader-local
OBJS += stubs.o
endif
@@ -101,7 +101,7 @@ install: all
loader: loader.o $(OBJS) $(NETOBJS)
$(CC) -g $(STATIC) -o $@ $^ -lpopt \
- ../kudzu/libkudzu.a ../isys/libisys.a ../balkan/libbalkan.a \
+ ../kudzu/libkudzu_loader.a ../isys/libisys.a ../balkan/libbalkan.a \
../isys/modutils/insmod/libmodutils.a \
../isys/modutils/util/libutil.a \
../isys/modutils/obj/libobj.a \
diff --git a/loader/loader.c b/loader/loader.c
index fdd213923..d690a4f59 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -33,6 +33,7 @@
#include <string.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <sys/utsname.h>
#include <unistd.h>
#include <zlib.h>
@@ -540,6 +541,9 @@ static char * mountHardDrive(struct installMethod * method,
char * type;
char * url = NULL;
int numPartitions;
+ #ifdef __sparc__
+ static int ufsloaded;
+ #endif
mlLoadModule("vfat", NULL, modLoaded, modDeps, NULL, flags);
@@ -554,8 +558,17 @@ static char * mountHardDrive(struct installMethod * method,
"device %s: %d", kd->known[i].name, rc);
} else {
for (j = 0; j < table.maxNumPartitions; j++) {
- if (table.parts[j].type == BALKAN_PART_DOS ||
- table.parts[j].type == BALKAN_PART_EXT2) {
+ switch (table.parts[j].type) {
+ #ifdef __sparc__
+ case BALKAN_PART_UFS:
+ if (!ufsloaded) {
+ ufsloaded = 1;
+ mlLoadModule("ufs", NULL, modLoaded, modDeps, NULL, flags);
+ }
+ /* FALLTHROUGH */
+ #endif
+ case BALKAN_PART_DOS:
+ case BALKAN_PART_EXT2:
sprintf(partitions[numPartitions].name,
"/dev/%s%d", kd->known[i].name, j + 1);
partitions[numPartitions].type =
@@ -573,7 +586,7 @@ static char * mountHardDrive(struct installMethod * method,
unlink("/tmp/hddevice");
}
}
-
+
if (!numPartitions) {
rc = newtWinChoice(_("Hard Drives"), _("Yes"), _("Back"),
_("You don't seem to have any hard drives on "
@@ -658,6 +671,9 @@ static char * mountHardDrive(struct installMethod * method,
logMessage("partition %s selected", part->name);
switch (part->type) {
+ #ifdef __sparc__
+ case BALKAN_PART_UFS: type = "ufs"; break;
+ #endif
case BALKAN_PART_EXT2: type = "ext2"; break;
case BALKAN_PART_DOS: type = "vfat"; break;
default: continue;
@@ -1341,6 +1357,7 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
imageUrl = setupCdrom(NULL, location, kd, modInfo, modLoaded, modDeps,
flags, 1);
} else if (ksType == KS_CMD_HD) {
+ char * fsType;
logMessage("partname is %s", partname);
for (i = 0; i < kd->numKnown; i++) {
@@ -1375,11 +1392,14 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
return NULL;
}
- /* XXX this shouldn't be hard coded to ext2 */
- imageUrl = setupHardDrive(partname,
- partTable.parts[partNum].type == BALKAN_PART_EXT2 ?
- "ext2" : "vfat",
- dir, flags);
+ switch (partTable.parts[partNum].type) {
+ #ifdef __sparc__
+ case BALKAN_PART_UFS: fsType = "ufs"; break;
+ #endif
+ case BALKAN_PART_EXT2: fsType = "ext2"; break;
+ default: fsType = "vfat"; break;
+ }
+ imageUrl = setupHardDrive(partname, fsType, dir, flags);
}
#endif
@@ -1511,6 +1531,9 @@ int kickstartFromHardDrive(char * location,
char * fullFn;
mlLoadModule("vfat", NULL, modLoaded, modDeps, NULL, flags);
+ #ifdef __sparc__
+ mlLoadModule("ufs", NULL, modLoaded, modDeps, NULL, flags);
+ #endif
fileName = strchr(source, '/');
*fileName = '\0';
@@ -1582,6 +1605,42 @@ void readExtraModInfo(moduleInfoSet modInfo) {
}
}
+#ifdef __sparc__
+/* Don't load the large ufs module if it will not be needed
+ to save some memory on lowmem SPARCs. */
+void loadUfs(struct knownDevices *kd, moduleList modLoaded,
+ moduleDeps modDeps, int flags) {
+ int i, j, fd, rc;
+ struct partitionTable table;
+ int ufsloaded = 0;
+
+ for (i = 0; i < kd->numKnown; i++) {
+ if (kd->known[i].class == CLASS_HD) {
+ devMakeInode(kd->known[i].name, "/tmp/hddevice");
+ if ((fd = open("/tmp/hddevice", O_RDONLY)) >= 0) {
+ if ((rc = balkanReadTable(fd, &table))) {
+ logMessage("failed to read partition table for "
+ "device %s: %d", kd->known[i].name, rc);
+ } else {
+ for (j = 0; j < table.maxNumPartitions; j++) {
+ if (table.parts[j].type == BALKAN_PART_UFS) {
+ if (!ufsloaded)
+ mlLoadModule("ufs", NULL, modLoaded, modDeps, NULL, flags);
+ ufsloaded = 1;
+ }
+ }
+ }
+
+ close(fd);
+ }
+ unlink("/tmp/hddevice");
+ }
+ }
+}
+#else
+#define loadUfs(kd,modLoaded,modDeps,flags) do { } while (0)
+#endif
+
int main(int argc, char ** argv) {
char ** argptr;
char * anacondaArgs[40];
@@ -1662,12 +1721,6 @@ int main(int argc, char ** argv) {
modDeps = mlNewDeps();
mlLoadDeps(&modDeps, "/modules/modules.dep");
-#ifdef __sparc__
- /* XXX: sparc -BOOT kernels should compile openprom in. */
- if (!FL_TESTING(flags))
- insmod ("openprom", NULL, NULL);
-#endif
-
if (FL_KSFLOPPY(flags)) {
ksFile = "/tmp/ks.cfg";
kickstartFromFloppy(ksFile, modLoaded, modDeps, flags);
@@ -1729,17 +1782,28 @@ int main(int argc, char ** argv) {
unlink("/modules/modules.dep");
unlink("/modules/module-info");
- unlink("/modules/modules.cgz");
unlink("/modules/pcitable");
symlink("../mnt/runtime/modules/modules.dep",
"/modules/modules.dep");
symlink("../mnt/runtime/modules/module-info",
"/modules/module-info");
- symlink("../mnt/runtime/modules/modules.cgz",
- "/modules/modules.cgz");
symlink("../mnt/runtime/modules/pcitable",
"/modules/pcitable");
+
+#ifndef __sparc__
+ unlink("/modules/modules.cgz");
+
+ symlink("../mnt/runtime/modules/modules.cgz",
+ "/modules/modules.cgz");
+#else
+ /* All sparc32 modules are on the first stage image, if it is sparc64,
+ then we must keep both the old /modules/modules.cgz which may
+ either contain all modules, or the basic set + one of net or scsi
+ and we extend it with the full set of net + scsi modules. */
+ symlink("../mnt/runtime/modules/modules64.cgz",
+ "/modules/modules65.cgz");
+#endif
}
spawnShell(flags); /* we can attach gdb now :-) */
@@ -1765,6 +1829,8 @@ int main(int argc, char ** argv) {
manualDeviceCheck(modInfo, modLoaded, modDeps, &kd, flags);
}
+ loadUfs(&kd, modLoaded, modDeps, flags);
+
if (!FL_TESTING(flags)) {
int fd;
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 0d11043cd..499397882 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-24 14:40-0400\n"
+"POT-Creation-Date: 1999-09-27 13:20-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,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ../iw/language.py:10 ../text.py:49 ../text.py:891
+#: ../gui.py:264 ../iw/language.py:10 ../text.py:49 ../text.py:895
msgid "Language Selection"
msgstr ""
@@ -25,8 +25,8 @@ msgstr ""
#: ../loader/cdrom.c:34 ../loader/devices.c:66 ../loader/devices.c:167
#: ../loader/devices.c:178 ../loader/devices.c:183 ../loader/devices.c:218
#: ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107
-#: ../loader/lang.c:247 ../loader/lang.c:503 ../loader/loader.c:242
-#: ../loader/loader.c:458 ../loader/loader.c:468 ../loader/loader.c:615
+#: ../loader/lang.c:246 ../loader/lang.c:506 ../loader/loader.c:243
+#: ../loader/loader.c:459 ../loader/loader.c:469 ../loader/loader.c:615
#: ../loader/loader.c:670 ../loader/loader.c:715 ../loader/loader.c:848
#: ../loader/loader.c:853 ../loader/loader.c:939 ../loader/loader.c:1072
#: ../loader/loader.c:1555 ../loader/net.c:162 ../loader/net.c:284
@@ -37,7 +37,7 @@ msgstr ""
#: ../text.py:586 ../text.py:598 ../text.py:610 ../text.py:788 ../text.py:860
#: ../text.py:864 ../textw/lilo.py:21 ../textw/lilo.py:66
#: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136
-#: ../textw/partitioning.py:199 ../textw/silo.py:21 ../textw/silo.py:66
+#: ../textw/partitioning.py:202 ../textw/silo.py:21 ../textw/silo.py:66
#: ../textw/userauth.py:29 ../textw/userauth.py:43 ../textw/userauth.py:48
#: ../textw/userauth.py:82 ../textw/userauth.py:94 ../textw/userauth.py:102
#: ../textw/userauth.py:111 ../textw/userauth.py:172 ../textw/userauth.py:244
@@ -71,9 +71,9 @@ msgid "What device is your mouse located on? %s %i"
msgstr ""
#. code to create dialog in gtk+
-#: ../libfdisk/fsedit.c:609 ../libfdisk/fsedit.c:616 ../libfdisk/fsedit.c:623
-#: ../libfdisk/fsedit.c:632 ../libfdisk/fsedit.c:644 ../libfdisk/fsedit.c:654
-#: ../libfdisk/fsedit.c:683 ../libfdisk/fsedit.c:699 ../libfdisk/fsedit.c:1053
+#: ../libfdisk/fsedit.c:612 ../libfdisk/fsedit.c:619 ../libfdisk/fsedit.c:626
+#: ../libfdisk/fsedit.c:635 ../libfdisk/fsedit.c:647 ../libfdisk/fsedit.c:657
+#: ../libfdisk/fsedit.c:686 ../libfdisk/fsedit.c:702 ../libfdisk/fsedit.c:1056
#: ../libfdisk/gnomefsedit.c:676 ../libfdisk/gnomefsedit.c:1030
#: ../libfdisk/gnomefsedit.c:1056 ../libfdisk/gnomefsedit.c:1092
#: ../libfdisk/gnomefsedit.c:1297 ../libfdisk/gnomefsedit.c:1391
@@ -94,10 +94,10 @@ msgstr ""
msgid "Ok"
msgstr ""
-#: ../gui.py:259 ../gui.py:465 ../libfdisk/fsedit.c:960
+#: ../gui.py:257 ../gui.py:469 ../libfdisk/fsedit.c:963
#: ../libfdisk/newtfsedit.c:1297 ../libfdisk/newtfsedit.c:1305
#: ../loader/cdrom.c:34 ../loader/devices.c:67 ../loader/devices.c:168
-#: ../loader/devices.c:218 ../loader/lang.c:503 ../loader/loader.c:242
+#: ../loader/devices.c:218 ../loader/lang.c:506 ../loader/loader.c:243
#: ../loader/loader.c:579 ../loader/loader.c:615 ../loader/loader.c:715
#: ../loader/loader.c:1072 ../loader/net.c:162 ../loader/net.c:284
#: ../loader/urls.c:124 ../loader/urls.c:322 ../text.py:87 ../text.py:88
@@ -110,7 +110,7 @@ msgstr ""
#: ../textw/lilo.py:66 ../textw/lilo.py:73 ../textw/lilo.py:148
#: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136
#: ../textw/packages.py:145 ../textw/partitioning.py:25
-#: ../textw/partitioning.py:64 ../textw/partitioning.py:199
+#: ../textw/partitioning.py:64 ../textw/partitioning.py:202
#: ../textw/silo.py:22 ../textw/silo.py:66 ../textw/silo.py:73
#: ../textw/silo.py:146 ../textw/userauth.py:29 ../textw/userauth.py:141
#: ../textw/userauth.py:172 ../textw/userauth.py:244
@@ -129,7 +129,7 @@ msgstr ""
msgid "Mouse Selection"
msgstr ""
-#: ../text.py:152 ../text.py:893
+#: ../text.py:152 ../text.py:897
msgid "Keyboard Selection"
msgstr ""
@@ -157,7 +157,7 @@ msgstr ""
msgid "Upgrade Existing Installation"
msgstr ""
-#: ../text.py:197 ../text.py:896
+#: ../text.py:197 ../text.py:900
msgid "Installation Type"
msgstr ""
@@ -166,7 +166,7 @@ msgid "What type of system would you like to install?"
msgstr ""
#: ../libfdisk/newtfsedit.c:1545 ../loader/devices.c:178
-#: ../loader/devices.c:183 ../loader/loader.c:458 ../loader/loader.c:468
+#: ../loader/devices.c:183 ../loader/loader.c:459 ../loader/loader.c:469
#: ../loader/loader.c:670 ../loader/loader.c:715 ../loader/loader.c:848
#: ../loader/loader.c:853 ../loader/loader.c:1555 ../loader/urls.c:201
#: ../loader/urls.c:206 ../text.py:225 ../text.py:606
@@ -202,7 +202,7 @@ msgstr ""
#: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
#: ../libfdisk/newtfsedit.c:1483 ../libfdisk/newtfsedit.c:1501
#: ../libfdisk/newtfsedit.c:1586 ../loader/loader.c:579 ../loader/net.c:701
-#: ../text.py:263 ../text.py:450 ../text.py:453 ../textw/partitioning.py:162
+#: ../text.py:263 ../text.py:450 ../text.py:453 ../textw/partitioning.py:165
msgid "Yes"
msgstr ""
@@ -212,7 +212,7 @@ msgstr ""
#: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
#: ../libfdisk/newtfsedit.c:1483 ../libfdisk/newtfsedit.c:1501
#: ../libfdisk/newtfsedit.c:1586 ../loader/net.c:701 ../text.py:263
-#: ../text.py:268 ../text.py:450 ../text.py:456 ../textw/partitioning.py:162
+#: ../text.py:268 ../text.py:450 ../text.py:456 ../textw/partitioning.py:165
msgid "No"
msgstr ""
@@ -274,7 +274,7 @@ msgid ""
"a network, this may be assigned by your network administrator."
msgstr ""
-#: ../iw/network.py:200 ../loader/net.c:458 ../loader/net.c:620 ../text.py:429
+#: ../iw/network.py:201 ../loader/net.c:458 ../loader/net.c:620 ../text.py:429
msgid "Hostname"
msgstr ""
@@ -322,7 +322,7 @@ msgstr ""
msgid "Installation to begin"
msgstr ""
-#: ../iw/confirm.py:19 ../text.py:562
+#: ../iw/confirm.py:30 ../text.py:562
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."
@@ -332,7 +332,7 @@ msgstr ""
msgid "Complete"
msgstr ""
-#: ../iw/congrats.py:17 ../text.py:579
+#: ../iw/congrats.py:31 ../text.py:579
msgid ""
"Congratulations, installation is complete.\n"
"\n"
@@ -409,7 +409,7 @@ msgstr ""
msgid "Hardware clock set to GMT?"
msgstr ""
-#: ../iw/timezone.py:29 ../text.py:800
+#: ../iw/timezone.py:30 ../text.py:800
msgid "Time Zone Selection"
msgstr ""
@@ -427,187 +427,187 @@ msgid ""
"screen"
msgstr ""
-#: ../iw/welcome.py:11 ../text.py:895
+#: ../iw/welcome.py:11 ../text.py:899
msgid "Welcome"
msgstr ""
-#: ../iw/lilo.py:94 ../iw/lilo.py:197 ../iw/silo.py:92 ../iw/silo.py:191
-#: ../text.py:901 ../text.py:907
+#: ../iw/lilo.py:94 ../iw/lilo.py:196 ../iw/silo.py:92 ../iw/silo.py:191
+#: ../text.py:905 ../text.py:911
msgid "Partition"
msgstr ""
-#: ../text.py:903
+#: ../text.py:907
msgid "Manually Partition"
msgstr ""
-#: ../text.py:905
+#: ../text.py:909
msgid "Automatic Partition"
msgstr ""
-#: ../text.py:909
+#: ../text.py:913
msgid "Swap"
msgstr ""
-#: ../text.py:911
+#: ../text.py:915
msgid "Filesystem Formatting"
msgstr ""
-#: ../text.py:913 ../text.py:915 ../text.py:917 ../textw/lilo.py:24
+#: ../text.py:917 ../text.py:919 ../text.py:921 ../textw/lilo.py:24
#: ../textw/lilo.py:63 ../textw/lilo.py:155
msgid "LILO Configuration"
msgstr ""
-#: ../text.py:919
+#: ../text.py:923
msgid "Hostname Setup"
msgstr ""
-#: ../text.py:921
+#: ../text.py:925
msgid "Network Setup"
msgstr ""
-#: ../iw/mouse.py:55 ../text.py:923 ../text.py:925
+#: ../iw/mouse.py:55 ../text.py:927 ../text.py:929
msgid "Mouse Configuration"
msgstr ""
-#: ../text.py:927
+#: ../text.py:931
msgid "Time Zone Setup"
msgstr ""
-#: ../text.py:929 ../textw/userauth.py:8
+#: ../text.py:933 ../textw/userauth.py:8
msgid "Root Password"
msgstr ""
-#: ../text.py:931 ../textw/userauth.py:148
+#: ../text.py:935 ../textw/userauth.py:148
msgid "User Account Setup"
msgstr ""
-#: ../text.py:933
+#: ../text.py:937
msgid "Authentication"
msgstr ""
-#: ../text.py:935
+#: ../text.py:939
msgid "Package Groups"
msgstr ""
-#: ../text.py:937 ../text.py:973
+#: ../text.py:941 ../text.py:977
msgid "Individual Packages"
msgstr ""
-#: ../text.py:939 ../textw/packages.py:114
+#: ../text.py:943 ../textw/packages.py:114
msgid "Package Dependencies"
msgstr ""
-#: ../iw/xconfig.py:107 ../text.py:941 ../text.py:949
+#: ../iw/xconfig.py:107 ../text.py:945 ../text.py:953
msgid "X Configuration"
msgstr ""
-#: ../text.py:943 ../text.py:948
+#: ../text.py:947 ../text.py:952
msgid "Boot Disk"
msgstr ""
-#: ../text.py:945
+#: ../text.py:949
msgid "Installation Begins"
msgstr ""
-#: ../text.py:947
+#: ../text.py:951
msgid "Install System"
msgstr ""
-#: ../text.py:951
+#: ../text.py:955
msgid "Installation Complete"
msgstr ""
-#: ../text.py:960 ../text.py:963 ../text.py:966 ../textw/silo.py:24
+#: ../text.py:964 ../text.py:967 ../text.py:970 ../textw/silo.py:24
#: ../textw/silo.py:62 ../textw/silo.py:153
msgid "SILO Configuration"
msgstr ""
-#: ../text.py:971
+#: ../text.py:975
msgid "Examine System"
msgstr ""
-#: ../text.py:972
+#: ../text.py:976
msgid "Customize Upgrade"
msgstr ""
-#: ../text.py:974
+#: ../text.py:978
msgid "Upgrade System"
msgstr ""
-#: ../text.py:975
+#: ../text.py:979
msgid "Upgrade Complete"
msgstr ""
-#: ../gui.py:258 ../gui.py:466
+#: ../gui.py:256 ../gui.py:470
msgid "Next"
msgstr ""
-#: ../gui.py:459
-msgid "Red Hat Linux Installer"
-msgstr ""
-
-#: ../gui.py:468
-msgid "Finish"
+#: ../gui.py:258 ../gui.py:474
+msgid "Show Help"
msgstr ""
-#: ../gui.py:469
+#: ../gui.py:259 ../gui.py:473
msgid "Hide Help"
msgstr ""
-#: ../gui.py:470
-msgid "Show Help"
+#: ../gui.py:260 ../gui.py:472
+msgid "Finish"
msgstr ""
-#: ../gui.py:492
+#: ../gui.py:263 ../gui.py:496
msgid "Online Help"
msgstr ""
+#: ../gui.py:463
+msgid "Red Hat Linux Installer"
+msgstr ""
+
#: ../iw/account.py:14
msgid "Account Configuration"
msgstr ""
-#: ../iw/account.py:129
+#: ../iw/account.py:130
msgid "Root Password: "
msgstr ""
-#: ../iw/account.py:132
+#: ../iw/account.py:133
msgid "Confirm: "
msgstr ""
-#: ../iw/account.py:183 ../iw/account.py:226
+#: ../iw/account.py:184 ../iw/account.py:227
msgid "Account Name"
msgstr ""
-#: ../iw/account.py:187 ../textw/userauth.py:80
+#: ../iw/account.py:188 ../textw/userauth.py:80
msgid "Password"
msgstr ""
-#: ../iw/account.py:191 ../textw/userauth.py:81
+#: ../iw/account.py:192 ../textw/userauth.py:81
msgid "Password (confirm)"
msgstr ""
-#: ../iw/account.py:195 ../iw/account.py:226 ../textw/userauth.py:79
+#: ../iw/account.py:196 ../iw/account.py:227 ../textw/userauth.py:79
#: ../textw/userauth.py:160
msgid "Full Name"
msgstr ""
-#: ../iw/account.py:204 ../libfdisk/newtfsedit.c:1303 ../textw/userauth.py:171
+#: ../iw/account.py:205 ../libfdisk/newtfsedit.c:1303 ../textw/userauth.py:171
msgid "Add"
msgstr ""
-#: ../iw/account.py:206 ../libfdisk/newtfsedit.c:1296
+#: ../iw/account.py:207 ../libfdisk/newtfsedit.c:1296
#: ../libfdisk/newtfsedit.c:1304 ../textw/lilo.py:147 ../textw/lilo.py:168
#: ../textw/partitioning.py:63 ../textw/silo.py:145 ../textw/silo.py:167
#: ../textw/userauth.py:172
msgid "Edit"
msgstr ""
-#: ../iw/account.py:208 ../libfdisk/newtfsedit.c:1296
+#: ../iw/account.py:209 ../libfdisk/newtfsedit.c:1296
#: ../libfdisk/newtfsedit.c:1304 ../textw/userauth.py:171
msgid "Delete"
msgstr ""
-#: ../iw/account.py:210
+#: ../iw/account.py:211
msgid "New"
msgstr ""
@@ -651,7 +651,7 @@ msgstr ""
msgid "About to Install"
msgstr ""
-#: ../iw/confirm.py:16
+#: ../iw/confirm.py:27
msgid "Click next to begin installation of Red Hat Linux."
msgstr ""
@@ -675,7 +675,7 @@ msgstr ""
msgid "Requirement"
msgstr ""
-#: ../iw/dependencies.py:37 ../textw/packages.py:133
+#: ../iw/dependencies.py:38 ../textw/packages.py:133
msgid "Install packages to satisfy dependencies"
msgstr ""
@@ -738,7 +738,7 @@ msgstr ""
msgid "Upgrade"
msgstr ""
-#: ../iw/installpath.py:213
+#: ../iw/installpath.py:214
msgid "Use fdisk"
msgstr ""
@@ -746,23 +746,23 @@ msgstr ""
msgid "Keyboard Configuration"
msgstr ""
-#: ../iw/keyboard.py:48
+#: ../iw/keyboard.py:51
msgid "Model"
msgstr ""
-#: ../iw/keyboard.py:67
+#: ../iw/keyboard.py:70
msgid "Layout"
msgstr ""
-#: ../iw/keyboard.py:86
+#: ../iw/keyboard.py:89
msgid "Variant"
msgstr ""
-#: ../iw/keyboard.py:101
+#: ../iw/keyboard.py:104
msgid "Test your selection here:"
msgstr ""
-#: ../iw/language.py:15 ../loader/lang.c:245
+#: ../iw/language.py:16 ../loader/lang.c:244
msgid "What language should be used during the installation process?"
msgstr ""
@@ -770,7 +770,7 @@ msgstr ""
msgid "Lilo Configuration"
msgstr ""
-#: ../iw/lilo.py:99 ../iw/lilo.py:198 ../iw/silo.py:97 ../iw/silo.py:192
+#: ../iw/lilo.py:99 ../iw/lilo.py:197 ../iw/silo.py:97 ../iw/silo.py:192
msgid "Type"
msgstr ""
@@ -812,7 +812,7 @@ msgstr ""
msgid "Partition type"
msgstr ""
-#: ../iw/lilo.py:174 ../iw/lilo.py:209 ../iw/silo.py:168 ../iw/silo.py:203
+#: ../iw/lilo.py:174 ../iw/lilo.py:208 ../iw/silo.py:168 ../iw/silo.py:203
#: ../textw/lilo.py:80 ../textw/lilo.py:138 ../textw/silo.py:80
#: ../textw/silo.py:136
msgid "Boot label"
@@ -826,39 +826,39 @@ msgstr ""
msgid "Configure using DHCP"
msgstr ""
-#: ../iw/network.py:148
+#: ../iw/network.py:147
msgid "Activate on boot"
msgstr ""
-#: ../iw/network.py:156
+#: ../iw/network.py:155
msgid "IP Address"
msgstr ""
-#: ../iw/network.py:157 ../loader/net.c:618
+#: ../iw/network.py:156 ../loader/net.c:618
msgid "Netmask"
msgstr ""
-#: ../iw/network.py:158 ../loader/loader.c:227
+#: ../iw/network.py:157 ../loader/loader.c:228
msgid "Network"
msgstr ""
-#: ../iw/network.py:159
+#: ../iw/network.py:158
msgid "Broadcast"
msgstr ""
-#: ../iw/network.py:201
+#: ../iw/network.py:202
msgid "Gateway"
msgstr ""
-#: ../iw/network.py:201
+#: ../iw/network.py:202
msgid "Primary DNS"
msgstr ""
-#: ../iw/network.py:201
+#: ../iw/network.py:202
msgid "Secondary DNS"
msgstr ""
-#: ../iw/network.py:201
+#: ../iw/network.py:202
msgid "Ternary DNS"
msgstr ""
@@ -938,22 +938,22 @@ msgstr ""
msgid "Disk Druid"
msgstr ""
-#: ../iw/rootpartition.py:43 ../textw/partitioning.py:157
+#: ../iw/rootpartition.py:43 ../textw/partitioning.py:160
msgid "Low Memory"
msgstr ""
-#: ../iw/rootpartition.py:44 ../textw/partitioning.py:158
+#: ../iw/rootpartition.py:44 ../textw/partitioning.py:161
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 ""
-#: ../iw/rootpartition.py:136 ../textw/partitioning.py:123
+#: ../iw/rootpartition.py:143 ../textw/partitioning.py:123
msgid "Automatic Partitioning"
msgstr ""
-#: ../iw/rootpartition.py:184 ../textw/partitioning.py:124
+#: ../iw/rootpartition.py:191 ../textw/partitioning.py:124
#, c-format
msgid ""
"%s\n"
@@ -963,11 +963,11 @@ msgid ""
"installation."
msgstr ""
-#: ../iw/rootpartition.py:196
+#: ../iw/rootpartition.py:204
msgid "Remove data"
msgstr ""
-#: ../iw/rootpartition.py:199 ../textw/partitioning.py:128
+#: ../iw/rootpartition.py:207 ../textw/partitioning.py:128
msgid "Manually partition"
msgstr ""
@@ -987,23 +987,23 @@ msgstr ""
msgid "Do not install SILO"
msgstr ""
-#: ../iw/timezone.py:130
+#: ../iw/timezone.py:154
msgid "View:"
msgstr ""
-#: ../iw/timezone.py:138 ../iw/timezone.py:141
+#: ../iw/timezone.py:162 ../iw/timezone.py:163
msgid "System clock uses UTC"
msgstr ""
-#: ../iw/timezone.py:188
-msgid "Use Daylight Saving Time"
+#: ../iw/timezone.py:211
+msgid "Use Daylight Saving Time (US only)"
msgstr ""
-#: ../iw/timezone.py:201
+#: ../iw/timezone.py:225
msgid "Location"
msgstr ""
-#: ../iw/timezone.py:202
+#: ../iw/timezone.py:226
msgid "UTC Offset"
msgstr ""
@@ -1031,7 +1031,7 @@ msgstr ""
msgid "Test failed"
msgstr ""
-#: ../iw/xconfig.py:22 ../iw/xconfig.py:209
+#: ../iw/xconfig.py:22 ../iw/xconfig.py:214
msgid "Customize X Configuration"
msgstr ""
@@ -1039,30 +1039,30 @@ msgstr ""
msgid "Bits per Pixel"
msgstr ""
-#: ../iw/xconfig.py:89 ../iw/xconfig.py:205
+#: ../iw/xconfig.py:89 ../iw/xconfig.py:210
msgid "Test this configuration"
msgstr ""
-#: ../iw/xconfig.py:160
+#: ../iw/xconfig.py:165
msgid ""
"In most cases your video hardware can be probed to automatically determine "
"the best settings for your display."
msgstr ""
-#: ../iw/xconfig.py:168
+#: ../iw/xconfig.py:173
msgid "Autoprobe results:"
msgstr ""
-#: ../iw/xconfig.py:182
+#: ../iw/xconfig.py:187
msgid ""
"Your monitor could not be autodetected. Please choose it from the list below:"
msgstr ""
-#: ../iw/xconfig.py:212
+#: ../iw/xconfig.py:217
msgid "Use Graphical Login"
msgstr ""
-#: ../iw/xconfig.py:214
+#: ../iw/xconfig.py:219
msgid "Skip X Configuration"
msgstr ""
@@ -1130,7 +1130,7 @@ msgid ""
"two hard drives in your system so you can boot into Linux with LILO."
msgstr ""
-#: ../loader/loader.c:290 ../loader/loader.c:315 ../textw/partitioning.py:63
+#: ../loader/loader.c:291 ../loader/loader.c:316 ../textw/partitioning.py:63
msgid "Done"
msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "Continue"
msgstr ""
-#: ../textw/partitioning.py:177
+#: ../textw/partitioning.py:180
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 "
@@ -1146,11 +1146,11 @@ msgid ""
"previous install."
msgstr ""
-#: ../textw/partitioning.py:197
+#: ../textw/partitioning.py:200
msgid "Check for bad blocks during format"
msgstr ""
-#: ../textw/partitioning.py:201
+#: ../textw/partitioning.py:204
msgid "Choose Partitions to Format"
msgstr ""
@@ -1259,17 +1259,17 @@ msgstr ""
msgid "Request server via broadcast"
msgstr ""
-#: ../libfdisk/fsedit.c:609 ../libfdisk/fsedit.c:616 ../libfdisk/fsedit.c:623
-#: ../libfdisk/fsedit.c:632 ../libfdisk/fsedit.c:644 ../libfdisk/fsedit.c:654
+#: ../libfdisk/fsedit.c:612 ../libfdisk/fsedit.c:619 ../libfdisk/fsedit.c:626
+#: ../libfdisk/fsedit.c:635 ../libfdisk/fsedit.c:647 ../libfdisk/fsedit.c:657
msgid "Bad Mount Point"
msgstr ""
-#: ../libfdisk/fsedit.c:610
+#: ../libfdisk/fsedit.c:613
#, c-format
msgid "The %s directory must be on the root filesystem."
msgstr ""
-#: ../libfdisk/fsedit.c:617
+#: ../libfdisk/fsedit.c:620
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1277,7 +1277,7 @@ msgid ""
"Mount points must begin with a leading /."
msgstr ""
-#: ../libfdisk/fsedit.c:624
+#: ../libfdisk/fsedit.c:627
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1285,7 +1285,7 @@ msgid ""
"Mount points may not end with a /."
msgstr ""
-#: ../libfdisk/fsedit.c:633
+#: ../libfdisk/fsedit.c:636
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1293,7 +1293,7 @@ msgid ""
"Mount points may only printable characters."
msgstr ""
-#: ../libfdisk/fsedit.c:645
+#: ../libfdisk/fsedit.c:648
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1301,7 +1301,7 @@ msgid ""
"System partitions must be on Linux Native partitions."
msgstr ""
-#: ../libfdisk/fsedit.c:655
+#: ../libfdisk/fsedit.c:658
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1309,28 +1309,28 @@ msgid ""
"/usr must be on a Linux Native partition or an NFS volume."
msgstr ""
-#: ../libfdisk/fsedit.c:683
+#: ../libfdisk/fsedit.c:686
msgid "Too Many Drives"
msgstr ""
-#: ../libfdisk/fsedit.c:684
+#: ../libfdisk/fsedit.c:687
msgid ""
"You have more drives than this program supports. Please use the standard "
"fdisk program to setup your drives and please notify Red Hat Software that "
"you saw this message."
msgstr ""
-#: ../libfdisk/fsedit.c:699
+#: ../libfdisk/fsedit.c:702
msgid "No Drives Found"
msgstr ""
-#: ../libfdisk/fsedit.c:700
+#: ../libfdisk/fsedit.c:703
msgid ""
"An error has occurred - no valid devices were found on which to create new "
"filesystems. Please check your hardware for the cause of this problem."
msgstr ""
-#: ../libfdisk/fsedit.c:955
+#: ../libfdisk/fsedit.c:958
#, c-format
msgid ""
"A disk with a corrupt Sun disklabel has been found while reading block "
@@ -1338,58 +1338,58 @@ msgid ""
"device."
msgstr ""
-#: ../libfdisk/fsedit.c:959
+#: ../libfdisk/fsedit.c:962
msgid "Corrupt Sun disklabel"
msgstr ""
-#: ../libfdisk/fsedit.c:960 ../libfdisk/fsedit.c:1016
-#: ../libfdisk/fsedit.c:1041
+#: ../libfdisk/fsedit.c:963 ../libfdisk/fsedit.c:1019
+#: ../libfdisk/fsedit.c:1044
msgid "Skip Drive"
msgstr ""
-#: ../libfdisk/fsedit.c:969 ../libfdisk/fsedit.c:1037
+#: ../libfdisk/fsedit.c:972 ../libfdisk/fsedit.c:1040
#, c-format
msgid ""
"An error occurred reading the partition table for the block device %s. The "
"error was"
msgstr ""
-#: ../libfdisk/fsedit.c:1010
+#: ../libfdisk/fsedit.c:1013
#, 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:1015
+#: ../libfdisk/fsedit.c:1018
msgid "Bad Partition Table"
msgstr ""
-#: ../libfdisk/fsedit.c:1016
+#: ../libfdisk/fsedit.c:1019
msgid "Initialize"
msgstr ""
-#: ../libfdisk/fsedit.c:1041 ../loader/net.c:329
+#: ../libfdisk/fsedit.c:1044 ../loader/net.c:329
msgid "Retry"
msgstr ""
-#: ../libfdisk/fsedit.c:1053
+#: ../libfdisk/fsedit.c:1056
msgid "BSD Disklabel"
msgstr ""
-#: ../libfdisk/fsedit.c:1053
+#: ../libfdisk/fsedit.c:1056
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:1083
+#: ../libfdisk/fsedit.c:1086
#, c-format
msgid "System error %d"
msgstr ""
-#: ../libfdisk/fsedit.c:1092 ../libfdisk/fsedit.c:1094
+#: ../libfdisk/fsedit.c:1095 ../libfdisk/fsedit.c:1097
msgid "Fdisk Error"
msgstr ""
@@ -1807,8 +1807,8 @@ msgstr ""
msgid "Module Parameters"
msgstr ""
-#: ../loader/devices.c:167 ../loader/devices.c:242 ../loader/loader.c:240
-#: ../loader/loader.c:299 ../loader/loader.c:315
+#: ../loader/devices.c:167 ../loader/devices.c:242 ../loader/loader.c:241
+#: ../loader/loader.c:300 ../loader/loader.c:316
msgid "Devices"
msgstr ""
@@ -1859,70 +1859,70 @@ msgstr ""
msgid "Error on line %d of kickstart file %s."
msgstr ""
-#: ../loader/lang.c:245
+#: ../loader/lang.c:244
msgid "Choose a Language"
msgstr ""
-#: ../loader/lang.c:501
+#: ../loader/lang.c:504
msgid "Keyboard Type"
msgstr ""
-#: ../loader/lang.c:502
+#: ../loader/lang.c:505
msgid "What type of keyboard do you have?"
msgstr ""
-#: ../loader/loader.c:99
+#: ../loader/loader.c:100
msgid "Local CDROM"
msgstr ""
-#: ../loader/loader.c:102
+#: ../loader/loader.c:103
msgid "NFS image"
msgstr ""
-#: ../loader/loader.c:107
+#: ../loader/loader.c:108
msgid "Hard drive"
msgstr ""
-#: ../loader/loader.c:123
+#: ../loader/loader.c:124
msgid "Welcome to Red Hat Linux"
msgstr ""
-#: ../loader/loader.c:125
+#: ../loader/loader.c:126
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr ""
-#: ../loader/loader.c:227
+#: ../loader/loader.c:228
msgid "SCSI"
msgstr ""
-#: ../loader/loader.c:241
+#: ../loader/loader.c:242
msgid "What kind of device would you like to add"
msgstr ""
-#: ../loader/loader.c:288
+#: ../loader/loader.c:289
msgid "I have found the following devices in your system:"
msgstr ""
-#: ../loader/loader.c:290 ../loader/loader.c:315
+#: ../loader/loader.c:291 ../loader/loader.c:316
msgid "Add Device"
msgstr ""
-#: ../loader/loader.c:316
+#: ../loader/loader.c:317
msgid ""
"I don't have any special device drivers loaded for your system. Would you "
"like to load some now?"
msgstr ""
-#: ../loader/loader.c:400 ../loader/loader.c:402
+#: ../loader/loader.c:401 ../loader/loader.c:403
msgid "Loading"
msgstr ""
-#: ../loader/loader.c:454
+#: ../loader/loader.c:455
msgid "Loading second stage ramdisk..."
msgstr ""
-#: ../loader/loader.c:458
+#: ../loader/loader.c:459
msgid "Error loading ramdisk."
msgstr ""
@@ -1998,11 +1998,11 @@ msgstr ""
msgid "Cannot find ks.cfg on boot floppy."
msgstr ""
-#: ../loader/loader.c:1681
+#: ../loader/loader.c:1675
msgid "PC Card"
msgstr ""
-#: ../loader/loader.c:1681
+#: ../loader/loader.c:1675
msgid "Initializing PC Card Devices..."
msgstr ""
diff --git a/todo.py b/todo.py
index e3942f7bd..3baa0ae24 100644
--- a/todo.py
+++ b/todo.py
@@ -1,6 +1,7 @@
import rpm, os
import iutil, isys
from lilo import LiloConfiguration
+from silo import SiloInstall
import string
import socket
import crypt
@@ -432,6 +433,10 @@ class ToDo:
self.bootdisk = 0
self.liloImages = {}
self.liloDevice = None
+ if iutil.getArch() == "sparc":
+ self.silo = SiloInstall(self)
+ else:
+ self.silo = None
self.timezone = None
self.upgrade = 0
self.ddruidAlreadySaved = 0
@@ -1564,7 +1569,10 @@ class ToDo:
devnull = os.open("/dev/null", os.O_RDWR)
iutil.execWithRedirect(argv[0], argv, root = self.instPath,
stdout = devnull)
- self.installLilo ()
+ if self.silo:
+ self.silo.installSilo ()
+ else:
+ self.installLilo ()
if self.instClass.postScript:
scriptRoot = "/"
diff --git a/upd-instroot b/upd-instroot
index 4a230c36d..ddc5cd1c8 100755
--- a/upd-instroot
+++ b/upd-instroot
@@ -41,12 +41,11 @@ PACKAGES="glibc-2 ldconfig setup e2fsprogs-1 XFree86-libs XFree86-SVGA
XFree86-S3 XFree86-S3V XFree86-Mach32 XFree86-Mach64
XFree86-FBDev XFree86-I128 XFree86-3DLabs XFree86-VGA16
XFree86-Sun XFree86-75dpi-fonts XFree86-100dpi-fonts
- XFree86-100dpi-fonts XFree86-ISO8859-2
- XFree86-cyrillic-fonts 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
- Xconfigurator raidtools-"
+ XFree86-ISO8859-2 XFree86-cyrillic-fonts 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 Xconfigurator raidtools-"
KEEPFILE=/tmp/keepfile.$$
cat > $KEEPFILE <<EOF
@@ -319,4 +318,8 @@ ln -s /tmp $DESTGR/usr/X11R6/lib/X11/xkb/compiled
find X11R6 | cpio --quiet -H crc -o | gzip -9 > X11R6.cgz
rm -rf X11R5
+ cd $DEST/usr/sbin
+ ls [a-r]* | cpio --quiet -H crc -o | gzip -9 > sbin.cgz
+ rm -f [a-r]*
+
cp -a $HOMEDIR/anaconda-stub $DEST/usr/bin/anaconda
diff --git a/utils/Makefile b/utils/Makefile
index 52277ba8c..3ff15262d 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -12,7 +12,7 @@ moddeps: moddeps.o
../isys/modutils/obj/libobj.a -lrpm -lbz2 -lz
genhdlist: genhdlist.c
- $(CC) -I/usr/include/rpm $(LDFLAGS) -o genhdlist genhdlist.c -lrpm
+ $(CC) -I/usr/include/rpm $(LDFLAGS) -o genhdlist genhdlist.c -lrpm -lbz2
install:
@echo "nothing to do"
generated by cgit (git 2.34.1) at 2025-05-19 21:47:29 +0000