---
booty/__init__.py | 4 ++--
booty/alpha.py | 2 +-
booty/bootloaderInfo.py | 8 ++++----
booty/checkbootloader.py | 2 +-
booty/ppc.py | 2 +-
booty/s390.py | 2 +-
booty/sparc.py | 2 +-
booty/x86.py | 4 ++--
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/booty/__init__.py b/booty/__init__.py
index b54e194..f1aea4a 100644
--- a/booty/__init__.py
+++ b/booty/__init__.py
@@ -16,9 +16,9 @@
#
"""Module for manipulation and creation of boot loader configurations"""
-import iutil
+import pyanaconda.iutil as iutil
from bootloaderInfo import *
-from bootloader import *
+from pyanaconda.bootloader import *
class BootyNoKernelWarning(Exception):
def __init__ (self, value=""):
diff --git a/booty/alpha.py b/booty/alpha.py
index 5e5216a..549455f 100644
--- a/booty/alpha.py
+++ b/booty/alpha.py
@@ -1,5 +1,5 @@
import os
-import iutil
+import pyanaconda.iutil as iutil
from booty import BootyNoKernelWarning
from bootloaderInfo import *
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index f0b5983..b5b42d6 100644
--- a/booty/bootloaderInfo.py
+++ b/booty/bootloaderInfo.py
@@ -30,10 +30,10 @@ N_ = lambda x: x
from lilo import LiloConfigFile
-from flags import flags
-import iutil
+from pyanaconda.flags import flags
+import pyanaconda.iutil as iutil
import isys
-from product import *
+from pyanaconda.product import *
import booty
import checkbootloader
@@ -99,7 +99,7 @@ class KernelArguments:
if s not in args:
args.append(s)
- import storage
+ import pyanaconda.storage as storage
if isinstance(d, storage.devices.NetworkStorageDevice):
s = self.anaconda.network.dracutSetupString(d)
if s not in args:
diff --git a/booty/checkbootloader.py b/booty/checkbootloader.py
index b0c4e94..c3cf69b 100644
--- a/booty/checkbootloader.py
+++ b/booty/checkbootloader.py
@@ -19,7 +19,7 @@ import os
import string
from util import getDiskPart
-import iutil
+import pyanaconda.iutil as iutil
grubConfigFile = "/etc/grub.conf"
liloConfigFile = "/etc/lilo.conf"
diff --git a/booty/ppc.py b/booty/ppc.py
index 347add5..5ef7e9a 100644
--- a/booty/ppc.py
+++ b/booty/ppc.py
@@ -3,7 +3,7 @@ import os
from booty import BootyNoKernelWarning
from bootloaderInfo import *
-import iutil
+import pyanaconda.iutil as iutil
class ppcBootloaderInfo(bootloaderInfo):
def getBootDevs(self, bl):
diff --git a/booty/s390.py b/booty/s390.py
index 1a4c9f3..4e360cd 100644
--- a/booty/s390.py
+++ b/booty/s390.py
@@ -1,7 +1,7 @@
import os
from bootloaderInfo import *
-import iutil
+import pyanaconda.iutil as iutil
class s390BootloaderInfo(bootloaderInfo):
def getBootloaderConfig(self, instRoot, bl, kernelList,
diff --git a/booty/sparc.py b/booty/sparc.py
index 645a04e..63b49e8 100644
--- a/booty/sparc.py
+++ b/booty/sparc.py
@@ -4,7 +4,7 @@ import os
from booty import BootyNoKernelWarning
from util import getDiskPart
from bootloaderInfo import *
-import iutil
+import pyanaconda.iutil as iutil
class sparcBootloaderInfo(bootloaderInfo):
def writeSilo(self, instRoot, bl, kernelList,
diff --git a/booty/x86.py b/booty/x86.py
index a2af313..e80cabf 100644
--- a/booty/x86.py
+++ b/booty/x86.py
@@ -4,9 +4,9 @@ import string
from booty import BootyNoKernelWarning
from util import getDiskPart
from bootloaderInfo import *
-from flags import flags
+from pyanaconda.flags import flags
import checkbootloader
-import iutil
+import pyanaconda.iutil as iutil
import logging
log = logging.getLogger("anaconda")
--
1.7.0.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
