Merge branch 'master' into dev

This commit is contained in:
Benoît S. 2014-01-30 15:00:59 +01:00
commit 2283f283f8
3 changed files with 4 additions and 2 deletions

View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# Set-up and configure an OpenSSH chroot. # Set-up and configure an OpenSSH chroot.
BACKUP_PATH='/backup/jails' BACKUP_PATH='/backup/jails'
@ -129,4 +129,4 @@ cat <<EOT >/etc/evobackup/conf.d/incs/${jail}
+%Y-%m-01.-1month +%Y-%m-01.-1month
EOT EOT
echo -n "Done. OpenSSH chroot added! Restart evobackup service." echo "Done. OpenSSH chroot added! Restart evobackup service."

View file

View file

@ -17,6 +17,7 @@ case "$1" in
for jail in ${BACKUP_PATH}/jails/*; do for jail in ${BACKUP_PATH}/jails/*; do
mount -t proc proc-chroot ${jail}/proc/ mount -t proc proc-chroot ${jail}/proc/
mount -t devtmpfs udev ${jail}/dev/ mount -t devtmpfs udev ${jail}/dev/
mount -t devpts devpts ${jail}/dev/pts
chroot ${jail} /usr/sbin/sshd > /dev/null chroot ${jail} /usr/sbin/sshd > /dev/null
done done
;; ;;
@ -25,6 +26,7 @@ case "$1" in
for jail in ${BACKUP_PATH}/jails/*; do for jail in ${BACKUP_PATH}/jails/*; do
umount ${jail}/proc/ umount ${jail}/proc/
umount ${jail}/dev/pts/ umount ${jail}/dev/pts/
umount ${jail}/dev
kill $(chroot $jail cat /var/run/sshd.pid) kill $(chroot $jail cat /var/run/sshd.pid)
done done
;; ;;