Commit Graph

1264 Commits

Author SHA1 Message Date
tschettervictor
cab6f1a217 etcupdate: add “” 2025-01-13 08:41:14 -07:00
tschettervictor
86c5b4928b etcupdate: warn on -d for diff/resolve 2025-01-10 08:56:32 -07:00
tschettervictor
397b13bc23 etcupdate: remove -n option from resolve mode 2025-01-10 00:18:47 -07:00
tschettervictor
cd330363c2 etcupdate: jail var missing 2025-01-10 00:14:25 -07:00
tschettervictor
894e5ef5f6 etcupdate: fix ;; spacing 2025-01-09 16:37:48 -07:00
tschettervictor
cca43cb436 etcupdate: fix “fi” 2025-01-09 16:34:15 -07:00
tschettervictor
8882c23b18 etcupdate: code optimize (usage if no RELEASE) 2025-01-09 16:30:29 -07:00
tschettervictor
e4b5273835 etcupdate: fix accidentally deleted error message 2025-01-09 15:41:23 -07:00
tschettervictor
e6e60a3a32 common: update set_target_single 2025-01-09 15:12:23 -07:00
tschettervictor
b90a83bfb7 etcupdate: help message include diff mode 2025-01-09 15:11:19 -07:00
tschettervictor
6ce41919e4 etcupdate: add diff mode 2025-01-09 15:10:23 -07:00
tschettervictor
9c79f138e7 etcupdate: add resolve mode 2025-01-09 11:37:04 -07:00
tschettervictor
0d09ac9607 etcupdate: error when RELEASE not bootstrapped 2025-01-07 17:14:02 -07:00
tschettervictor
bbd1de8221 Merge branch 'BastilleBSD:master' into etcupdate 2025-01-06 17:47:37 -07:00
Juan David Hurtado G
e9cc59d308 Merge pull request #749 from tschettervictor/patch-1
Update destroy.sh - refuse to destroy jail with mounted filesystem
2025-01-06 17:39:06 -05:00
Juan David Hurtado G
f8a7145bec Merge pull request #666 from gahr/adjust-all-mount-points
rename: adjust all mount points
2025-01-06 15:38:42 -05:00
tschettervictor
50c5e8c4ae etcupdate: add notice for building tarball 2025-01-05 22:06:36 -07:00
tschettervictor
b7ac062a70 etcupdate: fix ! 2025-01-05 21:59:12 -07:00
tschettervictor
84394d7306 Merge branch 'BastilleBSD:master' into patch-1 2025-01-04 18:33:07 -07:00
Juan David Hurtado G
16bc90a64f Merge pull request #781 from tschettervictor/patch-2
common: Fix generate_static_mac()
2025-01-04 19:46:21 -05:00
tschettervictor
96e2cefc66 etcupdate: beta version
Add subcommand "etcupdate"

This will simply use the built in "bootstrap" command to bootstrap the "src" version of a release, then create a tarball for it ONCE. This tarball is then used to update (includes dry run) a specifie jail to a specified RELEASE version of etc.
2025-01-04 11:12:56 -07:00
tschettervictor
a58da2cda6 Merge branch 'BastilleBSD:master' into patch-2 2025-01-04 10:57:02 -07:00
tschettervictor
529848ebeb Merge branch 'BastilleBSD:master' into patch-1 2025-01-04 10:56:53 -07:00
Barry McCormick
f956254157 Merge pull request #787 from tschettervictor/patch-4
template: awk removes spaces from multiple blank lines
2025-01-04 09:36:06 -08:00
Barry McCormick
8cded0e0a5 Merge pull request #789 from tschettervictor/revert-761-fix-cmd-template
Revert "Update template.sh - bugfix for cmd"
2025-01-04 09:32:45 -08:00
tschettervictor
6a3fbf2aeb Revert "Update template.sh - bugfix for cmd" 2025-01-04 10:31:11 -07:00
tschettervictor
43992f3469 template: awk remove spaces from multiple blank lines
Awk appears to remove multiple adjacent spaces from lines within a template. Adding "-F '[ ]'" makes sure field splitting is done on every space, thus preserving them.

#400
2025-01-03 07:23:46 -07:00
Barry McCormick
0d32733eed Merge pull request #761 from tschettervictor/fix-cmd-template
Update template.sh - bugfix for cmd
2024-12-31 19:04:29 -08:00
Barry McCormick
ac39d4a169 Merge pull request #776 from tschettervictor/check_jail_exists-function
begin moving functions to common.sh (top htop)
2024-12-31 14:34:33 -08:00
tschettervictor
fedc7aa60c Remove message on return 1 2024-12-31 15:27:45 -07:00
tschettervictor
4bc76d5064 fix brace 2024-12-31 15:00:12 -07:00
tschettervictor
7a621b2e1a Merge branch 'master' into check_jail_exists-function 2024-12-31 14:58:50 -07:00
Barry McCormick
4365082bed Merge pull request #778 from tschettervictor/mount-fixes
Mount/Umount fixes and improvements
2024-12-31 13:44:50 -08:00
tschettervictor
9d7b727432 minor fix 2024-12-31 12:27:32 -07:00
tschettervictor
ba2ff8ef75 better error handling 2024-12-31 10:33:59 -07:00
tschettervictor
3c60a4b26b hash mac of host for prefix 2024-12-30 16:49:34 -07:00
tschettervictor
d3fd055b67 more random mac 2024-12-30 12:16:26 -07:00
tschettervictor
31ccecb2c0 Merge branch 'BastilleBSD:master' into patch-2 2024-12-29 17:44:21 -07:00
Juan David Hurtado G
2c4ff17c6b Merge pull request #782 from BastilleBSD/setup-config-file
Improve bastille.conf handling with user prompt for creation
2024-12-29 15:25:46 -05:00
Juan David Hurtado G
0d5b92c052 Improve bastille.conf handling with user prompt for creation
Replaced ineffective default configuration generation logic with a user-interactive prompt. Users can now choose to create the configuration file with default values if it is missing, ensuring better control and clarity. Removed redundant code from the setup script to streamline execution.
2024-12-29 15:22:17 -05:00
tschettervictor
cfadb2537e bugfix for cloneing new mac 2024-12-29 11:43:35 -07:00
Juan David Hurtado G
cc782130fa Merge pull request #779 from BastilleBSD/revert-pr-770
Revert "Merge pull request #770 from tschettervictor/patch-7"
2024-12-29 10:36:05 -05:00
Juan David Hurtado G
383f968685 Revert "Merge pull request #770 from tschettervictor/patch-7"
This reverts commit 649c337055, reversing
changes made to 7d3ca7b21b.
2024-12-29 10:29:03 -05:00
Barry McCormick
649c337055 Merge pull request #770 from tschettervictor/patch-7
Allow using template in custom directory
2024-12-27 21:10:20 -08:00
tschettervictor
281fab30e6 document unmounting 2024-12-27 16:39:33 -07:00
tschettervictor
0ebdb36a87 Better docs 2024-12-27 13:59:34 -07:00
tschettervictor
68a808863a Update docs 2024-12-27 13:56:03 -07:00
tschettervictor
08f5a9a755 fix for multiple spacing 2024-12-27 13:34:14 -07:00
tschettervictor
67185a5a42 fix for multiple spacing in directiry 2024-12-27 13:33:26 -07:00
tschettervictor
3dce542d6b add check_target_exists to common.sh 2024-12-27 12:15:26 -07:00