EVERY LAST REFERENCE TO LOADER MUST BE ELIMINATED RARRRR:
- remove references to loader in analog and makeupdates.
- change the default progname in isys/log.c from loader to anaconda.
- reword comments here and there that refer to loader.
---
data/liveinst/liveinst | 2 +-
pyanaconda/isys/iface.h | 2 +-
pyanaconda/isys/log.c | 4 ++--
pyanaconda/kickstart.py | 2 +-
pyanaconda/network.py | 2 +-
pyanaconda/yuminstall.py | 7 ++-----
scripts/analog | 2 --
scripts/makeupdates | 7 +++----
8 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst
index b7ee4cf..bb11e27 100755
--- a/data/liveinst/liveinst
+++ b/data/liveinst/liveinst
@@ -62,7 +62,7 @@ fi
# loading and lvm control in this file, too.
ANACONDA=${LIVECMD:=anaconda --liveinst --method=livecd://$LIVE_BLOCK $INSTLANG}
-# load modules that would get loaded by the loader... (#230945)
+# load modules that would get loaded by the initramfs (#230945)
for i in raid0 raid1 raid5 raid6 raid456 raid10 dm-mod dm-zero dm-mirror dm-snapshot dm-multipath dm-round-robin vfat dm-crypt cbc sha256 lrw xts iscsi_tcp iscsi_ibft; do /sbin/modprobe $i 2>/dev/null ; done
export ANACONDA_PRODUCTNAME=$( cat /etc/system-release | sed -r -e 's/ *release.*//' )
diff --git a/pyanaconda/isys/iface.h b/pyanaconda/isys/iface.h
index 77e66ed..b249394 100644
--- a/pyanaconda/isys/iface.h
+++ b/pyanaconda/isys/iface.h
@@ -29,7 +29,7 @@
#include <glib.h>
#include <NetworkManager.h>
-/* Enumerated types used in iface.c as well as loader's network code */
+/* Enumerated types used in iface.c */
enum { IPUNUSED = -1, IPV4, IPV6 };
enum { IPV4_UNUSED_METHOD, IPV4_DHCP_METHOD, IPV4_MANUAL_METHOD, IPV4_IBFT_METHOD, IPV4_IBFT_DHCP_METHOD };
diff --git a/pyanaconda/isys/log.c b/pyanaconda/isys/log.c
index 5be9ba2..c0e8ca4 100644
--- a/pyanaconda/isys/log.c
+++ b/pyanaconda/isys/log.c
@@ -38,7 +38,7 @@ static FILE * main_log_tty = NULL;
static FILE * main_log_file = NULL;
static FILE * program_log_file = NULL;
static loglevel_t minLevel = INFO;
-static const char * main_tag = "loader";
+static const char * main_tag = "anaconda";
static const char * program_tag = "program";
static const int syslog_facility = LOG_LOCAL1;
@@ -157,7 +157,7 @@ int tty_logfd = -1;
int file_logfd = -1;
void openLog() {
- /* init syslog logging (so loader messages can also be forwarded to a remote
+ /* init syslog logging (so log messages can also be forwarded to a remote
syslog daemon */
openlog(main_tag, 0, syslog_facility);
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 27cf6d1..764ca94 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1397,7 +1397,7 @@ def preScriptPass(anaconda, file):
runPreScripts(anaconda, ksparser.handler.scripts)
def parseKickstart(anaconda, file):
- # preprocessing the kickstart file has already been handled by loader.
+ # preprocessing the kickstart file has already been handled in initramfs.
handler = AnacondaKSHandler(anaconda)
ksparser = AnacondaKSParser(handler)
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index c26275f..067f3b1 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -441,7 +441,7 @@ class Network:
bootif_mac = None
if ksdevice == 'bootif' and "BOOTIF" in flags.cmdline:
bootif_mac = flags.cmdline["BOOTIF"][3:].replace("-", ":").upper()
- # sort for ksdevice=link (to select the same device as in loader))
+ # sort for ksdevice=link (to select the same device as in initrd))
for dev in sorted(self.netdevices):
mac = self.netdevices[dev].get('HWADDR').upper()
if ksdevice == 'link' and isys.getLinkStatus(dev):
diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py
index cd78d72..8c624be 100644
--- a/pyanaconda/yuminstall.py
+++ b/pyanaconda/yuminstall.py
@@ -435,7 +435,7 @@ class AnacondaYum(yum.YumBase):
def configBaseURL(self):
# We only have a methodstr if method= or repo= was passed to
# anaconda. No source for this base repo (the CD media, NFS,
- # whatever) is mounted yet since loader only mounts the source
+ # whatever) is mounted yet since initramfs only mounts the source
# for the stage2 image. We need to set up the source mount
# now.
if flags.cmdline.has_key("preupgrade"):
@@ -477,7 +477,7 @@ class AnacondaYum(yum.YumBase):
(opts, server, path) = iutil.parseNfsUrl(m)
isys.mount(server+":"+path, self.tree, "nfs", options=opts)
- # This really should be fixed in loader instead but for now see
+ # This really should be fixed in initrd instead but for now see
# if there's images and if so go with this being an NFSISO
# install instead.
image = findFirstIsoImage(self.tree, self.anaconda.intf.messageWindow)
@@ -598,9 +598,6 @@ class AnacondaYum(yum.YumBase):
dest has dest.proxy set to the host and port (no un/pw)
dest.proxy_username and dest.proxy_password are set if present in src
"""
- # This is the same pattern as from loader/urls.c:splitProxyParam
- # except that the POSIX classes have been replaced with character
- # ranges
# NOTE: If this changes, update tests/regex/proxy.py
#
# proxy=[protocol://][username[:password]@]host[:port][path]
diff --git a/scripts/analog b/scripts/analog
index 9a84ff7..eb1962e 100755
--- a/scripts/analog
+++ b/scripts/analog
@@ -81,7 +81,6 @@ daemon.*;\\
user.info;\\
authpriv.* ?path_syslog;anaconda_syslog
-:programname, isequal, "loader" ?path_anaconda;anaconda_syslog
:programname, isequal, "anaconda" ?path_anaconda;anaconda_syslog
:programname, isequal, "anaconda-tb" ?path_anaconda_tb;anaconda_justmsg
:programname, isequal, "program" ?path_program;anaconda_syslog
@@ -92,7 +91,6 @@ authpriv.* ?path_syslog;anaconda_syslog
# discard those that we logged
:programname, isequal, "rsyslogd" ~
-:programname, isequal, "loader" ~
:programname, isequal, "anaconda" ~
:programname, isequal, "anaconda-tb" ~
:programname, isequal, "program" ~
diff --git a/scripts/makeupdates b/scripts/makeupdates
index e0aaa39..ee1eaa8 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -1,9 +1,8 @@
#!/usr/bin/python
#
# makeupdates - Generate an updates.img containing changes since the last
-# tag, but only changes that do not need to be compiled. If
-# you need an updated _isys.so or a new loader, you should
-# still compile things as usual.
+# tag, but only changes to the main anaconda runtime.
+# initrd/stage1 updates have to be created separately.
#
# Copyright (C) 2009 Red Hat, Inc.
#
@@ -131,7 +130,7 @@ def copyUpdatedFiles(tag, updates, cwd):
elif file.find('/') != -1:
fields = file.split('/')
subdir = fields[0]
- if subdir in ['loader', 'po', 'scripts','command-stubs', 'tests',
+ if subdir in ['po', 'scripts','command-stubs', 'tests',
'bootdisk', 'docs', 'fonts', 'utils', 'gptsync',
'liveinst']:
continue
--
1.7.7.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
