diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-12-23 13:32:57 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2010-04-06 13:14:02 -0400 |
| commit | 2a33a6c6633d30d3aec4f67b8f28a7a838019680 (patch) | |
| tree | 62235ff17efc86f4076fa34c2042c8eee53e59b1 /command-stubs | |
| parent | adc4db9b60199cccc8c6319f5560c71147c85c93 (diff) | |
| download | anaconda-2a33a6c6633d30d3aec4f67b8f28a7a838019680.tar.gz anaconda-2a33a6c6633d30d3aec4f67b8f28a7a838019680.tar.xz anaconda-2a33a6c6633d30d3aec4f67b8f28a7a838019680.zip | |
Adjust command stubs to use new anaconda module location.
Diffstat (limited to 'command-stubs')
| -rw-r--r-- | command-stubs/Makefile.am | 2 | ||||
| -rwxr-xr-x | command-stubs/loadkeys-stub | 8 | ||||
| -rwxr-xr-x | command-stubs/losetup-stub | 8 | ||||
| -rwxr-xr-x | command-stubs/mknod-stub | 8 | ||||
| -rwxr-xr-x | command-stubs/raidstart-stub | 15 | ||||
| -rwxr-xr-x | command-stubs/raidstop-stub | 15 |
6 files changed, 7 insertions, 49 deletions
diff --git a/command-stubs/Makefile.am b/command-stubs/Makefile.am index 8c88ed7e8..cab5f8907 100644 --- a/command-stubs/Makefile.am +++ b/command-stubs/Makefile.am @@ -17,7 +17,7 @@ # # Author: David Cantrell <dcantrell@redhat.com> -commandstubsdir = $(libdir)/$(PACKAGE_NAME) +commandstubsdir = $(datadir)/$(PACKAGE_NAME) dist_commandstubs_SCRIPTS = *-stub MAINTAINERCLEANFILES = Makefile.in diff --git a/command-stubs/loadkeys-stub b/command-stubs/loadkeys-stub index 175271743..1fdc2c984 100755 --- a/command-stubs/loadkeys-stub +++ b/command-stubs/loadkeys-stub @@ -21,13 +21,7 @@ import os import sys -# for testing -if (os.path.exists('isys')): - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import isys +from pyanaconda import isys def usage(): print "usage: %s keymap" %(sys.argv[0],) diff --git a/command-stubs/losetup-stub b/command-stubs/losetup-stub index bf186a172..27c6bbc98 100755 --- a/command-stubs/losetup-stub +++ b/command-stubs/losetup-stub @@ -21,13 +21,7 @@ import os import sys -# for testing -if (os.path.exists('isys')): - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import isys +from pyanaconda import isys from sys import argv def usage(): diff --git a/command-stubs/mknod-stub b/command-stubs/mknod-stub index dd72aeb24..cafc221d2 100755 --- a/command-stubs/mknod-stub +++ b/command-stubs/mknod-stub @@ -18,12 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import sys, os -sys.path.append('/usr/lib/anaconda') -import isys -import string -import stat -import os +import stat, string, sys, os +from pyanaconda import isys def usage(): sys.stderr.write("Usage: %s <path> [b|c] <major> <minor>\n" %(sys.argv[0],)) diff --git a/command-stubs/raidstart-stub b/command-stubs/raidstart-stub index 2a0d8b323..691300685 100755 --- a/command-stubs/raidstart-stub +++ b/command-stubs/raidstart-stub @@ -21,20 +21,7 @@ import os import sys -# for testing -if (os.path.exists('rpmmodule')): - sys.path.append('rpmmodule') - sys.path.append('libfdisk') - sys.path.append('balkan') - sys.path.append('gnome-map') - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import anaconda_log -import fsset -import raid -import isys +from pyanaconda import anaconda_log, fsset, raid, isys from sys import argv if len(argv) != 2 or argv[1][:7] != "/dev/md": diff --git a/command-stubs/raidstop-stub b/command-stubs/raidstop-stub index 942c29e72..21f809dfe 100755 --- a/command-stubs/raidstop-stub +++ b/command-stubs/raidstop-stub @@ -21,20 +21,7 @@ import os import sys -# for testing -if (os.path.exists('rpmmodule')): - sys.path.append('rpmmodule') - sys.path.append('libfdisk') - sys.path.append('balkan') - sys.path.append('gnome-map') - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import anaconda_log -import fsset -import raid -import isys +from pyanaconda import anaconda_log, fsset, raid, isys from sys import argv if len(argv) != 2 or argv[1][:7] != "/dev/md": |