--- system-config-netboot-0.1.14/src/pxeboot.py.bugfix 2004-09-27 06:48:00.000000000 -0400
+++ system-config-netboot-0.1.14/src/pxeboot.py 2005-05-27 12:49:23.458193000 -0400
@@ -54,7 +54,7 @@
self.setKickstart("")
self.setSnapshot("")
self.append=""
- self.setRamdisk("10000")
+ self.setRamdisk("12800")
self.setEthernet("eth0")
self.setSerial(FALSE)
self.os=None
@@ -222,12 +222,13 @@
fields=i.split()
if len(fields) > 0:
if fields[0]=="label":
- k=fields[1].split("_")
- OS=""
- for s in k:
- OS=OS+s+" "
- self.setOS(OS.strip())
-
+ # Don't disallow names containing "_" !
+ # k=fields[1].split("_")
+ # OS=""
+ # for s in k:
+ # OS=OS+s+" "
+ # self.setOS(OS.strip())
+ self.setOS(fields[1].strip())
if fields[0]=="append":
self.handleAppend(fields[1:])
f.close()
--- system-config-netboot-0.1.14/src/firsttime.py.bugfix 2004-09-27 06:48:00.000000000 -0400
+++ system-config-netboot-0.1.14/src/firsttime.py 2005-05-26 19:20:43.000000000 -0400
@@ -38,7 +38,7 @@
def idle_func():
while gtk.events_pending():
- gtk.mainiteration()
+ gtk.main_iteration()
class FirstTime:
"""This class handles everything gui for the system-config-netboot application"""
--- system-config-netboot-0.1.14/src/netboot_gtk.py.bugfix 2004-09-27 06:48:00.000000000 -0400
+++ system-config-netboot-0.1.14/src/netboot_gtk.py 2005-05-26 19:21:00.000000000 -0400
@@ -14,7 +14,7 @@
def idle_func():
while gtk.events_pending():
- gtk.mainiteration()
+ gtk.main_iteration()
class Cursor:
def __init__(self,window):
--- system-config-netboot-0.1.14/src/system-config-netboot.glade.bugfix 2005-04-21 08:24:59.000000000 -0400
+++ system-config-netboot-0.1.14/src/system-config-netboot.glade 2005-05-27 13:23:42.727431000 -0400
@@ -12,12 +12,9 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">True</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -39,7 +36,6 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-6</property>
</widget>
</child>
@@ -52,7 +48,6 @@
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-5</property>
</widget>
</child>
@@ -93,10 +88,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -118,7 +109,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -143,10 +134,6 @@
<property name="yalign">0.5</property>
<property name="xpad">50</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -204,10 +191,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -229,7 +212,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -254,10 +237,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -386,10 +365,6 @@
<property name="yalign">0.5</property>
<property name="xpad">50</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -434,10 +409,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -459,7 +430,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -486,10 +457,6 @@
<property name="yalign">0.5</property>
<property name="xpad">30</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -513,7 +480,6 @@
<property name="label" translatable="yes">Serial Console</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -578,12 +544,9 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="show_fileops">False</property>
<child internal-child="cancel_button">
@@ -592,7 +555,6 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
</child>
@@ -602,7 +564,6 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
</child>
</widget>
@@ -617,12 +578,9 @@
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="icon">diskless.gif</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="enable_layout_config">True</property>
<child internal-child="dock">
@@ -816,16 +774,13 @@
<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
<property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
<property name="tooltips">True</property>
- <property name="show_arrow">True</property>
<child>
- <widget class="GtkToolButton" id="newButton">
+ <widget class="button" id="newButton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">New File</property>
- <property name="stock_id">gtk-new</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
+ <property name="label">gtk-new</property>
+ <property name="use_stock">True</property>
<signal name="clicked" handler="on_newButton_clicked" last_modification_time="Thu, 17 Oct 2002 10:50:42 GMT"/>
</widget>
<packing>
@@ -835,13 +790,11 @@
</child>
<child>
- <widget class="GtkToolButton" id="editButton">
+ <widget class="button" id="editButton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Open File</property>
- <property name="stock_id">gtk-properties</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
+ <property name="label">gtk-properties</property>
+ <property name="use_stock">True</property>
<signal name="clicked" handler="on_editButton_clicked" last_modification_time="Thu, 17 Oct 2002 10:52:58 GMT"/>
</widget>
<packing>
@@ -851,13 +804,11 @@
</child>
<child>
- <widget class="GtkToolButton" id="deleteButton">
+ <widget class="button" id="deleteButton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save File</property>
- <property name="stock_id">gtk-delete</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
<signal name="clicked" handler="on_deleteButton_clicked" last_modification_time="Thu, 17 Oct 2002 10:52:52 GMT"/>
</widget>
<packing>
@@ -897,9 +848,6 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -935,12 +883,9 @@
<property name="default_height">250</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -965,8 +910,6 @@
<child>
<widget class="GtkEventBox" id="eventbox1">
<property name="visible">True</property>
- <property name="visible_window">True</property>
- <property name="above_child">False</property>
<child>
<widget class="GnomeDruid" id="initDruid">
@@ -1014,10 +957,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1040,8 +979,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_NONE</property>
<property name="cursor_visible">False</property>
@@ -1112,8 +1049,6 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
<property name="cursor_visible">False</property>
@@ -1157,9 +1092,6 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -1183,7 +1115,6 @@
<property name="label">gtk-add</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1199,7 +1130,6 @@
<property name="label">gtk-properties</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1215,7 +1145,6 @@
<property name="label">gtk-delete</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1289,8 +1218,6 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
<property name="cursor_visible">False</property>
@@ -1324,10 +1251,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1349,10 +1272,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1374,10 +1293,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1399,10 +1314,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1450,12 +1361,9 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -1477,7 +1385,6 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-6</property>
</widget>
</child>
@@ -1490,7 +1397,6 @@
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-5</property>
</widget>
</child>
@@ -1525,10 +1431,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1553,10 +1455,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1581,10 +1479,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1606,7 +1500,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1630,7 +1524,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1671,10 +1565,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1699,10 +1589,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1724,7 +1610,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1746,7 +1632,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1773,10 +1659,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -1819,10 +1701,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">7</property>
@@ -1843,7 +1721,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1866,10 +1744,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1890,7 +1764,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1911,7 +1785,6 @@
<property name="label" translatable="yes">Anonymous FTP</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1988,10 +1861,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2013,7 +1882,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -2043,12 +1912,9 @@
<property name="default_width">500</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -2083,10 +1949,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2106,12 +1968,9 @@
<property name="default_width">500</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -2133,7 +1992,6 @@
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-7</property>
</widget>
</child>
@@ -2188,9 +2046,6 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -2214,7 +2069,6 @@
<property name="label">gtk-add</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2230,7 +2084,6 @@
<property name="label">gtk-properties</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2246,7 +2099,6 @@
<property name="label">gtk-delete</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2300,12 +2152,9 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -2377,7 +2226,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -2398,7 +2247,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -2423,10 +2272,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2451,10 +2296,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2507,7 +2348,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -2528,7 +2369,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char">*</property>
+ <property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -2553,10 +2394,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2581,10 +2418,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">12</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2636,9 +2469,6 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -2679,12 +2509,9 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -2706,7 +2533,6 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-6</property>
</widget>
</child>
@@ -2717,7 +2543,6 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">2</property>
<child>
@@ -2727,10 +2552,6 @@
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox17">
@@ -2767,10 +2588,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2791,7 +2608,6 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">1</property>
<child>
@@ -2801,10 +2617,6 @@
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox18">
@@ -2842,10 +2654,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2881,10 +2689,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
--- system-config-netboot-0.1.14/diskless/syncfiles.bugfix 2003-12-04 17:17:04.000000000 -0500
+++ system-config-netboot-0.1.14/diskless/syncfiles 2005-05-26 19:45:18.609906000 -0400
@@ -43,29 +43,44 @@
# This function is used to mount files/directories from the snapshot directory
# over the root directory.
#
-syncfile () {
- dest=${SNAPSHOTDIR}/${2}/${1}
- src=${ROOTDIR}/${1}
+syncfile () {
+ source=$1
+ if [[ "$source" = */ ]]; then
+ source=${source%/}
+ fi
+ dest=${SNAPSHOTDIR}/${2}/${source}
+ src=${ROOTDIR}/${source}
dir=`dirname "$dest"`
+ if [ ! -e "$src" ]; then
+ if [[ "$1" = */ ]]; then
+ mkdir -p $src;
+ else
+ touch "$src";
+ fi;
+ fi;
#
# Check if file already exists in snapshot directory. If not attempt to copy
# from root directory to snapshot directory.
#
if [ ! -e "$dest" ]; then
mkdir -p "$dir"
- if [ -e ${1} ] ; then
+ if [ -e ${src} ] ; then
echo "Copying ${1}"
echo rsync -a "$src" "$dir"
rsync -a "$src" "$dir"
else
echo "Creating ${1}"
- touch "$dest"
+ if [[ "$1" = */ ]]; then
+ mkdir -p $dest;
+ else
+ touch "$dest"
+ fi;
fi
else
# If dev directory already exists in snapshot directory, check if the root
-# /dev directory is newere. If it is rsync the root directory over the
+# /dev directory is newer. If it is rsync the root directory over the
# snapshot directory.
- if [ ${1} == "/dev" -a "$src" -nt "$dir" ]; then
+ if [ ${source} == "/dev" -a "$src" -nt "$dir" ]; then
rsync -v -progress -a "$src" "$dir"
fi
fi
--- system-config-netboot-0.1.14/diskless/diskless.init.bugfix 2003-01-10 14:28:19.000000000 -0500
+++ system-config-netboot-0.1.14/diskless/diskless.init 2005-05-26 19:45:18.615899000 -0400
@@ -16,7 +16,7 @@
fi
# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ "$NETWORKING" = "no" ] && exit 0
RETVAL=0
prog="diskless"
--- system-config-netboot-0.1.14/diskless/updateDiskless.bugfix 2004-12-20 15:07:20.000000000 -0500
+++ system-config-netboot-0.1.14/diskless/updateDiskless 2005-05-27 15:21:11.000000000 -0400
@@ -53,7 +53,7 @@
# Create a new image file
#
-imagesize=10000
+imagesize=12800
uncompressedimage=/var/tmp/image$$
dd if=/dev/zero of=$uncompressedimage bs=1k count=$imagesize 2> /dev/null || exit 1
LODEV=$(echo findlodev ext2.o | /sbin/nash --quiet)
@@ -119,71 +119,52 @@
__EOF
done
cp "$ROOT"/usr/share/hwdata/pcitable $MNTPOINT/usr/share/hwdata/
-cp "$ROOT"/sbin/insmod $MNTPOINT/sbin/
-cp "$ROOT"/sbin/dhclient $MNTPOINT/sbin/
-cp "$ROOT"/sbin/dhclient-script $MNTPOINT/sbin/
-cp "$ROOT"/bin/bash $MNTPOINT/sbin
-cp "$ROOT"/bin/mount $MNTPOINT/sbin
-cp "$ROOT"/sbin/route $MNTPOINT/sbin
-cp "$ROOT"/usr/bin/expr $MNTPOINT/sbin
-cp "$ROOT"/sbin/lspci $MNTPOINT/sbin
-cp "$ROOT"/sbin/ifconfig $MNTPOINT/sbin
-cp "$ROOT"/sbin/consoletype $MNTPOINT/sbin
-cp "$ROOT"/sbin/pivot_root $MNTPOINT/sbin
-#
-# Copy busybox.anaconda onto the image and
-# create all links for commands used during client boot.
-#
-cp "$ROOT"/sbin/busybox.anaconda $MNTPOINT/sbin/busybox
+BINS="/sbin/busybox.anaconda /sbin/insmod /sbin/modprobe /sbin/rmmod /sbin/dhclient /bin/bash /bin/mount /sbin/route /sbin/ip /usr/bin/expr /sbin/lspci /sbin/ifconfig /sbin/consoletype /sbin/pivot_root"
+SCRIPTS="/sbin/dhclient-script"
+for bin in $BINS $SCRIPTS; do
+ cp -fp $ROOT/$bin $MNTPOINT/sbin/
+ if [ $? -ne 0 ]; then
+ echo $ROOT/$bin not found.;
+ exit -1;
+ fi;
+done
+mv $MNTPOINT/sbin/busybox.anaconda $MNTPOINT/sbin/busybox
cd $MNTPOINT/sbin/
-ln -sf insmod modprobe
-ln -sf insmod lsmod
-ln -sf insmod rmmod
-ln -sf busybox awk
-ln -sf busybox basename
-ln -sf busybox cat
-ln -sf busybox cut
-ln -sf busybox df
-ln -sf busybox grep
-ln -sf busybox ln
-ln -sf busybox ls
-ln -sf busybox more
-ln -sf busybox rm
-ln -sf busybox sed
-ln -sf busybox sleep
-ln -sf busybox sort
-ln -sf busybox umount
-ln -sf busybox uname
+BBS="awk basename cat cut df grep ln ls more rm sed sleep sort umount uname mktemp"
+for bb in $BBS; do
+ ln -sf busybox $bb ;
+done
cd ../etc
touch fstab
ln -sf /proc/mounts mtab
-cd ../lib
-CVERS=2.3.2
-cp "$ROOT"/lib/ld-${CVERS}.so .
-ln -sf ld-${CVERS}.so ld-linux.so.2
-cp "$ROOT"/lib/libc-${CVERS}.so .
-ln -sf libc-${CVERS}.so libc.so.6
-cp "$ROOT"/lib/libdl-${CVERS}.so .
-ln -sf libdl-${CVERS}.so libdl.so.2
-cp "$ROOT"/lib/libm-${CVERS}.so .
-ln -sf libm-${CVERS}.so libm.so.6
-cp "$ROOT"/lib/libtermcap.so.2 .
-cp "$ROOT"/usr/lib/libz.so.1.1.4 .
-ln -sf libz.so.1.1.4 libz.so
-ln -sf libz.so.1.1.4 libz.so.1
+( chroot $ROOT ldd $BINS ) |
+ /bin/grep '^[ ]' |
+ /bin/sed 's/^[^>]*>[ ]//;s/^[ ]*//;s/[( ].*$//;/^[ ]*$/d' | /bin/sort | /usr/bin/uniq |
+ while read f; do
+ d=${f%/*}
+ if [ ! -d $MNTPOINT/$d ]; then
+ mkdir -p $MNTPOINT/$d;
+ fi
+ L=`/usr/bin/readlink $ROOT/$f`;
+ if [ -n "$L" ]; then
+ /bin/cp -fp $ROOT/$d/$L $MNTPOINT/$d/$L;
+ /bin/ln -s $L $MNTPOINT/$f
+ else
+ /bin/cp -fp $ROOT/$f $MNTPOINT/$f
+ fi;
+ done;
cd $TOP_DIR
NEWMODDIR=$MNTPOINT/lib/modules/$VERSION
mkdir -p $NEWMODDIR
-cp "$MODULES"/modules.* $NEWMODDIR
+cp -fp "$MODULES"/modules.* $NEWMODDIR
mkdir -p $NEWMODDIR/kernel/drivers/
-cp -r "$MODULES"/kernel/drivers/net $NEWMODDIR/kernel/drivers
-cp -r "$MODULES"/kernel/drivers/net $NEWMODDIR/kernel/drivers
+cp -rfp "$MODULES"/kernel/drivers/net $NEWMODDIR/kernel/drivers
mkdir -p $NEWMODDIR/kernel/fs/
-cp -r "$MODULES"/kernel/fs/nfs $NEWMODDIR/kernel/fs/
-cp -r "$MODULES"/kernel/fs/lockd $NEWMODDIR/kernel/fs/
+cp -rfp "$MODULES"/kernel/fs/nfs $NEWMODDIR/kernel/fs/
+cp -rfp "$MODULES"/kernel/fs/lockd $NEWMODDIR/kernel/fs/
mkdir -p $NEWMODDIR/kernel/net/
-cp -r "$MODULES"/kernel/net/sunrpc $NEWMODDIR/kernel/net/
+cp -rfp "$MODULES"/kernel/net/sunrpc $NEWMODDIR/kernel/net/
#
# Unmount and compress image file to be ready to boot
#
--- system-config-netboot-0.1.14/diskless/files.bugfix 2003-10-30 08:25:49.000000000 -0500
+++ system-config-netboot-0.1.14/diskless/files 2005-05-26 19:45:18.633881000 -0400
@@ -5,20 +5,22 @@
# add files please create a files.custom in this directory and add entries to it.
#
/boot/kernel.h
-/dev
+/dev/
+/etc/resolv.conf
/etc/adjtime
-/etc/cups/certs
+/etc/cups/certs/
/etc/modules.conf
/etc/fstab
/etc/sysconfig/hwconf
/etc/X11/XF86Config
-/var/gdm
-/var/lib/nfs
+/etc/X11/xorg.conf
+/var/gdm/
+/var/lib/nfs/
/var/lib/random-seed
-/var/tmp
-/var/lock
-/var/run
-/var/spool
-/var/log
+/var/tmp/
+/var/lock/
+/var/run/
+/var/spool/
+/var/log/
/var/lib/logrotate.status
-/root
+/root/
--- system-config-netboot-0.1.14/diskless/disklessrc.bugfix 2004-12-20 15:07:20.000000000 -0500
+++ system-config-netboot-0.1.14/diskless/disklessrc 2005-05-26 19:45:18.639880000 -0400
@@ -31,7 +31,13 @@
for MODULE in $1; do {
echo -n "Loading $MODULE module... "
if ! `grep "^$MODULE" /proc/modules > /dev/null`; then
- modprobe $MODULE && echo ""
+ if modprobe $MODULE; then
+ echo " Loaded $MODULE OK." ;
+ else
+ e=$?
+ echo "Module $MODULE load failed: $e";
+ return e;
+ fi;
else
echo "module already loaded"
fi
@@ -52,8 +58,9 @@
IFS="\n"
for CARDLIST in `lspci -n | grep "Class $CLASSNUM"`; do
{
- PCIID=`echo $CARDLIST | cut -d ' ' -f 4 | sed -e 's/:/\t0x/'` &&
+ PCIID=`echo $CARDLIST | cut -d ' ' -f 4 | sed -e 's/:/ 0x/'` &&
MODULE=`cat $PCITABLE | grep "0x$PCIID" | cut -d'"' -f2 | sed -e 's/\"//g'`
+ echo "Found Ethernet Card Module: $MODULE"
loadmodules $MODULE
} done
IFS=$IFSOLD
@@ -91,6 +98,7 @@
# /dev directory is newer. If it is rsync the root directory over the
# snapshot directory.
if [ ${1} == "/dev" -a ${1} -nt ${dir}/dev ]; then
+ echo "RSYNC-ing /dev";
rsync -a ${1} $dir
fi
fi
@@ -113,12 +121,13 @@
# Attempt to find and load the network card module
#
findhardware "$PCICLASS"
-loadmodules $MODULE
#
# load the NFS module
#
loadmodules nfs
-
+if [ $? -ne 0 ]; then
+ exec /bin/bash;
+fi;
echo "Mounting /"
mount -n -o remount,rw /
/bin/mount -n -t tmpfs /dev/shm /tmp
@@ -178,7 +187,7 @@
NFS_DIR=`echo ${NFSROOT} | cut -d : -f 2`
if [ -w /proc/progress ]; then echo 55 "Mounting root filesystem" >/proc/progress; fi
-echo "Mounting root filesystem: ${NFS_DIR} from: ${NFS_IP}"
+echo "Mounting root filesystem: ${NFS_DIR}/root from: ${NFS_IP}"
mount -n -o nolock,ro ${NFS_IP}:${NFS_DIR}/root /mnt
if [ $? -ne 0 ]; then
@@ -205,11 +214,23 @@
umount /proc
echo "Doing the pivot_root"
+
cd /mnt
/sbin/pivot_root . .oldroot
+
cd /
mount -n -t proc /proc /proc
+#
+# Try to mount the new resolv.conf just written by dhclient :
+#
+if [ ! -f /etc/resolv.conf ]; then
+ echo "WARNING: /etc/resolv.conf does not exist in the new root."
+ echo "DNS lookups will time out."
+else
+ mount -n -o bind /.oldroot/etc/resolv.conf /etc/resolv.conf ;
+fi
+
#
# Mount the snapshot directory from the server and then mount files
# in the snapshot/files file over the the shared ones
@@ -225,26 +246,36 @@
SNAPSHOT=`hostname`
fi
+umount /etc/resolv.conf ;
+
if [ "${INITRD_DBG}" = "6" ]; then exec /bin/bash; fi
echo Mounting Snapshot directories
-mount $NFS_IP:${NFS_DIR}/snapshot /.snapshot -o nolock &&
+mount -t nfs $NFS_IP:${NFS_DIR}/snapshot /.snapshot -o rw,nolock &&
{
for i in `grep -v "^#" /.snapshot/files`; do
- mountfile $i ${SNAPSHOT}
+ if [ -e $i ]; then
+ mountfile $i ${SNAPSHOT}
+ fi;
done
if [ -e /.snapshot/files.custom ]; then
for i in `grep -v "^#" /.snapshot/files.custom`; do
- mountfile $i ${SNAPSHOT}
+ if [ -e $i ]; then
+ mountfile $i ${SNAPSHOT}
+ fi;
done
fi
RELEASE=`uname -r`
for i in `ls /lib/modules/$RELEASE/modules.*`; do
- mountfile $i ${SNAPSHOT}
+ if [ -e $i ]; then
+ mountfile $i ${SNAPSHOT}
+ fi;
done
/sbin/ifup lo
}
-#if [ "${INITRD_DBG}" = "7" ]; then exec /bin/bash; fi
+cp -fp /.oldroot/etc/resolv.conf /etc/resolv.conf
+
+if [ "${INITRD_DBG}" = "7" ]; then exec /bin/bash; fi
#echo "Mounting the devfs filesystem"
#mount -n -t devfs /devfs /dev
@@ -257,8 +288,10 @@
if [ "${INITRD_DBG}" = "8" ]; then exec /bin/bash; fi
/bin/kill -TERM `cat /.oldroot/tmp/dhclient.pid`
echo "Running /sbin/init"
-umount /proc
umount /.oldroot/tmp
echo 0x100 > /proc/sys/kernel/real-root-dev
-exit
+
+umount /proc
+
+exec sbin/init