Detect btrfs command path instead of harcoding it
This commit is contained in:
parent
00e1569fd6
commit
44620c363a
11
bkctld
11
bkctld
|
@ -216,7 +216,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}
|
$BTRFS subvolume create ${JAILDIR}/${jail}
|
||||||
else
|
else
|
||||||
mkdir -p ${JAILDIR}/${jail}
|
mkdir -p ${JAILDIR}/${jail}
|
||||||
fi
|
fi
|
||||||
|
@ -261,7 +261,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}
|
$BTRFS subvolume delete ${JAILDIR}/${jail}
|
||||||
else
|
else
|
||||||
rm -rf ${JAILDIR}/${jail}
|
rm -rf ${JAILDIR}/${jail}
|
||||||
fi
|
fi
|
||||||
|
@ -270,7 +270,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}
|
$BTRFS subvolume delete ${INCDIR}/${jail}/${inc}
|
||||||
else
|
else
|
||||||
echo "You need to purge ${INCDIR}/${jail}/$inc manually !" >&2
|
echo "You need to purge ${INCDIR}/${jail}/$inc manually !" >&2
|
||||||
fi
|
fi
|
||||||
|
@ -421,7 +421,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 > /dev/null
|
$BTRFS subvolume snapshot -r ${JAILDIR}/${jail} $inc > /dev/null
|
||||||
else
|
else
|
||||||
cp -alx ${JAILDIR}/${jail}/ $inc
|
cp -alx ${JAILDIR}/${jail}/ $inc
|
||||||
fi
|
fi
|
||||||
|
@ -474,7 +474,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}" >/dev/null
|
$BTRFS subvolume delete "${INCDIR}/${jail}/${j}" >/dev/null
|
||||||
else
|
else
|
||||||
cd "${INCDIR}/$jail"
|
cd "${INCDIR}/$jail"
|
||||||
rsync -a --delete "$empty/" "$j/"
|
rsync -a --delete "$empty/" "$j/"
|
||||||
|
@ -527,6 +527,7 @@ main() {
|
||||||
[ -z "${SSHD_PID}" ] && SSHD_PID='/run/sshd.pid'
|
[ -z "${SSHD_PID}" ] && SSHD_PID='/run/sshd.pid'
|
||||||
[ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config'
|
[ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config'
|
||||||
[ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
|
[ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
|
||||||
|
BTRFS=$(which btrfs)
|
||||||
mkdir -p $CONFDIR $JAILDIR $INCDIR
|
mkdir -p $CONFDIR $JAILDIR $INCDIR
|
||||||
subcommand=$1
|
subcommand=$1
|
||||||
jail=$2
|
jail=$2
|
||||||
|
|
Loading…
Reference in a new issue