Add missing system file to prevent makewhatis not found warning
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
======================
|
||||
Version Description
|
||||
|
||||
1.0.82......Add missing system file to prevent makewhatis not found warning.
|
||||
1.0.81......Update GUI pages to work with later bastille releases.
|
||||
1.0.80......Add checking for FreeBSD and HardenedBSD on upgrades.
|
||||
1.0.79......Don't set template for empty jails, include files for 12.2 release.
|
||||
|
||||
@@ -391,6 +391,11 @@ include_files()
|
||||
install -m 0555 ${SYSTEM_INCLUDE}/sum /usr/bin/sum
|
||||
fi
|
||||
fi
|
||||
if [ ! -f "/usr/bin/makewhatis" ]; then
|
||||
if [ -f "${SYSTEM_INCLUDE}/makewhatis" ]; then
|
||||
install -m 0555 ${SYSTEM_INCLUDE}/makewhatis /usr/bin/makewhatis
|
||||
fi
|
||||
fi
|
||||
else
|
||||
sysrc -f ${CWDIR}${EXTCONF} VNET_ENABLE="NO" >/dev/null 2>&1
|
||||
fi
|
||||
@@ -923,11 +928,18 @@ remove_addon()
|
||||
# as well as for the containers dirs/files.
|
||||
FILES="conf download freebsd-update gui locale-bastille log bastille-dist LICENSE README.md postinit CHANGELOG version bastille-init"
|
||||
for FILE in ${FILES}; do
|
||||
if [ -f "${CWDIR}/${file}" ] || [ -d "${CWDIR}/${file}" ]; then
|
||||
if [ -f "${CWDIR}/${FILE}" ] || [ -d "${CWDIR}/${FILE}" ]; then
|
||||
rm -rf ${CWDIR}/${FILE}
|
||||
fi
|
||||
done
|
||||
|
||||
BIN_FILES="/usr/local/bin/jib /usr/sbin/setfib /usr/bin/sum /usr/bin/makewhatis"
|
||||
for FILE in ${BIN_FILES}; do
|
||||
if [ -f "${FILE}" ]; then
|
||||
rm -rf ${FILE}
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Done!"
|
||||
echo "Please manually remove the Bastile Extension Command Script from the WebGUI."
|
||||
exit 0
|
||||
|
||||
BIN
conf/system/include/12.2/makewhatis
Executable file
BIN
conf/system/include/12.2/makewhatis
Executable file
Binary file not shown.
@@ -168,7 +168,7 @@ if($_POST):
|
||||
if ($_POST['update_base']):
|
||||
$cmd = ("/usr/local/sbin/bastille-init update '{$current_release}'");
|
||||
else:
|
||||
$cmd = ("/usr/local/sbin/bastille-init update '{$item}'");
|
||||
$cmd = ("/usr/local/sbin/bastille-init update '{$item}' && /usr/local/sbin/bastille-init install '{$item}'");
|
||||
endif;
|
||||
|
||||
unset($output,$retval);mwexec2($cmd,$output,$retval);
|
||||
|
||||
Reference in New Issue
Block a user