Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-25 23:10:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

etcupdate: remove -n option from resolve mode

Browse Source
This commit is contained in:
tschettervictor
2025-01-10 00:18:47 -07:00
committed by GitHub
parent cd330363c2
commit 397b13bc23
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,13 +87,8 @@ diff_review() {
resolve_conflicts() {
local _jail="${1}"
if [ "${DRY_RUN}" -eq 1 ]; then
info "[${_jail}]: etcupdate resolve --dry-run"
etcupdate resolve -n -D "${bastille_jailsdir}/${_jail}/root"
else
info "[${_jail}]: etcupdate resolve"
etcupdate resolve -D "${bastille_jailsdir}/${_jail}/root"
fi
info "[${_jail}]: etcupdate resolve"
etcupdate resolve -D "${bastille_jailsdir}/${_jail}/root"
}
update_jail_etc() {