Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-01-03 19:23:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

etcupdate: warn on -d for diff/resolve

Browse Source
This commit is contained in:
tschettervictor
2025-01-10 08:56:32 -07:00
committed by GitHub
parent 397b13bc23
commit 86c5b4928b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usr/local/share/bastille/etcupdate.sh
View File

@@ -81,12 +81,18 @@ bootstrap_etc_tarball() {
diff_review() {
local _jail="${1}"
if [ "${DRY_RUN}" -eq 1 ]; then
warn "Warning: diff mode does not support [-d|--dryrun]"
fi
info "[${_jail}]: etcupdate --diff mode"
etcupdate diff -D "${bastille_jailsdir}/${_jail}/root"
}
resolve_conflicts() {
local _jail="${1}"
if [ "${DRY_RUN}" -eq 1 ]; then
warn "Warning: resolve mode does not support [-d|--dryrun]"
fi
info "[${_jail}]: etcupdate resolve"
etcupdate resolve -D "${bastille_jailsdir}/${_jail}/root"
}