diff options
Diffstat (limited to 'install')
| -rw-r--r-- | install/Makefile.am | 3 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/install/Makefile.am b/install/Makefile.am index 4d24d072..5670f9bd 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -19,11 +19,14 @@ SUBDIRS = \ install-exec-local: mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore + mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade + chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade mkdir -p $(DESTDIR)$(localstatedir)/cache/ipa/sessions chmod 700 $(DESTDIR)$(localstatedir)/cache/ipa/sessions uninstall-local: -rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore + -rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade -rmdir $(DESTDIR)$(localstatedir)/lib/ipa -rmdir $(DESTDIR)$(localstatedir)/cache/ipa/sessions -rmdir $(DESTDIR)$(localstatedir)/cache/ipa diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 871bfd52..61c2b9d8 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -48,6 +48,7 @@ from ipaserver.install import ntpinstance from ipaserver.install import certs from ipaserver.install import cainstance from ipaserver.install import memcacheinstance +from ipaserver.install import sysupgrade from ipaserver.install import service, installutils from ipapython import version @@ -495,6 +496,9 @@ def uninstall(): except CalledProcessError, e: print >>sys.stderr, "Failed to set this machine hostname back to %s (%s)." % (old_hostname, str(e)) + # remove upgrade state file + sysupgrade.remove_upgrade_file() + if fstore.has_files(): root_logger.error('Some files have not been restored, see /var/lib/ipa/sysrestore/sysrestore.index') has_state = False |