Merge branch 'master' into debian
This commit is contained in:
commit
0c43d05b5c
10
bkctld
10
bkctld
|
@ -252,7 +252,7 @@ sub_init() {
|
||||||
rootdir_inode=$(stat --format=%i "${rootdir}")
|
rootdir_inode=$(stat --format=%i "${rootdir}")
|
||||||
jaildir_inode=$(stat --format=%i "${JAILDIR}")
|
jaildir_inode=$(stat --format=%i "${JAILDIR}")
|
||||||
if [ "${rootdir_inode}" -eq 256 ] || [ "${jaildir_inode}" -eq 256 ]; then
|
if [ "${rootdir_inode}" -eq 256 ] || [ "${jaildir_inode}" -eq 256 ]; then
|
||||||
/sbin/btrfs subvolume create "${JAILDIR}/${jail}"
|
/bin/btrfs subvolume create "${JAILDIR}/${jail}"
|
||||||
else
|
else
|
||||||
mkdir -p "${JAILDIR}/${jail}"
|
mkdir -p "${JAILDIR}/${jail}"
|
||||||
fi
|
fi
|
||||||
|
@ -284,7 +284,7 @@ sub_remove() {
|
||||||
rm -f "${CONFDIR}/${jail}"
|
rm -f "${CONFDIR}/${jail}"
|
||||||
jail_inode=$(stat --format=%i "${JAILDIR}/${jail}")
|
jail_inode=$(stat --format=%i "${JAILDIR}/${jail}")
|
||||||
if [ "${jail_inode}" -eq 256 ]; then
|
if [ "${jail_inode}" -eq 256 ]; then
|
||||||
/sbin/btrfs subvolume delete "${JAILDIR}/${jail}" | debug
|
/bin/btrfs subvolume delete "${JAILDIR}/${jail}" | debug
|
||||||
else
|
else
|
||||||
rm -rf "${JAILDIR}/${jail}" | debug
|
rm -rf "${JAILDIR}/${jail}" | debug
|
||||||
fi
|
fi
|
||||||
|
@ -293,7 +293,7 @@ sub_remove() {
|
||||||
for inc in ${incs}; do
|
for inc in ${incs}; do
|
||||||
inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${inc}")
|
inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${inc}")
|
||||||
if [ "${inc_inode}" -eq 256 ]; then
|
if [ "${inc_inode}" -eq 256 ]; then
|
||||||
/sbin/btrfs subvolume delete "${INCDIR}/${jail}/${inc}" | debug
|
/bin/btrfs subvolume delete "${INCDIR}/${jail}/${inc}" | debug
|
||||||
else
|
else
|
||||||
warning "You need to purge ${INCDIR}/${jail}/${inc} manually !"
|
warning "You need to purge ${INCDIR}/${jail}/${inc} manually !"
|
||||||
fi
|
fi
|
||||||
|
@ -417,7 +417,7 @@ sub_inc() {
|
||||||
start=$(date +"%H:%M:%S")
|
start=$(date +"%H:%M:%S")
|
||||||
jail_inode=$(stat --format=%i "${JAILDIR}/${jail}")
|
jail_inode=$(stat --format=%i "${JAILDIR}/${jail}")
|
||||||
if [ "$jail_inode" -eq 256 ]; then
|
if [ "$jail_inode" -eq 256 ]; then
|
||||||
/sbin/btrfs subvolume snapshot -r "${JAILDIR}/${jail}" "${inc}" | debug
|
/bin/btrfs subvolume snapshot -r "${JAILDIR}/${jail}" "${inc}" | debug
|
||||||
else
|
else
|
||||||
cp -alx "${JAILDIR}/${jail}/" "${inc}" | debug
|
cp -alx "${JAILDIR}/${jail}/" "${inc}" | debug
|
||||||
fi
|
fi
|
||||||
|
@ -457,7 +457,7 @@ sub_rm() {
|
||||||
start=$(date +"%H:%M:%S")
|
start=$(date +"%H:%M:%S")
|
||||||
inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${j}")
|
inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${j}")
|
||||||
if [ "${inc_inode}" -eq 256 ]; then
|
if [ "${inc_inode}" -eq 256 ]; then
|
||||||
/sbin/btrfs subvolume delete "${INCDIR}/${jail}/${j}" | debug
|
/bin/btrfs subvolume delete "${INCDIR}/${jail}/${j}" | debug
|
||||||
else
|
else
|
||||||
cd "${INCDIR}/${jail}"
|
cd "${INCDIR}/${jail}"
|
||||||
rsync -a --delete "${empty}/" "${j}/"
|
rsync -a --delete "${empty}/" "${j}/"
|
||||||
|
|
Loading…
Reference in a new issue