summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--anaconda.spec.in5
-rw-r--r--iw/xconfig_gui.py4
-rwxr-xr-xreconfig.init2
4 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 9383623b9..03d785aba 100644
--- a/Makefile
+++ b/Makefile
@@ -53,11 +53,11 @@ install:
mkdir -p $(DESTDIR)/usr/bin
mkdir -p $(DESTDIR)/usr/sbin
- mkdir -p $(DESTDIR)/etc/rc.d/init.d
+ mkdir -p $(DESTDIR)/etc/init.d
mkdir -p $(DESTDIR)/$(PYTHONLIBDIR)
mkdir -p $(DESTDIR)/$(RUNTIMEDIR)
- cp -a reconfig.init $(DESTDIR)/etc/rc.d/init.d/reconfig
+ cp -a reconfig.init $(DESTDIR)/etc/init.d/reconfig
install -m 755 anaconda $(DESTDIR)/usr/sbin/anaconda
install -m 755 anaconda-stub $(DESTDIR)/$(RUNTIMEDIR)
cp -var $(PYFILES) $(DESTDIR)/$(PYTHONLIBDIR)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 540a29ca5..bfb8146c4 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -66,7 +66,7 @@ fi
/usr/sbin/ddcprobe
%endif
-%config /etc/rc.d/init.d/reconfig
+%config /etc/init.d/reconfig
%files runtime
%defattr(-,root,root)
@@ -78,6 +78,9 @@ fi
* %{date} Anaconda team <bugzilla@redhat.com>
- built new version from CVS
+* Fri Jul 14 2000 Matt Wilson <msw@redhat.com>
+- moved init script for reconfig mode to /etc/init.d/reconfig
+
* Thu Feb 03 2000 Michael Fulbright <drmike@redhat.com>
- strip files
- add lang-table to file list
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index 4f74dfada..ff2ed2a58 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -178,7 +178,9 @@ class MonitorWindow (InstallWindow):
select = None
for man in keys:
parent = ctree.insert_node (None, None, (man,), 2, is_leaf = FALSE)
- for monitor in monitors[man]:
+ models = monitors[man]
+ models.sort()
+ for monitor in models:
node = ctree.insert_node (parent, None, (monitor[0],), 2)
ctree.node_set_row_data (node, monitor)
if monitor[0] == self.todo.x.monID:
diff --git a/reconfig.init b/reconfig.init
index e504ee792..f8362de7e 100755
--- a/reconfig.init
+++ b/reconfig.init
@@ -9,7 +9,7 @@
# Also will run if 'reconfig' is on the kernel cmdline.
#
# Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
RETVAL=$?