diff options
| author | Karl MacMillan <kmacmill@redhat.com> | 2007-10-09 16:25:38 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmill@redhat.com> | 2007-10-09 16:25:38 -0400 |
| commit | d2a19b200912fe4a78211a3d6212b143ece5e064 (patch) | |
| tree | f6a07686c2a4b4cb82d288d8ce8a14a454d9776e /ipa-server/ipa-install | |
| parent | aaa992b74405f41e2f51d1fb2946c57303c3de07 (diff) | |
| download | freeipa-d2a19b200912fe4a78211a3d6212b143ece5e064.tar.gz freeipa-d2a19b200912fe4a78211a3d6212b143ece5e064.tar.xz freeipa-d2a19b200912fe4a78211a3d6212b143ece5e064.zip | |
Karl MacMillan wrote:
> > This largish patch makes the build and installation work on 64bit
> > machines. The only catch here is that to get a 64bit build you need to
> > set LIBDIR on make:
> >
> > make install LIBDIR=/usr/lib64
> >
> > The spec file does this correctly. I couldn't find any reliable way to
> > guess this that works both on real systems and in the almost entirely
> > empty rpm build root (you can't, for example, check for the existence
> > of /usr/lib64).
Diffstat (limited to 'ipa-server/ipa-install')
| -rw-r--r-- | ipa-server/ipa-install/Makefile | 11 | ||||
| -rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 12 | ||||
| -rw-r--r-- | ipa-server/ipa-install/share/Makefile | 9 |
3 files changed, 17 insertions, 15 deletions
diff --git a/ipa-server/ipa-install/Makefile b/ipa-server/ipa-install/Makefile index 40a39b576..46be2c721 100644 --- a/ipa-server/ipa-install/Makefile +++ b/ipa-server/ipa-install/Makefile @@ -1,5 +1,4 @@ -SHAREDIR=$(DESTDIR)/usr/share/ipa -SBINDIR=$(DESTDIR)/usr/sbin +include ../Makefile.common all: ; @@ -7,9 +6,13 @@ install: -mkdir $(SBINDIR) install -m 755 ipa-server-install $(SBINDIR) install -m 755 ipa-server-setupssl $(SHAREDIR) - $(MAKE) -C share $@ + + -mkdir -p $(SHAREDIR) + install -m 644 share/*.ldif $(SHAREDIR) + install -m 644 share/*.template $(SHAREDIR) + $(MAKE) -C test $@ clean: - $(MAKE) -C share $@ rm -f *~ *.pyc + rm -f share/*~ diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index 462774ba2..34666af55 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -128,10 +128,15 @@ def check_existing_installation(): yesno = raw_input("Do you wish to remove it and create a new one? [no]: ") if not yesno or yesno.lower()[0] != "y": sys.exit(1) + + try: + run(["/sbin/service", "dirsrv", "stop"]) + except: + pass for d in dirs: serverid = os.path.basename(d).split("slapd-", 1)[1] if serverid: - erase_ds_instance_data (serverid) + erase_ds_instance_data(serverid) def get_fqdn(): fqdn = "" @@ -531,4 +536,7 @@ def main(): return 0 -main() +try: + main() +except Exception, e: + print "Unexpected error - see ipaserver-install.log for details:\n %s" % str(e) diff --git a/ipa-server/ipa-install/share/Makefile b/ipa-server/ipa-install/share/Makefile index 380480bcf..e69de29bb 100644 --- a/ipa-server/ipa-install/share/Makefile +++ b/ipa-server/ipa-install/share/Makefile @@ -1,9 +0,0 @@ -SHAREDIR = $(DESTDIR)/usr/share/ipa - -install: - -mkdir -p $(SHAREDIR) - install -m 644 *.ldif $(SHAREDIR) - install -m 644 *.template $(SHAREDIR) - -clean: - rm -f *~ |