Anaconda-devel March 2011

anaconda-devel@lists.fedoraproject.org

22 participants
107 discussions

[master 1/3] shutdown.c: pidof and killall5 are in /sbin on rawhide.
by Ales Kozumplik 22 Mar '11

22 Mar '11

Without this the termination procedure just prints errors about how it can not find the binaries. --- loader/shutdown.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/shutdown.c b/loader/shutdown.c index f03b367..bb32359 100644 --- a/loader/shutdown.c +++ b/loader/shutdown.c @@ -46,7 +46,7 @@ static void performTerminations(void) { /* find some pids so we can omit them from killall5 */ *omit = '\0'; for (procname=donotkill; *procname; procname++) { - sprintf(buf, "/usr/sbin/pidof %s", *procname); + sprintf(buf, "/sbin/pidof %s", *procname); if ((f = popen(buf, "r")) != NULL) { if (fgets(buf, sizeof(buf), f) != NULL) { buf[strcspn(buf,"\n")] = '\0'; @@ -64,13 +64,13 @@ static void performTerminations(void) { sync(); printf("sending termination signals..."); - sprintf(buf, "/usr/sbin/killall5 -15%s", omit); + sprintf(buf, "/sbin/killall5 -15%s", omit); system(buf); sleep(2); printf("done\n"); printf("sending kill signals..."); - sprintf(buf, "/usr/sbin/killall5 -9%s", omit); + sprintf(buf, "/sbin/killall5 -9%s", omit); system(buf); sleep(2); printf("done\n"); -- 1.7.3.3

2 3

[PATCH] Fix --mtu option to kickstart network command (#689081)
by Ian Ward Comfort 22 Mar '11

22 Mar '11

See the Bugzilla issue in the subject. This is based on rhel6-branch (but I can rebase if that's wrong) and can be pulled from: git://github.com/icomfort/anaconda.git rhel6-fix-mtu Please keep me cc'd on any discussion; I am not subscribed to the list. -- >8 -- mtu was not among the fields that NetworkData.execute was copying from the kickstart data structure to the NetworkDevice object. --- kickstart.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/kickstart.py b/kickstart.py index 3ce4ad1..5e3a15f 100644 --- a/kickstart.py +++ b/kickstart.py @@ -631,6 +631,9 @@ class NetworkData(commands.network.RHEL6_NetworkData): else: dev.set (("ONBOOT", "no")) + if self.mtu: + dev.set(("MTU", self.mtu)) + if self.ethtool: dev.set(("ETHTOOL_OPTS", self.ethtool)) -- 1.7.3.2

3 2

[PATCH master] Remove unused functions (networking).
by Radek Vykydal 22 Mar '11

22 Mar '11

--- pyanaconda/network.py | 38 ------------------------- tests/pyanaconda_test/network_test.py | 50 --------------------------------- 2 files changed, 0 insertions(+), 88 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 83a299a..831af57 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -408,11 +408,6 @@ class Network: self.ksdevice = dev break - - - def getDevice(self, device): - return self.netdevices[device] - def getKSDevice(self): if self.ksdevice is None: return None @@ -470,29 +465,6 @@ class Network: return dev.get('IPV6_DEFAULTGW') return "" - def lookupHostname(self): - # can't look things up if they don't exist! - if not self.hostname or self.hostname == "localhost.localdomain": - return None - - if not hasActiveNetDev(): - log.warning("no network devices were available to look up host name") - return None - - try: - (family, socktype, proto, canonname, sockaddr) = \ - socket.getaddrinfo(self.hostname, None, socket.AF_INET)[0] - (ip, port) = sockaddr - except: - try: - (family, socktype, proto, canonname, sockaddr) = \ - socket.getaddrinfo(self.hostname, None, socket.AF_INET6)[0] - (ip, port, flowinfo, scopeid) = sockaddr - except: - return None - - return ip - # Note that the file is written-out only if there is a value # that has changed. def writeIfcfgFiles(self): @@ -629,16 +601,6 @@ class Network: line += "\n" f.write(line) - def hasNameServers(self, hash): - if hash.keys() == []: - return False - - for key in hash.keys(): - if key.upper().startswith('DNS'): - return True - - return False - def hasWirelessDev(self): for dev in self.netdevices: if isys.isWirelessDevice(dev): diff --git a/tests/pyanaconda_test/network_test.py b/tests/pyanaconda_test/network_test.py index e044d39..d188afa 100644 --- a/tests/pyanaconda_test/network_test.py +++ b/tests/pyanaconda_test/network_test.py @@ -316,14 +316,6 @@ class NetworkTest(mock.TestCase): #def network_update_test(self): # pass - def network_get_device_test(self): - import pyanaconda.network - - nw = pyanaconda.network.Network() - nw.netdevices['dev'] = 'device' - ret = nw.getDevice('dev') - self.assertEqual(ret, 'device') - def network_get_ks_device_1_test(self): import pyanaconda.network nw = pyanaconda.network.Network() @@ -370,32 +362,6 @@ class NetworkTest(mock.TestCase): self.assertEqual(pyanaconda.network.Network.netdevices['eth0'].method_calls, [('set', (('GATEWAY', '10.0.0.1'),), {})]) - def network_lookup_hostname_1_test(self): - import pyanaconda.network - nw = pyanaconda.network.Network() - nw.hostname = None - ret = nw.lookupHostname() - self.assertEqual(ret, None) - - def network_lookup_hostname_2_test(self): - import pyanaconda.network - nw = pyanaconda.network.Network() - nw.hostname = 'desktop' - pyanaconda.network.hasActiveNetDev = mock.Mock(return_value=False) - ret = nw.lookupHostname() - self.assertEqual(ret, None) - - def network_lookup_hostname_3_test(self): - import pyanaconda.network - pyanaconda.network.socket.getaddrinfo.return_value = \ - [(0, 0, 0, 0, ('10.1.1.1', 0))] - - nw = pyanaconda.network.Network() - nw.hostname = 'desktop' - pyanaconda.network.hasActiveNetDev = mock.Mock(return_value=True) - ret = nw.lookupHostname() - self.assertEqual(ret, '10.1.1.1') - def network_write_ifcfg_files_test(self): import pyanaconda.network nw = pyanaconda.network.Network() @@ -518,22 +484,6 @@ class NetworkTest(mock.TestCase): self.assertEqual(self.fs[TMPFILE], 'network --device eth0 --bootproto dhcp --noipv6\n') - - def network_has_name_server_1_test(self): - import pyanaconda.network - hash = {'foo':'', 'bar':''} - - nw = pyanaconda.network.Network() - ret = nw.hasNameServers(hash) - self.assertFalse(ret) - - def network_has_name_server_2_test(self): - import pyanaconda.network - hash = {'foo':'', 'bar':'', 'dnsserver':''} - - nw = pyanaconda.network.Network() - ret = nw.hasNameServers(hash) - self.assertTrue(ret) def network_has_wireless_dev_1_test(self): import pyanaconda.network -- 1.7.2

2 1

[master 1/2] gui.py: nuke titleBar*()
by Ales Kozumplik 22 Mar '11

22 Mar '11

I should have removed this with 8b51f7ccee637e16e28e9b06faa993083c04702e. --- pyanaconda/gui.py | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py index ac90e2a..3bc557e 100755 --- a/pyanaconda/gui.py +++ b/pyanaconda/gui.py @@ -285,37 +285,6 @@ class WrappingLabel(gtk.Label): self.ignoreEvents = 0 widgetExpander(self) -def titleBarMousePressCB(widget, event, data): - if event.type & gtk.gdk.BUTTON_PRESS: - (x, y) = data["window"].get_position() - data["state"] = 1 - data["button"] = event.button - data["deltax"] = event.x_root - x - data["deltay"] = event.y_root - y - -def titleBarMouseReleaseCB(widget, event, data): - if data["state"] and event.button == data["button"]: - data["state"] = 0 - data["button"] = 0 - data["deltax"] = 0 - data["deltay"] = 0 - -def titleBarMotionEventCB(widget, event, data): - if data["state"]: - newx = event.x_root - data["deltax"] - newy = event.y_root - data["deltay"] - if newx < 0: - newx = 0 - if newy < 0: - newy = 0 - (w, h) = data["window"].get_size() - if (newx+w) > gtk.gdk.screen_width(): - newx = gtk.gdk.screen_width() - w - if (newy+20) > (gtk.gdk.screen_height()): - newy = gtk.gdk.screen_height() - 20 - - data["window"].move(int(newx), int(newy)) - def addFrame(dialog, title=None): # make screen shots work dialog.connect ("key-release-event", handlePrintScrnRelease) -- 1.7.3.3

2 2

[PATCH] mkctype.c is no longer used. Remove it.
by Chris Lumens 21 Mar '11

21 Mar '11

--- loader/Makefile.am | 15 +--------- loader/mkctype.c | 76 ---------------------------------------------------- 2 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 loader/mkctype.c diff --git a/loader/Makefile.am b/loader/Makefile.am index dc6f5fe..ebcc5f7 100644 --- a/loader/Makefile.am +++ b/loader/Makefile.am @@ -23,8 +23,7 @@ shareddir = $(datadir)/$(PACKAGE_NAME) boot_PROGRAMS = loader shared_DATA = loader.tr dist_shared_DATA = unicode-linedraw-chars.txt -noinst_PROGRAMS = mkctype dirbrowser -noinst_DATA = ctype.c +noinst_PROGRAMS = dirbrowser noinst_HEADERS = *.h if IS_S390 @@ -65,16 +64,13 @@ init_SOURCES = init.c undomounts.c shutdown.c copy.c modules.c \ shutdown_CFLAGS = $(COMMON_CFLAGS) -DAS_SHUTDOWN=1 shutdown_SOURCES = shutdown.c undomounts.c -mkctype_CFLAGS = $(COMMON_CFLAGS) -mkctype_SOURCES = mkctype.c - dirbrowser_CFLAGS = $(COMMON_CFLAGS) -DSTANDALONE dirbrowser_LDADD = $(NEWT_LIBS) dirbrowser_SOURCES = dirbrowser.c EXTRA_DIST = simplemot keymaps-* -CLEANFILES = keymaps-override-$(ARCH) ctype.c tr/*.tr +CLEANFILES = keymaps-override-$(ARCH) tr/*.tr MAINTAINERCLEANFILES = Makefile.in @@ -86,10 +82,6 @@ cp_verbose = $(cp_verbose_$(V)) cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY)) cp_verbose_0 = @echo " CP "$@; -mkctype_verbose = $(mkctype_verbose_$(V)) -mkctype_verbose_ = $(mkctype_verbose_$(AM_DEFAULT_VERBOSITY)) -mkctype_verbose_0 = @echo " MAKE "$@; - msgmerge_verbose = $(msgmerge_verbose_$(V)) msgmerge_verbose_ = $(msgmerge_verbose_$(AM_DEFAULT_VERBOSITY)) msgmerge_verbose_0 = echo " MERGE "$${lang}.po; @@ -101,9 +93,6 @@ xgettext_verbose_0 = @echo " GETTXT "$@; keymaps-override-$(ARCH): keymaps-$(ARCH) $(cp_verbose)cp -p $< $@ -ctype.c: mkctype - $(mkctype_verbose)./mkctype > ctype.c - loader.tr: $(top_srcdir)/data/lang-table loader.po @LANGS="`cut -f 2 $(top_srcdir)/data/lang-table | egrep -v '(^en$$)'`" ; \ if [ ! -d tr ]; then \ diff --git a/loader/mkctype.c b/loader/mkctype.c deleted file mode 100644 index 12eaba0..0000000 --- a/loader/mkctype.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * mkctype.c - * - * Copyright (C) 2007 Red Hat, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <ctype.h> -#include <stdio.h> - -#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) -# define __ctype_b (*__ctype_b_loc()) -# define __ctype_tolower (*__ctype_tolower_loc()) -# define __ctype_toupper (*__ctype_toupper_loc()) -#endif - -int main(int argc, char ** argv) { - int i; - - printf("#include <sys/types.h>\n\n"); - - printf("static const unsigned short int __ctype_b_internal[] = {"); - - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_b[i]); - } - - printf("\n};\n\n"); - printf("const unsigned short int * __ctype_b = __ctype_b_internal + 128;\n\n"); - - printf("const int __ctype_toupper_internal[] = {"); - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_toupper[i]); - } - - printf("\n};\n\n"); - printf("const int * __ctype_toupper = __ctype_toupper_internal + 128;\n\n"); - - printf("const int __ctype_tolower_internal[] = {"); - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_tolower[i]); - } - - printf("\n};\n\n"); - printf("const int * __ctype_tolower = __ctype_tolower_internal + 128;\n\n"); - - printf ("const unsigned short int **__ctype_b_loc (void) { return &__ctype_b; }\n"); - printf ("const int **__ctype_toupper_loc (void) { return &__ctype_toupper; }\n"); - printf ("const int **__ctype_tolower_loc (void) { return &__ctype_tolower; }\n\n"); - - return 0; -}; -- 1.7.4.1

2 1

[PATCH] Fix the filesystem migration dialog in text mode (#688314).
by Chris Lumens 21 Mar '11

21 Mar '11

--- pyanaconda/textw/upgrade_text.py | 43 +++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/pyanaconda/textw/upgrade_text.py b/pyanaconda/textw/upgrade_text.py index ed00ad9..7dca48f 100644 --- a/pyanaconda/textw/upgrade_text.py +++ b/pyanaconda/textw/upgrade_text.py @@ -36,7 +36,6 @@ seenExamineScreen = False class UpgradeMigrateFSWindow: def __call__ (self, screen, anaconda): - migent = anaconda.storage.migratableDevices g = GridFormHelp(screen, _("Migrate File Systems"), "upmigfs", 1, 4) @@ -64,15 +63,15 @@ class UpgradeMigrateFSWindow: device.format.type, device.format.mountpoint), device, migrating) - + g.add(partlist, 0, 1, padding = (0, 0, 0, 1)) - + buttons = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON] ) g.add(buttons, 0, 3, anchorLeft = 1, growx = 1) - while 1: + while True: result = g.run() - + if (buttons.buttonPressed(result)): result = buttons.buttonPressed(result) @@ -80,20 +79,30 @@ class UpgradeMigrateFSWindow: screen.popWindow() return INSTALL_BACK - # reset - # XXX the way to do this is by scheduling and cancelling actions - #for entry in migent: - # entry.setFormat(0) - # entry.setMigrate(0) - # entry.fsystem = entry.origfsystem + # Cancel any previously scheduled migrate actions first. + for entry in partlist: + action = anaconda.storage.devicetree.findActions(device=entry[1], + type="migrate") + if not action: + continue + + anaconda.storage.devicetree.cancelAction(action) + # Then schedule an action for whatever rows were selected. for entry in partlist.getSelection(): - try: - newfs = getFormat(entry.format.migratetofs[0]) - except Exception, e: - log.info("failed to get new filesystem type, defaulting to ext3: %s" %(e,)) - newfs = getFormat("ext3") - anaconda.storage.migrateFormat(entry, newfs) + action = anaconda.storage.devicetree.findActions(device=entry[1], + type="migrate") + if action: + # the migrate action has already been scheduled + continue + + newfs = getFormat(entry[1].format.migrationTarget) + if not newfs: + log.warning("failed to get new filesystem type (%s)" + % entry[1].format.migrationTarget) + continue + action = ActionMigrateFormat(entry[1]) + anaconda.storage.devicetree.registerAction(action) screen.popWindow() return INSTALL_OK -- 1.7.4.1

2 2

[rhel6-branch] Implement a general version of InstallInterfaceBase.methodstrRepoWindow().
by Ales Kozumplik 18 Mar '11

18 Mar '11

Otherwise the text installation crashes when trying to call it. Resolves: rhbz#687956 --- gui.py | 10 +++++++++- installinterfacebase.py | 20 ++++++++++++++++++++ yuminstall.py | 11 +++-------- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/gui.py b/gui.py index cb33663..9eef63f 100755 --- a/gui.py +++ b/gui.py @@ -1132,8 +1132,16 @@ class InstallInterface(InstallInterfaceBase): dialog.createDialog() dialog.run() - def methodstrRepoWindow(self, methodstr): + def methodstrRepoWindow(self, methodstr, exception): from task_gui import RepoMethodstrEditor + + self.anaconda.intf.messageWindow( + _("Error Setting Up Repository"), + _("The following error occurred while setting up the " + "installation repository:\n\n%(e)s\n\nPlease provide the " + "correct information for installing %(productName)s.") + % {'e': exception, 'productName': productName}) + dialog = RepoMethodstrEditor(self.anaconda, methodstr) dialog.createDialog() return dialog.run() diff --git a/installinterfacebase.py b/installinterfacebase.py index 024a28d..71cb9cb 100644 --- a/installinterfacebase.py +++ b/installinterfacebase.py @@ -19,6 +19,8 @@ # Author(s): Hans de Goede <hdegoede(a)redhat.com> import gettext +import sys + _ = lambda x: gettext.ldgettext("anaconda", x) P_ = lambda x, y, z: gettext.ldngettext("anaconda", x, y, z) @@ -35,6 +37,24 @@ class InstallInterfaceBase(object): custom_buttons=[]): raise NotImplementedError + def methodstrRepoWindow(self, methodstr, exception): + """ Called when the repo specified by methodstr could not be found. + + Depending on the interface implementation terminates the program or + gives user a chance to specify a new repo path it then returns. The + default implementation is to terminate. + """ + self.messageWindow( + _("Error Setting Up Repository"), + _("The following error occurred while setting up the " + "installation repository:\n\n%(e)s\n\n" + "Installation can not continue.") + % {'e': exception}, + type = "custom", + custom_icon="info", + custom_buttons=[_("Exit installer")]) + sys.exit(0) + def unusedRaidMembersWarning(self, unusedRaidMembers): """Warn about unused BIOS RAID members""" unusedRaidMembers = \ diff --git a/yuminstall.py b/yuminstall.py index 876cdbc..6fe1e19 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -354,14 +354,9 @@ class AnacondaYum(YumSorter): try: self.configBaseURL() break - except SystemError, e: - self.anaconda.intf.messageWindow(_("Error Setting Up Repository"), - _("The following error occurred while setting up the " - "installation repository:\n\n%(e)s\n\nPlease provide the " - "correct information for installing %(productName)s.") - % {'e': e, 'productName': productName}) - - self.anaconda.methodstr = self.anaconda.intf.methodstrRepoWindow(self.anaconda.methodstr or "cdrom:") + except SystemError as exception: + self.anaconda.methodstr = self.anaconda.intf.methodstrRepoWindow(self.anaconda.methodstr or "cdrom:", + exception) self.doConfigSetup(root=self.anaconda.rootPath) if not self.anaconda.id.getUpgrade(): -- 1.7.3.3

2 1

[lorax] Do not remove libassuan.
by Ales Kozumplik 17 Mar '11

17 Mar '11

A python lib we use (python-value_key) depends on this. If it fails to import the module we see weird problems importing python modules backed up by .so libraries, for instance: ImportError: /lib64/libcryptsetup.so.1: undefined symbol: uuid_generate Related: rhbz#684742 --- share/ramdisk.ltmpl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/share/ramdisk.ltmpl b/share/ramdisk.ltmpl index 3a11352..5896faa 100644 --- a/share/ramdisk.ltmpl +++ b/share/ramdisk.ltmpl @@ -267,7 +267,6 @@ remove "libXv" remove "libXvMC" remove "libXxf86misc" remove "libXxf86vm" -remove "libassuan" remove "libasyncns" remove "libccss" remove "libcgroup" -- 1.7.3.3

2 1

[PATCH] Prevent Platform from importing storage stuff until it's necessary.
by Chris Lumens 16 Mar '11

16 Mar '11

--- pyanaconda/platform.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py index acf7d5e..3942887 100644 --- a/pyanaconda/platform.py +++ b/pyanaconda/platform.py @@ -22,10 +22,6 @@ import iutil import parted -import storage -from storage.errors import * -from storage.formats import * -from storage.partspec import * import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -166,6 +162,7 @@ class Platform(object): def setDefaultPartitioning(self): """Return the default platform-specific partitioning information.""" + from storage.partspec import PartSpec return [PartSpec(mountpoint="/boot", fstype=self.defaultBootFSType, size=500, weight=self.weight(mountpoint="/boot"))] @@ -267,6 +264,7 @@ class EFI(Platform): return errors def setDefaultPartitioning(self): + from storage.partspec import PartSpec ret = Platform.setDefaultPartitioning(self) ret.append(PartSpec(mountpoint="/boot/efi", fstype="efi", size=20, maxSize=200, grow=True, weight=self.weight(fstype="efi"))) @@ -379,6 +377,7 @@ class IPSeriesPPC(PPC): return errors def setDefaultPartitioning(self): + from storage.partspec import PartSpec ret = PPC.setDefaultPartitioning(self) ret.append(PartSpec(fstype="prepboot", size=4, weight=self.weight(fstype="prepboot"))) @@ -451,6 +450,7 @@ class NewWorldPPC(PPC): return errors def setDefaultPartitioning(self): + from storage.partspec import PartSpec ret = Platform.setDefaultPartitioning(self) ret.append(PartSpec(fstype="appleboot", size=1, maxSize=1, weight=self.weight(fstype="appleboot"))) @@ -487,6 +487,7 @@ class S390(Platform): def setDefaultPartitioning(self): """Return the default platform-specific partitioning information.""" + from storage.partspec import PartSpec return [PartSpec(mountpoint="/boot", fstype=self.defaultBootFSType, size=500, weight=self.weight(mountpoint="/boot"), asVol=True, singlePV=True)] -- 1.7.4.1

2 1

[rhel5-branch] Include and initialize the IP over Infiniband module.
by Ales Kozumplik 16 Mar '11

16 Mar '11

Related: rhbz#660684 --- loader2/hardware.c | 5 +++++ loader2/hardware.h | 4 ++-- loader2/loader.c | 1 + scripts/mk-images | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/loader2/hardware.c b/loader2/hardware.c index 4c6f2d3..4639ecd 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -296,6 +296,11 @@ int busProbe(moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps, return 0; } +void infinibandSetup(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo) +{ + mlLoadModule("ib_ipoib", modLoaded, modDeps, modInfo, NULL); +} void ipv6Setup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo) { diff --git a/loader2/hardware.h b/loader2/hardware.h index 7014cf8..206d7b3 100644 --- a/loader2/hardware.h +++ b/loader2/hardware.h @@ -19,10 +19,10 @@ void ideSetup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); void dasdSetup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); - +void infinibandSetup(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo); void ipv6Setup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); - void spufsSetup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); #endif diff --git a/loader2/loader.c b/loader2/loader.c index 488bb5b..9729072 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1616,6 +1616,7 @@ int main(int argc, char ** argv) { scsiSetup(modLoaded, modDeps, modInfo); dasdSetup(modLoaded, modDeps, modInfo); spufsSetup(modLoaded, modDeps, modInfo); + infinibandSetup(modLoaded, modDeps, modInfo); /* Note we *always* do this. If you could avoid this you could get a system w/o USB keyboard support, which would be bad. */ diff --git a/scripts/mk-images b/scripts/mk-images index 59e3c0b..99d861c 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -49,7 +49,8 @@ SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS" BTERMMODS="vga16fb" CRYPTOMODS="sha256 xts aes_generic" PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia" -INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $BTERMMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net" +INFINIBANDMODS="ib_ipoib" +INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $BTERMMODS $COMMONMODS $PCMCIASOCKMODS $INFINIBANDMODS =scsi =net" # Set, verify, and create paths KERNELPATH=$1 -- 1.7.3.3

2 1

← Newer
1
2
3
4
5
6
7
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel March 2011