diff options
| author | Matt Wilson <msw@redhat.com> | 1999-11-10 02:48:09 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-11-10 02:48:09 +0000 |
| commit | d6d4e92451e4330cfe67c1ea59867c97d4d54d31 (patch) | |
| tree | 25cc6290432da62395252f8e1430f14873fb9f00 | |
| parent | 968d11fb9a72363cc31c4574258e92044828a910 (diff) | |
| download | anaconda-d6d4e92451e4330cfe67c1ea59867c97d4d54d31.tar.gz anaconda-d6d4e92451e4330cfe67c1ea59867c97d4d54d31.tar.xz anaconda-d6d4e92451e4330cfe67c1ea59867c97d4d54d31.zip | |
silo append setting, rpmmodule test case changes, gnome-map module CFLAGS change
| -rw-r--r-- | gnome-map/Makefile | 2 | ||||
| -rw-r--r-- | iw/silo.py | 3 | ||||
| -rw-r--r-- | silo.py | 3 | ||||
| -rw-r--r-- | textw/silo.py | 9 |
4 files changed, 16 insertions, 1 deletions
diff --git a/gnome-map/Makefile b/gnome-map/Makefile index 60765fdc4..b7e3bcc0e 100644 --- a/gnome-map/Makefile +++ b/gnome-map/Makefile @@ -13,7 +13,7 @@ gglobe-canvas: gglobe-canvas.c gnome-map.o gnome-canvas-dot.o gglobe-canvas.o gn timezonemapmodule.so: gnome-map.o gnome-canvas-dot.o timezonemapmodule.o gnome-map.h timezones.o timezones.h - gcc -o timezonemapmodule.so -shared gnome-map.o gnome-canvas-dot.o timezonemapmodule.o timezones.o $(LDFLAGS) + gcc -g -o timezonemapmodule.so -shared gnome-map.o gnome-canvas-dot.o timezonemapmodule.o timezones.o $(LDFLAGS) clean: rm -f *.so *.o *~ diff --git a/iw/silo.py b/iw/silo.py index b7cf8d6a0..a4bc7246a 100644 --- a/iw/silo.py +++ b/iw/silo.py @@ -46,6 +46,7 @@ class SiloWindow (InstallWindow): else: self.todo.setLiloLocation ("partition") + self.todo.liloAppend = self.appendEntry.get_text() self.todo.setLiloImages(self.images) linuxAlias = 0 @@ -195,6 +196,8 @@ class SiloWindow (InstallWindow): label = GtkLabel(_("Kernel parameters") + ":") label.set_alignment(0.0, 0.5) self.appendEntry = GtkEntry(15) + if self.todo.liloAppend: + self.appendEntry.set_text(self.todo.liloAppend) box = GtkHBox(FALSE, 5) box.pack_start(label) box.pack_start(self.appendEntry) @@ -298,6 +298,9 @@ class SiloInstall: if os.access (todo.instPath + initrd, os.R_OK): sl.addEntry("initrd", initrdFile) + if self.todo.liloAppend: + sl.addEntry("append", self.todo.liloAppend) + silo.addImage ("image", kernelFile, sl) for (label, device) in otherList: diff --git a/textw/silo.py b/textw/silo.py index 7ae16e454..e1280fae9 100644 --- a/textw/silo.py +++ b/textw/silo.py @@ -18,6 +18,10 @@ class SiloAppendWindow: "aren't sure, leave this blank.")) entry = Entry(48, scroll = 1, returnExit = 1) + + if todo.liloAppend: + entry.set(todo.liloAppend) + buttons = ButtonBar(screen, [(_("OK"), "ok"), (_("Skip"), "skip"), (_("Back"), "back") ] ) @@ -38,6 +42,11 @@ class SiloAppendWindow: else: todo.skipLilo = 0 + if entry.value(): + todo.liloAppend = string.strip(entry.value()) + else: + todo.liloAppend = None + return INSTALL_OK class SiloWindow: |