Commit Graph

833 Commits

Author SHA1 Message Date
tschettervictor
4aff04d037 console: missed check_fib function 2025-01-09 09:22:22 -07:00
tschettervictor
3c49a47f49 console: jail > jail(s) 2025-01-09 09:18:53 -07:00
tschettervictor
18826666d7 common: support single target function error when multi-target selected 2025-01-08 12:59:55 -07:00
tschettervictor
0aac59ae5a console: Change -s to -a 2025-01-07 15:44:48 -07:00
tschettervictor
e3a57e21ea common: simplify debug message 2025-01-07 15:42:44 -07:00
tschettervictor
c4b1d2a223 Merge branch 'BastilleBSD:master' into common.sh_functions 2025-01-06 17:47:48 -07:00
tschettervictor
27fe77d5f9 console: use -s to force start instead of -f
This is because -f typically is used to force and option. Example being in destroy.sh

I think it more consistent to use -s to auto start/stop a jail it the script requires it.
2025-01-06 17:33:29 -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
5d3f4732fb common: grep quietly for "check_target_is*" functions 2025-01-06 12:45:44 -07:00
tschettervictor
a9bd2d55c1 common.sh: revert VNET function 2025-01-06 12:41:30 -07:00
tschettervictor
e9ad74d000 clone: revert VNET function 2025-01-06 12:40:18 -07:00
tschettervictor
873a5230c4 common: 0>1 for base interface grep 2025-01-06 08:57:00 -07:00
tschettervictor
49a9ce9913 clone: 0>1 for base interface grep 2025-01-06 08:54:47 -07:00
tschettervictor
0c2c93c109 clone: quietly check for "ether" string when cloning 2025-01-06 08:12:47 -07:00
tschettervictor
677540aefa clone: change interfaces to start with 1 for VNET
This is because bastille0 is always used ad the default loopback when using "bastille setup" and interferes when trying to create the first VNET jail on the list. This ensures that VNET jails will have their epairs (non-bridge) start with bastille1 then 2 then 3 etc...
2025-01-06 08:11:16 -07:00
tschettervictor
02396f569f vnet: start VNET jails at 1 because bastille0 is used as a loopback 2025-01-05 21:55:28 -07:00
tschettervictor
f766f26c62 common: move export to after for loop 2025-01-05 20:15:01 -07:00
tschettervictor
53295ba69c quick oopsy fix for exporting TARGET 2025-01-05 20:10:37 -07:00
tschettervictor
61788cce6b fix shellcheck 2025-01-05 19:51:03 -07:00
tschettervictor
5017ad0120 console: new update
This makes console act with the new common.sh file.
Enable debug mode
Allow console by JID
Allow jail autocomplete
2025-01-05 19:21:29 -07:00
tschettervictor
dbd303fa2e common.sh: integrate new functions
These are all the new function I am beginning to move to common.sh for use with all jails.
2025-01-05 19:14:15 -07:00
tschettervictor
bb7f73e8f6 bastille: rename functions to "old" in place of new ones
Rename "check_target_is_running" and "target_all_jails" to have the suffix "_old".

These two function are only ever called from within the main bastille executable. 

I am integrating these functions in "common.sh" so renaming them here for removal in the future is the best path forward.
2025-01-05 19:10:59 -07:00
tschettervictor
84394d7306 Merge branch 'BastilleBSD:master' into patch-1 2025-01-04 18:33:07 -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
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
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
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
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
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
tschettervictor
5f8c79d277 allow mounting directories with spaces 2024-12-27 12:14:04 -07:00
tschettervictor
30aa0c1408 better error handling 2024-12-27 12:13:38 -07:00
tschettervictor
86fa464957 Merge branch 'BastilleBSD:master' into mount-fixes 2024-12-27 12:11:48 -07:00
tschettervictor
5393e27751 Merge branch 'BastilleBSD:master' into fix-cmd-template 2024-12-27 12:10:05 -07:00
tschettervictor
3c04a88947 Merge branch 'BastilleBSD:master' into check_jail_exists-function 2024-12-27 12:09:55 -07:00