Mirrors/xigmanas-bastille-extension
1
0
Fork 1
mirror of https://github.com/JRGTH/xigmanas-bastille-extension.git synced 2025-12-11 17:31:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 'etcupdate' command, update bundled files

Browse Source 
Add `etcupdate` missing command, update bundled files.
This commit is contained in:
JRGTH
2025-11-17 09:05:09 -04:00
parent 862582e066
commit cac84dc249
14 changed files with 2028 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bastille-init
View File

@@ -470,6 +470,7 @@ include_files()
# Include missing system files.
# Symlink the files in embedded platforms.
USRBIN_FILES="ar diff3 makewhatis setfib sum"
USRSBIN_FILES="etcupdate"
LOCALBIN_FILES="jib"
if [ "${PRDPLATFORM}" = "x64-embedded" ]; then
for _usrbin_file in ${USRBIN_FILES}; do
@@ -481,6 +482,15 @@ include_files()
ln -fhs ${SYSTEM_INCLUDE}/${_usrbin_file} /usr/bin/${_usrbin_file}
fi
done
for _usrsbin_file in ${USRSBIN_FILES}; do
if [ -f "/usr/sbin/${_usrsbin_file}" ] && [ ! -L "/usr/sbin/${_usrsbin_file}" ]; then
rm -r /usr/sbin/${_usrsbin_file}
fi
if [ ! -f "/usr/sbin/${_usrsbin_file}" ]; then
chmod 0555 "${SYSTEM_INCLUDE}/${_usrsbin_file}"
ln -fhs ${SYSTEM_INCLUDE}/${_usrsbin_file} /usr/sbin/${_usrsbin_file}
fi
done
for _localbin_file in ${LOCALBIN_FILES}; do
if [ -f "/usr/local/bin/${_localbin_file}" ] && [ ! -L "/usr/local/bin/${_localbin_file}" ]; then
rm -r /usr/local/bin/${_localbin_file}
@@ -497,6 +507,11 @@ include_files()
install -m 0555 "${SYSTEM_INCLUDE}/${_usrbin_file}" /usr/bin/${_usrbin_file}
fi
done
for _usrsbin_file in ${USRSBIN_FILES}; do
if [ ! -f "/usr/sbin/${_usrsbin_file}" ]; then
install -m 0555 "${SYSTEM_INCLUDE}/${_usrsbin_file}" /usr/sbin/${_usrsbin_file}
fi
done
for _localbin_file in ${LOCALBIN_FILES}; do
if [ ! -f "/usr/local/bin/${_localbin_file}" ]; then
install -m 0544 ${SYSTEM_INCLUDE}/${_localbin_file} /usr/local/bin/${_localbin_file}
@@ -993,7 +1008,7 @@ zfs_activate()
done
echo "Proceeding..."
if [ "${bastille_zfs_enable}" = "YES" ]; then
if [ "${bastille_zfs_enable}" = "YES" ] || [ "${bastille_zfs_enable}" = "yes" ]; then
if [ -n "${bastille_zfs_zpool}" ]; then
if zfs list "${bastille_zfs_zpool}" > /dev/null 2>&1; then
if ! zfs list "${bastille_zfs_zpool}/${bastille_zfs_prefix}" > /dev/null 2>&1; then
@@ -1343,7 +1358,7 @@ rc_params()
fi
# Check for sane ZFS parameters in this setup.
if [ "${bastille_zfs_enable}" = "YES" ]; then
if [ "${bastille_zfs_enable}" = "YES" ] || [ "${bastille_zfs_enable}" = "yes" ]; then
if [ -n "${bastille_zfs_zpool}" ]; then
if zfs list "${bastille_zfs_zpool}" >/dev/null 2>&1; then
@@ -1397,7 +1412,7 @@ rc_params()
fi
else
# Check for orphaned configuration and/or config reset.
if zfs list -H "${CWDIR}" | awk '{print $1}' | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
if zfs list -H "${CWDIR}" 2>/dev/null | awk '{print $1}' | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
zfs_support_error
else
if [ "${bastille_zfs_enable}" = "NO" ] || [ "${bastille_zfs_enable}" = "no" ]; then