diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-11-13 10:06:00 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-11-13 10:06:00 -0500 |
| commit | ec037d4f0a98647eb8e5d3a39a221be0fe9fd15f (patch) | |
| tree | 071356af1c65e57ab680414e93538d5fb37469f3 /Makefile | |
| parent | 684c5b291bd76b67be2a109499af2cc8ffe013c4 (diff) | |
| download | cobbler-ec037d4f0a98647eb8e5d3a39a221be0fe9fd15f.tar.gz cobbler-ec037d4f0a98647eb8e5d3a39a221be0fe9fd15f.tar.xz cobbler-ec037d4f0a98647eb8e5d3a39a221be0fe9fd15f.zip | |
Patch from Peter Vreman to makefile savestate/restorestate, plus some changes of my own to save the cobbler objects.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 41 |
1 files changed, 21 insertions, 20 deletions
@@ -1,5 +1,8 @@ #MESSAGESPOT=po/messages.pot +prefix=devinstall +statepath=/tmp/cobbler_settings/$(prefix) + all: clean rpms clean: @@ -17,14 +20,12 @@ manpage: pod2html ./docs/cobbler.pod > ./docs/cobbler.html test: - prefix=test - export prefix - make savestate + make savestate prefix=test make rpms make install make eraseconfig -(make nosetests) - make restorestate + make restorestate prefix=test nosetests: #nosetests tests -w cobbler --with-coverage --cover-package=cobbler --cover-erase --quiet | tee test.log @@ -37,34 +38,34 @@ install: manpage updatewui python setup.py install -f devinstall: - prefix=devinstall make savestate make install make restorestate savestate: - path=/tmp/cobbler_settings/$(prefix) - -cp /etc/cobbler/settings $(path)/settings - -cp /etc/cobbler/modules.conf $(path)/modules.conf - -cp /etc/httpd/conf.d/cobbler.conf $(path)http.conf - -cp /etc/cobbler/acls.conf $(path)/acls.conf - -cp /etc/cobbler/users.conf $(path)/users.conf - -cp /etc/cobbler/users.digest $(path)/users.digest + mkdir -p $(statepath) + cp -a /var/lib/cobbler/config $(statepath) + cp /etc/cobbler/settings $(statepath)/settings + cp /etc/cobbler/modules.conf $(statepath)/modules.conf + cp /etc/httpd/conf.d/cobbler.conf $(statepath)/http.conf + cp /etc/cobbler/acls.conf $(statepath)/acls.conf + cp /etc/cobbler/users.conf $(statepath)/users.conf + cp /etc/cobbler/users.digest $(statepath)/users.digest restorestate: - path=/tmp/cobbler_settings/$(prefix) - -cp $(path)/settings /etc/cobbler/settings - -cp $(path)/modules.conf /etc/cobbler/modules.conf - -cp $(path)/users.conf /etc/cobbler/users.conf - -cp $(path)/acls.conf /etc/cobbler/acls.conf - -cp $(path)/users.digest /etc/cobbler/users.digest - -cp $(path)/http.conf /etc/httpd/conf.d/cobbler.conf + cp -a $(statepath)/config /var/lib/cobbler + cp $(statepath)/settings /etc/cobbler/settings + cp $(statepath)/modules.conf /etc/cobbler/modules.conf + cp $(statepath)/users.conf /etc/cobbler/users.conf + cp $(statepath)/acls.conf /etc/cobbler/acls.conf + cp $(statepath)/users.digest /etc/cobbler/users.digest + cp $(statepath)/http.conf /etc/httpd/conf.d/cobbler.conf find /var/lib/cobbler/triggers | xargs chmod +x chown -R apache /var/www/cobbler chmod -R +x /var/www/cobbler/web chmod -R +x /var/www/cobbler/svc - #-rm -rf $(path) + #-[ "$(statepath)" != "/" ] && rm -rf $(statepath) completion: python mkbash.py |