diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | loader/Makefile.am | 2 | ||||
| -rw-r--r-- | loader/cdinstall.c | 8 | ||||
| -rw-r--r-- | loader/dirbrowser.c | 2 | ||||
| -rw-r--r-- | loader/driverdisk.c | 8 | ||||
| -rw-r--r-- | loader/driverselect.c | 2 | ||||
| -rw-r--r-- | loader/fwloader.c | 2 | ||||
| -rw-r--r-- | loader/getparts.c | 2 | ||||
| -rw-r--r-- | loader/hardware.c | 4 | ||||
| -rw-r--r-- | loader/hdinstall.c | 8 | ||||
| -rw-r--r-- | loader/kbd.c | 6 | ||||
| -rw-r--r-- | loader/kickstart.c | 6 | ||||
| -rw-r--r-- | loader/lang.c | 10 | ||||
| -rw-r--r-- | loader/loader.c | 14 | ||||
| -rw-r--r-- | loader/loader.h | 2 | ||||
| -rw-r--r-- | loader/loadermisc.c | 2 | ||||
| -rw-r--r-- | loader/mediacheck.c | 2 | ||||
| -rw-r--r-- | loader/method.c | 8 | ||||
| -rw-r--r-- | loader/modules.c | 2 | ||||
| -rw-r--r-- | loader/net.c | 8 | ||||
| -rw-r--r-- | loader/net.h | 2 | ||||
| -rw-r--r-- | loader/nfsinstall.c | 6 | ||||
| -rw-r--r-- | loader/rpmextract.c | 2 | ||||
| -rw-r--r-- | loader/selinux.c | 2 | ||||
| -rw-r--r-- | loader/telnet.c | 2 | ||||
| -rw-r--r-- | loader/telnetd.c | 2 | ||||
| -rw-r--r-- | loader/urlinstall.c | 4 | ||||
| -rw-r--r-- | loader/urls.c | 2 | ||||
| -rw-r--r-- | loader/windows.c | 2 | ||||
| -rw-r--r-- | pyanaconda/Makefile.am | 2 | ||||
| -rw-r--r-- | pyanaconda/booty/Makefile.am (renamed from booty/Makefile.am) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/__init__.py (renamed from booty/__init__.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/alpha.py (renamed from booty/alpha.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/bootloaderInfo.py (renamed from booty/bootloaderInfo.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/checkbootloader.py (renamed from booty/checkbootloader.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/ia64.py (renamed from booty/ia64.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/lilo.py (renamed from booty/lilo.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/ppc.py (renamed from booty/ppc.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/s390.py (renamed from booty/s390.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/sparc.py (renamed from booty/sparc.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/util.py (renamed from booty/util.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/booty/x86.py (renamed from booty/x86.py) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/.gitignore (renamed from isys/.gitignore) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/Makefile.am (renamed from isys/Makefile.am) | 0 | ||||
| -rwxr-xr-x | pyanaconda/isys/__init__.py (renamed from isys/__init__.py) | 8 | ||||
| -rw-r--r-- | pyanaconda/isys/auditd.c (renamed from isys/auditd.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/auditd.h (renamed from isys/auditd.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/cpio.c (renamed from isys/cpio.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/cpio.h (renamed from isys/cpio.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/devices.c (renamed from isys/devices.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/devices.h (renamed from isys/devices.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/eddsupport.c (renamed from isys/eddsupport.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/eddsupport.h (renamed from isys/eddsupport.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/ethtool.c (renamed from isys/ethtool.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/ethtool.h (renamed from isys/ethtool.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/iface.c (renamed from isys/iface.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/iface.h (renamed from isys/iface.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/imount.c (renamed from isys/imount.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/imount.h (renamed from isys/imount.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/isofs.c (renamed from isys/isofs.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/isys.c (renamed from isys/isys.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/isys.h (renamed from isys/isys.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/lang.c (renamed from isys/lang.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/lang.h (renamed from isys/lang.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/linkdetect.c (renamed from isys/linkdetect.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/log.c (renamed from isys/log.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/log.h (renamed from isys/log.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/mem.c (renamed from isys/mem.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/mem.h (renamed from isys/mem.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/stubs.h (renamed from isys/stubs.h) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/uncpio.c (renamed from isys/uncpio.c) | 0 | ||||
| -rw-r--r-- | pyanaconda/isys/vio.c (renamed from isys/vio.c) | 0 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/kickstart_test/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/storage_test/devicelibs_test/Makefile.am | 3 | ||||
| -rw-r--r-- | utils/mapshdr.c | 2 | ||||
| -rw-r--r-- | utils/modlist.c | 2 | ||||
| -rw-r--r-- | utils/readmap.c | 2 |
79 files changed, 81 insertions, 72 deletions
diff --git a/Makefile.am b/Makefile.am index d4f1fd389..05aa5c707 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = isys loader gptsync booty pyanaconda data \ +SUBDIRS = pyanaconda loader gptsync data \ tests utils scripts docs po EXTRA_DIST = config.rpath COPYING \ diff --git a/configure.ac b/configure.ac index 34fc1c91c..1e1c4535b 100644 --- a/configure.ac +++ b/configure.ac @@ -254,13 +254,11 @@ AC_CONFIG_FILES([Makefile data/bootdisk/sparc/Makefile data/bootdisk/s390x/Makefile data/bootdisk/x86_64/Makefile - booty/Makefile data/command-stubs/Makefile docs/Makefile data/fonts/Makefile gptsync/Makefile pyanaconda/installclasses/Makefile - isys/Makefile pyanaconda/iw/Makefile data/liveinst/Makefile data/liveinst/console.apps/Makefile @@ -282,6 +280,8 @@ AC_CONFIG_FILES([Makefile po/Makefile.in scripts/Makefile pyanaconda/Makefile + pyanaconda/booty/Makefile + pyanaconda/isys/Makefile pyanaconda/storage/Makefile pyanaconda/storage/devicelibs/Makefile pyanaconda/storage/formats/Makefile diff --git a/loader/Makefile.am b/loader/Makefile.am index 691095284..ec65d9720 100644 --- a/loader/Makefile.am +++ b/loader/Makefile.am @@ -47,7 +47,7 @@ loader_CFLAGS = $(COMMON_CFLAGS) $(GLIB_CFLAGS) $(LIBNM_GLIB_CFLAGS) \ loader_LDADD = $(NEWT_LIBS) $(GLIB_LIBS) $(LIBNL_LIBS) \ $(LIBNM_GLIB_LIBS) $(CHECKISOMD5_LIBS) \ $(LIBCURL_LIBS) $(LIBARCHIVE_LIBS) $(RPM_LIBS) \ - $(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la -lm + $(ISCSI_LIBS) $(top_srcdir)/pyanaconda/isys/libisys.la -lm loader_SOURCES = loader.c copy.c moduleinfo.c loadermisc.c \ modules.c windows.c lang.c kbd.c driverdisk.c \ selinux.c mediacheck.c kickstart.c driverselect.c \ diff --git a/loader/cdinstall.c b/loader/cdinstall.c index a8964068f..bde1bffe6 100644 --- a/loader/cdinstall.c +++ b/loader/cdinstall.c @@ -56,10 +56,10 @@ #include "mediacheck.h" #include "windows.h" -#include "../isys/imount.h" -#include "../isys/isys.h" -#include "../isys/log.h" -#include "../isys/mem.h" +#include "../pyanaconda/isys/imount.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/log.h" +#include "../pyanaconda/isys/mem.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/dirbrowser.c b/loader/dirbrowser.c index 9199850f4..3783ea332 100644 --- a/loader/dirbrowser.c +++ b/loader/dirbrowser.c @@ -31,7 +31,7 @@ #include <sys/stat.h> #ifndef STANDALONE -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "loader.h" #include "loadermisc.h" diff --git a/loader/driverdisk.c b/loader/driverdisk.c index 1072f4694..05456685c 100644 --- a/loader/driverdisk.c +++ b/loader/driverdisk.c @@ -55,10 +55,10 @@ #include "rpmextract.h" -#include "../isys/isys.h" -#include "../isys/imount.h" -#include "../isys/eddsupport.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/imount.h" +#include "../pyanaconda/isys/eddsupport.h" +#include "../pyanaconda/isys/log.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/driverselect.c b/loader/driverselect.c index 85b777b3f..a2332d7ae 100644 --- a/loader/driverselect.c +++ b/loader/driverselect.c @@ -28,7 +28,7 @@ #include <unistd.h> #include <errno.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "modules.h" #include "moduleinfo.h" diff --git a/loader/fwloader.c b/loader/fwloader.c index 5ad1d8ea5..e6ed4c7e5 100644 --- a/loader/fwloader.c +++ b/loader/fwloader.c @@ -41,7 +41,7 @@ #include <asm/types.h> #include <linux/netlink.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "loader.h" #include "fwloader.h" diff --git a/loader/getparts.c b/loader/getparts.c index c60dc8367..c4544d796 100644 --- a/loader/getparts.c +++ b/loader/getparts.c @@ -29,7 +29,7 @@ #include <ctype.h> #include <string.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" /* see if this is a partition name or not */ static int isPartitionName(char *pname) { diff --git a/loader/hardware.c b/loader/hardware.c index ad20ed5b5..272846b6a 100644 --- a/loader/hardware.c +++ b/loader/hardware.c @@ -39,8 +39,8 @@ /* FIXME: for turning off dma */ #include <sys/ioctl.h> #include <linux/hdreg.h> -#include "../isys/isys.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/log.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/hdinstall.c b/loader/hdinstall.c index cf5b79c84..5712de048 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c @@ -46,10 +46,10 @@ #include "cdinstall.h" #include "windows.h" -#include "../isys/imount.h" -#include "../isys/isys.h" -#include "../isys/eddsupport.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/imount.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/eddsupport.h" +#include "../pyanaconda/isys/log.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/kbd.c b/loader/kbd.c index b94f9200f..c943be666 100644 --- a/loader/kbd.c +++ b/loader/kbd.c @@ -34,9 +34,9 @@ #include "lang.h" #include "windows.h" -#include "../isys/stubs.h" -#include "../isys/lang.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/stubs.h" +#include "../pyanaconda/isys/lang.h" +#include "../pyanaconda/isys/log.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/kickstart.c b/loader/kickstart.c index 26c4aab2f..4c3dc260d 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -50,9 +50,9 @@ #include "cdinstall.h" #include "hdinstall.h" -#include "../isys/imount.h" -#include "../isys/isys.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/imount.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/log.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/lang.c b/loader/lang.c index 31749fc3b..0bb351e15 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -40,11 +40,11 @@ #include "loadermisc.h" #include "windows.h" -#include "../isys/stubs.h" -#include "../isys/cpio.h" -#include "../isys/lang.h" -#include "../isys/isys.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/stubs.h" +#include "../pyanaconda/isys/cpio.h" +#include "../pyanaconda/isys/lang.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/log.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/loader.c b/loader/loader.c index edbb67b39..bd03ce101 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -93,13 +93,13 @@ #include <selinux/selinux.h> #include "selinux.h" -#include "../isys/imount.h" -#include "../isys/isys.h" -#include "../isys/stubs.h" -#include "../isys/lang.h" -#include "../isys/eddsupport.h" -#include "../isys/log.h" -#include "../isys/mem.h" +#include "../pyanaconda/isys/imount.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/stubs.h" +#include "../pyanaconda/isys/lang.h" +#include "../pyanaconda/isys/eddsupport.h" +#include "../pyanaconda/isys/log.h" +#include "../pyanaconda/isys/mem.h" /* maximum number of extra arguments that can be passed to the second stage */ #define MAX_EXTRA_ARGS 128 diff --git a/loader/loader.h b/loader/loader.h index bb3809801..8fd958d54 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -117,7 +117,7 @@ char * getProductPath(void); char * getProductArch(void); #include "moduleinfo.h" -#include "../isys/devices.h" +#include "../pyanaconda/isys/devices.h" /* JKFIXME: I don't like all of the _set attribs, but without them, * we can't tell if it was explicitly set by kickstart/cmdline or * if we just got it going through the install. */ diff --git a/loader/loadermisc.c b/loader/loadermisc.c index bf857b436..d0ff3d408 100644 --- a/loader/loadermisc.c +++ b/loader/loadermisc.c @@ -35,7 +35,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "windows.h" int copyFileFd(int infd, char * dest, progressCB pbcb, diff --git a/loader/mediacheck.c b/loader/mediacheck.c index 4bec1c845..c4c1aa058 100644 --- a/loader/mediacheck.c +++ b/loader/mediacheck.c @@ -30,7 +30,7 @@ #include <newt.h> #include <libcheckisomd5.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "lang.h" #include "windows.h" diff --git a/loader/method.c b/loader/method.c index 3ca669fa9..e3c5cdf71 100644 --- a/loader/method.c +++ b/loader/method.c @@ -45,10 +45,10 @@ #include "mediacheck.h" #include "method.h" -#include "../isys/imount.h" -#include "../isys/isys.h" -#include "../isys/cpio.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/imount.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/cpio.h" +#include "../pyanaconda/isys/log.h" #include "devt.h" diff --git a/loader/modules.c b/loader/modules.c index b4080929f..9635be649 100644 --- a/loader/modules.c +++ b/loader/modules.c @@ -41,7 +41,7 @@ #include <glib/gprintf.h> #include <assert.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "loader.h" #include "modules.h" diff --git a/loader/net.c b/loader/net.c index 9b89f5586..424159b1d 100644 --- a/loader/net.c +++ b/loader/net.c @@ -41,10 +41,10 @@ #include <nm-client.h> #include <nm-device-wifi.h> -#include "../isys/isys.h" -#include "../isys/ethtool.h" -#include "../isys/iface.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/isys.h" +#include "../pyanaconda/isys/ethtool.h" +#include "../pyanaconda/isys/iface.h" +#include "../pyanaconda/isys/log.h" #include "lang.h" #include "loader.h" diff --git a/loader/net.h b/loader/net.h index 824508482..8cf12a03a 100644 --- a/loader/net.h +++ b/loader/net.h @@ -21,7 +21,7 @@ #define H_LOADER_NET #include <newt.h> -#include "../isys/iface.h" +#include "../pyanaconda/isys/iface.h" #include "loader.h" #define DHCP_METHOD_STR _("Dynamic IP configuration (DHCP)") diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index d1a0a51ee..62052ee3c 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -51,9 +51,9 @@ #include "cdinstall.h" #include "windows.h" -#include "../isys/imount.h" -#include "../isys/iface.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/imount.h" +#include "../pyanaconda/isys/iface.h" +#include "../pyanaconda/isys/log.h" /* boot flags */ extern uint64_t flags; diff --git a/loader/rpmextract.c b/loader/rpmextract.c index 72501c6cf..de803b819 100644 --- a/loader/rpmextract.c +++ b/loader/rpmextract.c @@ -39,7 +39,7 @@ #include "loader.h" #include "rpmextract.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" /* * internal structure to pass to libarchive callbacks diff --git a/loader/selinux.c b/loader/selinux.c index 66bfe4d0a..0d17cb0d7 100644 --- a/loader/selinux.c +++ b/loader/selinux.c @@ -32,7 +32,7 @@ #include "loader.h" #include "loadermisc.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" int loadpolicy() { int pid, status; diff --git a/loader/telnet.c b/loader/telnet.c index 3c123aeda..9f9a0f595 100644 --- a/loader/telnet.c +++ b/loader/telnet.c @@ -27,7 +27,7 @@ #include <unistd.h> #include "telnet.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #define IAC "\xff" #define DONT "\xfe" diff --git a/loader/telnetd.c b/loader/telnetd.c index 219df7865..e4730bb4d 100644 --- a/loader/telnetd.c +++ b/loader/telnetd.c @@ -36,7 +36,7 @@ #include <sys/types.h> #include <unistd.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "lang.h" #include "loader.h" diff --git a/loader/urlinstall.c b/loader/urlinstall.c index 54d1398d8..a56e9580e 100644 --- a/loader/urlinstall.c +++ b/loader/urlinstall.c @@ -31,8 +31,8 @@ #include <errno.h> #include <glib.h> -#include "../isys/iface.h" -#include "../isys/log.h" +#include "../pyanaconda/isys/iface.h" +#include "../pyanaconda/isys/log.h" #include "copy.h" #include "kickstart.h" diff --git a/loader/urls.c b/loader/urls.c index c64703c07..f0a086f99 100644 --- a/loader/urls.c +++ b/loader/urls.c @@ -39,7 +39,7 @@ #include <errno.h> #include <curl/curl.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "lang.h" #include "loader.h" diff --git a/loader/windows.c b/loader/windows.c index 51b00dbbe..ccfb39114 100644 --- a/loader/windows.c +++ b/loader/windows.c @@ -31,7 +31,7 @@ #include <stdarg.h> #include <math.h> -#include "../isys/log.h" +#include "../pyanaconda/isys/log.h" #include "windows.h" diff --git a/pyanaconda/Makefile.am b/pyanaconda/Makefile.am index 0b9df7797..707adcdc5 100644 --- a/pyanaconda/Makefile.am +++ b/pyanaconda/Makefile.am @@ -17,7 +17,7 @@ # # Author: Martin Sivak <msivak@redhat.com> -SUBDIRS = installclasses iw textw storage +SUBDIRS = booty installclasses isys iw textw storage MAINTAINERCLEANFILES = Makefile.in diff --git a/booty/Makefile.am b/pyanaconda/booty/Makefile.am index 8d03ee0d7..8d03ee0d7 100644 --- a/booty/Makefile.am +++ b/pyanaconda/booty/Makefile.am diff --git a/booty/__init__.py b/pyanaconda/booty/__init__.py index defff9a7b..defff9a7b 100644 --- a/booty/__init__.py +++ b/pyanaconda/booty/__init__.py diff --git a/booty/alpha.py b/pyanaconda/booty/alpha.py index c7bd6e93e..c7bd6e93e 100644 --- a/booty/alpha.py +++ b/pyanaconda/booty/alpha.py diff --git a/booty/bootloaderInfo.py b/pyanaconda/booty/bootloaderInfo.py index f710a4e69..f710a4e69 100644 --- a/booty/bootloaderInfo.py +++ b/pyanaconda/booty/bootloaderInfo.py diff --git a/booty/checkbootloader.py b/pyanaconda/booty/checkbootloader.py index 182e6c158..182e6c158 100644 --- a/booty/checkbootloader.py +++ b/pyanaconda/booty/checkbootloader.py diff --git a/booty/ia64.py b/pyanaconda/booty/ia64.py index 796ed5c06..796ed5c06 100644 --- a/booty/ia64.py +++ b/pyanaconda/booty/ia64.py diff --git a/booty/lilo.py b/pyanaconda/booty/lilo.py index dc2328e63..dc2328e63 100644 --- a/booty/lilo.py +++ b/pyanaconda/booty/lilo.py diff --git a/booty/ppc.py b/pyanaconda/booty/ppc.py index c47315693..c47315693 100644 --- a/booty/ppc.py +++ b/pyanaconda/booty/ppc.py diff --git a/booty/s390.py b/pyanaconda/booty/s390.py index 736676e16..736676e16 100644 --- a/booty/s390.py +++ b/pyanaconda/booty/s390.py diff --git a/booty/sparc.py b/pyanaconda/booty/sparc.py index aad3b0084..aad3b0084 100644 --- a/booty/sparc.py +++ b/pyanaconda/booty/sparc.py diff --git a/booty/util.py b/pyanaconda/booty/util.py index ab33ae126..ab33ae126 100644 --- a/booty/util.py +++ b/pyanaconda/booty/util.py diff --git a/booty/x86.py b/pyanaconda/booty/x86.py index 10332de1a..10332de1a 100644 --- a/booty/x86.py +++ b/pyanaconda/booty/x86.py diff --git a/isys/.gitignore b/pyanaconda/isys/.gitignore index 0b04e8131..0b04e8131 100644 --- a/isys/.gitignore +++ b/pyanaconda/isys/.gitignore diff --git a/isys/Makefile.am b/pyanaconda/isys/Makefile.am index 2b3130ceb..2b3130ceb 100644 --- a/isys/Makefile.am +++ b/pyanaconda/isys/Makefile.am diff --git a/isys/__init__.py b/pyanaconda/isys/__init__.py index b043a5bda..470c52d04 100755 --- a/isys/__init__.py +++ b/pyanaconda/isys/__init__.py @@ -22,7 +22,13 @@ # Jeremy Katz <katzj@redhat.com> # -from pyanaconda import _isys +try: + from pyanaconda import _isys +except ImportError: + # We're running in some sort of testing mode, in which case we can fix + # up PYTHONPATH and just do this basic import. + import _isys + import string import os import os.path diff --git a/isys/auditd.c b/pyanaconda/isys/auditd.c index 2ca6d04f4..2ca6d04f4 100644 --- a/isys/auditd.c +++ b/pyanaconda/isys/auditd.c diff --git a/isys/auditd.h b/pyanaconda/isys/auditd.h index 55ec5ceae..55ec5ceae 100644 --- a/isys/auditd.h +++ b/pyanaconda/isys/auditd.h diff --git a/isys/cpio.c b/pyanaconda/isys/cpio.c index fd836052a..fd836052a 100644 --- a/isys/cpio.c +++ b/pyanaconda/isys/cpio.c diff --git a/isys/cpio.h b/pyanaconda/isys/cpio.h index 4cbb7c0ea..4cbb7c0ea 100644 --- a/isys/cpio.h +++ b/pyanaconda/isys/cpio.h diff --git a/isys/devices.c b/pyanaconda/isys/devices.c index 53130d128..53130d128 100644 --- a/isys/devices.c +++ b/pyanaconda/isys/devices.c diff --git a/isys/devices.h b/pyanaconda/isys/devices.h index 9428a7725..9428a7725 100644 --- a/isys/devices.h +++ b/pyanaconda/isys/devices.h diff --git a/isys/eddsupport.c b/pyanaconda/isys/eddsupport.c index c50278e3f..c50278e3f 100644 --- a/isys/eddsupport.c +++ b/pyanaconda/isys/eddsupport.c diff --git a/isys/eddsupport.h b/pyanaconda/isys/eddsupport.h index 77fc4c442..77fc4c442 100644 --- a/isys/eddsupport.h +++ b/pyanaconda/isys/eddsupport.h diff --git a/isys/ethtool.c b/pyanaconda/isys/ethtool.c index 871f1d4fc..871f1d4fc 100644 --- a/isys/ethtool.c +++ b/pyanaconda/isys/ethtool.c diff --git a/isys/ethtool.h b/pyanaconda/isys/ethtool.h index 57b4ffcda..57b4ffcda 100644 --- a/isys/ethtool.h +++ b/pyanaconda/isys/ethtool.h diff --git a/isys/iface.c b/pyanaconda/isys/iface.c index afdc59fdc..afdc59fdc 100644 --- a/isys/iface.c +++ b/pyanaconda/isys/iface.c diff --git a/isys/iface.h b/pyanaconda/isys/iface.h index b7eaa6f0e..b7eaa6f0e 100644 --- a/isys/iface.h +++ b/pyanaconda/isys/iface.h diff --git a/isys/imount.c b/pyanaconda/isys/imount.c index ed0f5a762..ed0f5a762 100644 --- a/isys/imount.c +++ b/pyanaconda/isys/imount.c diff --git a/isys/imount.h b/pyanaconda/isys/imount.h index d1b7cf312..d1b7cf312 100644 --- a/isys/imount.h +++ b/pyanaconda/isys/imount.h diff --git a/isys/isofs.c b/pyanaconda/isys/isofs.c index bb5a44adb..bb5a44adb 100644 --- a/isys/isofs.c +++ b/pyanaconda/isys/isofs.c diff --git a/isys/isys.c b/pyanaconda/isys/isys.c index 3b7fe7329..3b7fe7329 100644 --- a/isys/isys.c +++ b/pyanaconda/isys/isys.c diff --git a/isys/isys.h b/pyanaconda/isys/isys.h index 980a872f4..980a872f4 100644 --- a/isys/isys.h +++ b/pyanaconda/isys/isys.h diff --git a/isys/lang.c b/pyanaconda/isys/lang.c index b6e2a36ee..b6e2a36ee 100644 --- a/isys/lang.c +++ b/pyanaconda/isys/lang.c diff --git a/isys/lang.h b/pyanaconda/isys/lang.h index a08adbdb0..a08adbdb0 100644 --- a/isys/lang.h +++ b/pyanaconda/isys/lang.h diff --git a/isys/linkdetect.c b/pyanaconda/isys/linkdetect.c index f97a29120..f97a29120 100644 --- a/isys/linkdetect.c +++ b/pyanaconda/isys/linkdetect.c diff --git a/isys/log.c b/pyanaconda/isys/log.c index 574d43627..574d43627 100644 --- a/isys/log.c +++ b/pyanaconda/isys/log.c diff --git a/isys/log.h b/pyanaconda/isys/log.h index 51de2de72..51de2de72 100644 --- a/isys/log.h +++ b/pyanaconda/isys/log.h diff --git a/isys/mem.c b/pyanaconda/isys/mem.c index 3003ba055..3003ba055 100644 --- a/isys/mem.c +++ b/pyanaconda/isys/mem.c diff --git a/isys/mem.h b/pyanaconda/isys/mem.h index 1a715d400..1a715d400 100644 --- a/isys/mem.h +++ b/pyanaconda/isys/mem.h diff --git a/isys/stubs.h b/pyanaconda/isys/stubs.h index 40ecb22ac..40ecb22ac 100644 --- a/isys/stubs.h +++ b/pyanaconda/isys/stubs.h diff --git a/isys/uncpio.c b/pyanaconda/isys/uncpio.c index 171eb6bc6..171eb6bc6 100644 --- a/isys/uncpio.c +++ b/pyanaconda/isys/uncpio.c diff --git a/isys/vio.c b/pyanaconda/isys/vio.c index 9b06a3eb8..9b06a3eb8 100644 --- a/isys/vio.c +++ b/pyanaconda/isys/vio.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 147c551dd..9a938c9f2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,6 +21,7 @@ SUBDIRS = mock kickstart_test storage_test regex MAINTAINERCLEANFILES = Makefile.in -TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/isys:$(top_builddir)/pyanaconda +ANACDIR = $(top_builddir)/pyanaconda +TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR)/isys:$(ANACDIR) TESTS = fw_test.py diff --git a/tests/kickstart_test/Makefile.am b/tests/kickstart_test/Makefile.am index 5f5d62636..1f7ec6abb 100644 --- a/tests/kickstart_test/Makefile.am +++ b/tests/kickstart_test/Makefile.am @@ -21,6 +21,7 @@ EXTRA_DIST = *.py MAINTAINERCLEANFILES = Makefile.in -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/pyanaconda:$(top_builddir) +ANACDIR = $(top_builddir)/pyanaconda +TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR):$(top_builddir) TESTS = commands_test.py diff --git a/tests/storage_test/devicelibs_test/Makefile.am b/tests/storage_test/devicelibs_test/Makefile.am index bb8efcfc4..c0fce1006 100644 --- a/tests/storage_test/devicelibs_test/Makefile.am +++ b/tests/storage_test/devicelibs_test/Makefile.am @@ -21,7 +21,8 @@ EXTRA_DIST = *.py MAINTAINERCLEANFILES = Makefile.in -TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/pyanaconda:$(top_builddir) +ANACDIR = $(top_builddir)/pyanaconda +TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR):$(top_builddir) TESTS = crypto_test.py \ lvm_test.py \ diff --git a/utils/mapshdr.c b/utils/mapshdr.c index f2209c756..2792ee7ad 100644 --- a/utils/mapshdr.c +++ b/utils/mapshdr.c @@ -24,7 +24,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "../isys/lang.h" +#include "../pyanaconda/isys/lang.h" int main(int argc, char ** argv) { struct kmapHeader h; diff --git a/utils/modlist.c b/utils/modlist.c index 7aff56792..2107ffd41 100644 --- a/utils/modlist.c +++ b/utils/modlist.c @@ -22,7 +22,7 @@ #include <string.h> #include <glib.h> -#include "../isys/isys.h" +#include "../pyanaconda/isys/isys.h" #include "moduleinfo.h" int main(int argc, char ** argv) { diff --git a/utils/readmap.c b/utils/readmap.c index 7d6563639..035158cad 100644 --- a/utils/readmap.c +++ b/utils/readmap.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <unistd.h> -#include "../isys/lang.h" +#include "../pyanaconda/isys/lang.h" int main(int argc, char ** argv) { int console; |