← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lxc/quantal-201205292108

« back to all changes in this revision

Viewing changes to debian/local/lxc-restore

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2012-04-26 15:18:35 UTC
  • mfrom: (3.1.41 sid)
  • Revision ID: package-import@ubuntu.com-20120426151835-3vz6kb4m90gb26js
Tags: 0.8.0~rc1-4ubuntu1
https://launchpad.net/bugs/988918
https://launchpad.net/bugs/981955
* Merge from unstable.  Remaining changes:
  - control:
    - update maintainer
    - Build-Depends: add dh-apparmor and libapparmor-dev
    - lxc Depends: add bridge-utils, dnsmasq-base, iptables, rsync
    - lxc Recommends: add cgroup-lite | cgroup-bin, openssl
    - lxc Suggests: add btrfs-tools, lvm2, qemu-user-static
    - lxc Conflicts: remove (cgroup-bin)
  - Add lxc-start-ephemeral and lxc-wait to debian/local
  - apparmor:
    - add lxc.apparmor, lxc-containers.apparmor,
      lxc-default.apparmor, and new lxc.apparmor.in
  - add debian/lxc.conf (default container creation config file)
  - debian/lxc.install.in:
    * add lxc-start-ephemeral
    * add debian/lxc.conf
    * skip lxc-debconf*
    * skip lxc-ls (Use upstream's)
  - debian/lxc*.install.in: use '*', not @DEB_HOST_MULTIARCH@
  - Use our own completely different lxc.postinst and lxc.postrm
  - remove lxc.templates
  - debian/rules:
    * add DEB_DH_INSTALLINIT_ARGS = --upstart-only
    * don't do debconf stuff
    * add debian/*.apparmor.in to files processed under
      override_dh_auto_clean
    * don't comment out ubuntu or busybox templates
    * do apparmor stuff and install our own lxc-wait under override_dh_install
    * install our upstart scripts in override_dh_installinit
  - add lxc.default, lxc.lxc-net.upstart, lxc.upstart under
    debian/

* patches kept:
  - 0013-lxc-create-use-default-config.patch (needed manual rebase)
  - 0030-ubuntu-template-fail.patch
  - 0031-ubuntu-template-resolvconf.patch
  - 0044-lxc-destroy-rm-autos
  - debian/patches/0045-fix-other-templates
  - debian/patches/0046-lxc-clone-change-hwaddr
  - debian/patches/0047-bindhome-check-shell
  - debian/patches/0049-ubuntu-template-sudo-and-cleanup
  - debian/patches/0050-clone-lvm-sizes
  - debian/patches/0052-ubuntu-bind-user-conflict
  - debian/patches/0053-lxc-start-pin-rootfs
  - debian/patches/0054-ubuntu-debug
  - debian/patches/0055-ubuntu-handle-badgrp
  - debian/patches/0056-dont-watch-utmp
  - debian/patches/0057-update-manpages
  - debian/patches/0058-fixup-ubuntu-cloud
  - debian/patches/0059-reenable-daily-cloudimg
  - debian/patches/0060-lxc-shutdown
  - debian/patches/0061-lxc-start-apparmor
  - debian/patches/0062-templates-relative-paths
  - debian/patches/0063-check-apparmor-enabled
  - debian/patches/0064-apparmor-mount-proc
  - debian/patches/0065-fix-bindhome-relpath
  - debian/patches/0066-confile-typo
  - debian/patches/0067-templates-lxc-profile
  - debian/patches/0068-fix-lxc-config-layout 
  - debian/patches/0069-ubuntu-cloud-fix
  - debian/patches/0070-templates-rmdir-dev-shm
  - debian/patches/0071-ubuntu-cloud-fix-image-extraction
  - debian/patches/0072-lxc-shutdown-help
  - debian/patches/0073-lxc-destroy-waits-before-destroy
  - mark all patches which have been forwarded as such, refresh all
* 0074-lxc-execute-find-init: lxc-init had moved.  Introduce a function in
  lxc-execute to go find it.  Otherwise lxc-execute for any older releases
  will fail.
* 0075-lxc-ls-bash: lxc-ls needs bash, not sh
* add debian/lxc.apparmor.in so DEB_HOST_MULTIARCH can be expanded
* 0076-fix-sprintfs:  - check return values for all sprintfs and snprintfs
  which could overflow (LP: #988918)
* 0077-execute-without-rootfs: let lxc-execute succeed with no rootfs
  (LP: #981955)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/local/lxc-restore
8
8
then
9
9
        shift
10
10
else
11
 
        echo "Usage: ${0} CONTAINER [BACKUP_NUMBER]"
 
11
#       echo "Usage: ${0} CONTAINER [BACKUP_NUMBER]"
 
12
        echo "Usage: ${0} CONTAINER"
12
13
        exit 1
13
14
fi
14
15
 
15
16
if [ ! -x "$(which rsync 2>/dev/null)" ]
16
17
then
17
 
        echo "E: rsync - no such file"
 
18
        echo "E: rsync - no such file" >&2
18
19
        exit 1
19
20
fi
20
21
 
21
22
if [ ! -x "$(which lxc-info 2>/dev/null)" ]
22
23
then
23
 
        echo "E: lxc-info - no such file"
 
24
        echo "E: lxc-info - no such file" >&2
24
25
        exit 1
25
26
fi
26
27
 
27
28
if ! lxc-info -n ${_CONTAINER} 2>&1 | grep -qs "STOPPED"
28
29
then
29
 
        echo "E: ${_CONTAINER} - not stopped"
 
30
        echo "E: ${_CONTAINER} - not stopped" >&2
30
31
        exit 1
31
32
fi
32
33
 
33
34
# FIXME: Assumption of /var/lib/lxc
34
35
if ls /var/lib/lxc/${_CONTAINER}/rootfs.backup* > /dev/null 2>&1
35
36
then
36
 
        if [ -n "${2}" ]
37
 
        then
38
 
                _BACKUP="${2}"
39
 
        else
40
 
                _BACKUP="1"
41
 
 
42
 
                while [ -e "/var/lib/lxc/${_CONTAINER}/rootfs.backup${_BACKUP}" ]
43
 
                do
44
 
                        _BACKUP="$((${_BACKUP} + 1))"
45
 
                done
46
 
 
47
 
                _BACKUP="$((${_BACKUP} - 1))"
48
 
        fi
 
37
#       if [ -n "${2}" ]
 
38
#       then
 
39
#               _BACKUP="${2}"
 
40
#       else
 
41
#               _BACKUP="1"
 
42
#
 
43
#               while [ -e "/var/lib/lxc/${_CONTAINER}/rootfs.backup${_BACKUP}" ]
 
44
#               do
 
45
#                       _BACKUP="$((${_BACKUP} + 1))"
 
46
#               done
 
47
#
 
48
#               _BACKUP="$((${_BACKUP} - 1))"
 
49
#       fi
49
50
 
50
51
        rsync -aPHv --delete --progress /var/lib/lxc/${_CONTAINER}/rootfs.backup${_BACKUP}/ /var/lib/lxc/${_CONTAINER}/rootfs
 
52
else
 
53
        echo "E: /var/lib/lxc/${_CONTAINER}/rootfs.backup* - no such directories" >&2
 
54
        exit 1
51
55
fi