Mercurial > hgrepos > FreeBSD > ports > sysutils > local-bsdtools
annotate sbin/fjail @ 386:84d2735fe7f6
Simplified version tagging a lot: it is also faster now.
While being there: adjusting copyright year to end in 2023 now.
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Thu, 23 Feb 2023 01:08:31 +0100 |
| parents | 423c16c3280f |
| children | 9c3b1966ba91 |
| rev | line source |
|---|---|
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
1 #!/bin/sh |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
2 # -*- indent-tabs-mode: nil; -*- |
|
86
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
3 : 'A very minimal BSD Jail management tool. |
|
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
4 |
|
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
5 :Author: Franz Glasner |
|
386
84d2735fe7f6
Simplified version tagging a lot: it is also faster now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
366
diff
changeset
|
6 :Copyright: (c) 2019-2023 Franz Glasner. |
|
86
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
7 All rights reserved. |
|
104
6f6058939e48
Use the "Full name" in the license section for "fjail" also
Franz Glasner <fzglas.hg@dom66.de>
parents:
93
diff
changeset
|
8 :License: BSD 3-Clause "New" or "Revised" License. |
|
86
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
9 See LICENSE for details. |
|
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
10 If you cannot find LICENSE see |
|
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
11 <https://opensource.org/licenses/BSD-3-Clause> |
|
386
84d2735fe7f6
Simplified version tagging a lot: it is also faster now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
366
diff
changeset
|
12 :ID: @(#)@@SIMPLEVERSIONTAG@@ |
|
86
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
13 |
|
a3b9d4fe560e
Provide "module" doc-strings
Franz Glasner <fzglas.hg@dom66.de>
parents:
85
diff
changeset
|
14 ' |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
15 |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
16 set -eu |
| 73 | 17 |
| 18 VERSION="@@VERSION@@" | |
| 19 | |
|
105
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
20 USAGE=' |
| 75 | 21 USAGE: fjail [ OPTIONS ] COMMAND [ COMMAND OPTIONS ] [ ARG ... ] |
| 22 | |
| 23 OPTIONS: | |
| 24 | |
|
81
124faa20ae80
Implemented a "-V" global option to print the program's name and version number to stdout
Franz Glasner <fzglas.hg@dom66.de>
parents:
80
diff
changeset
|
25 -V Print the program name and version number to stdout and exit |
|
124faa20ae80
Implemented a "-V" global option to print the program's name and version number to stdout
Franz Glasner <fzglas.hg@dom66.de>
parents:
80
diff
changeset
|
26 |
| 75 | 27 -h Print this help message to stdout and exit |
| 28 | |
| 29 COMMANDS: | |
| 30 | |
|
205
fcfa674c8444
FIX: in the help message: improve documentation of OPTIONS
Franz Glasner <fzglas.hg@dom66.de>
parents:
204
diff
changeset
|
31 datasets [OPTIONS] PARENT CHILD |
| 75 | 32 |
| 33 Create ZFS datasets to be used within a jail | |
| 34 | |
| 35 PARENT must exist already and CHILD must not exist. | |
| 36 | |
|
255
7f21d242f79f
FIX: Description of "-A"
Franz Glasner <fzglas.hg@dom66.de>
parents:
250
diff
changeset
|
37 -A Set "canmount=noauto" for datasets |
|
211
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
38 -o Do not create var/empty as read-only dataset but with normal settings |
|
177
9ffbe53dbc35
Flag for creating a separatate dataset for freebsd-update data.
Franz Glasner <hg@dom66.de>
parents:
176
diff
changeset
|
39 -s Also create a dataset for freebsd-update data files |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
40 -t Create a more tiny set of datasets |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
41 -T Create only an extra tiny set of datasets |
| 75 | 42 -u Do not automatically mount newly created datasets |
| 43 | |
|
276
3c24b07240f2
Move the implementation of "mount" and "umount" into the new tool fzfs.
Franz Glasner <fzglas.hg@dom66.de>
parents:
265
diff
changeset
|
44 mount |
|
194
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
45 |
|
276
3c24b07240f2
Move the implementation of "mount" and "umount" into the new tool fzfs.
Franz Glasner <fzglas.hg@dom66.de>
parents:
265
diff
changeset
|
46 See sibling tool `fzfs'"'"' |
|
194
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
47 |
|
276
3c24b07240f2
Move the implementation of "mount" and "umount" into the new tool fzfs.
Franz Glasner <fzglas.hg@dom66.de>
parents:
265
diff
changeset
|
48 umount |
|
194
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
49 |
|
276
3c24b07240f2
Move the implementation of "mount" and "umount" into the new tool fzfs.
Franz Glasner <fzglas.hg@dom66.de>
parents:
265
diff
changeset
|
50 See sibling tool `fzfs'"'"' |
|
194
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
51 |
| 75 | 52 privs MOUNTPOINT |
| 53 | |
| 54 Adjust some Unix privileges to mounted jail datasets | |
|
76
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
55 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
56 populate MOUNTPOINT BASETXZ |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
57 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
58 Populate the jail directory in MOUNTPOINT with the base system in BASETXZ |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
59 |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
60 configure [OPTIONS] MOUNTPOINT |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
61 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
62 Configure some basic parts of the system at MOUNTPOINT: |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
63 disable root password, syslog and other basic configuration settings |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
64 |
|
250
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
65 Also handle thin jails by checking whether "etc" is a symlink to |
|
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
66 "skeleton/etc". |
|
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
67 |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
68 -d Temporarily mount a devfs filesystem to MOUNTPOINT/dev |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
69 |
|
226
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
70 hostid |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
71 |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
72 Print proposals for a hostuuid and hostid |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
73 |
|
205
fcfa674c8444
FIX: in the help message: improve documentation of OPTIONS
Franz Glasner <fzglas.hg@dom66.de>
parents:
204
diff
changeset
|
74 copy [OPTIONS] SOURCE-DATASET DEST-DATASET |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
75 |
|
105
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
76 Copy a tree of ZFS datasets with "zfs send -R" and "zfs receive". |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
77 Note that the destination dataset must not exist already. |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
78 |
|
178
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
79 -r Copy the datasets with the -Lec options (aka "raw") |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
80 -u Do not automatically mount received datasets |
|
105
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
81 |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
82 freebsd-update [OPTIONS] DIRECTORY OPERATIONS... |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
83 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
84 -c CURRENTLY-RUNNING Assume the systen given in CURRENTLY-RUNNING is |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
85 installed/running at given DIRECTORY |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
86 |
|
105
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
87 ENVIRONMENT: |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
88 |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
89 All environment variables that affect "zfs" are effective also. |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
90 |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
91 DESCRIPTION: |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
92 |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
93 All commands with the exception of "populate" require ZFS as |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
94 filesystem. |
|
52523a19797e
Docu: Enhance the docu of fjail
Franz Glasner <fzglas.hg@dom66.de>
parents:
104
diff
changeset
|
95 ' |
| 75 | 96 |
| 97 | |
| 73 | 98 # Reset to standard umask |
| 99 umask 0022 | |
| 100 | |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
101 |
|
161
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
102 _get_dataset_for_mountpoint() { |
|
196
a4fd3bcbbf1c
Use "mount -p" instead of "zfs mount" when determining devices for the real mountpoints
Franz Glasner <fzglas.hg@dom66.de>
parents:
195
diff
changeset
|
103 : 'Use `mount -t zfs -p` to determine the ZFS dataset for a given mountpoint. |
|
161
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
104 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
105 ' |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
106 local _mountpoint |
|
196
a4fd3bcbbf1c
Use "mount -p" instead of "zfs mount" when determining devices for the real mountpoints
Franz Glasner <fzglas.hg@dom66.de>
parents:
195
diff
changeset
|
107 local _ds _mount _rest |
|
161
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
108 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
109 _mountpoint="$1" |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
110 |
|
197
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
111 mount -t zfs -p \ |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
112 | { |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
113 while IFS=' '$'\t' read -r _ds _mount _rest ; do |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
114 if [ "$_mount" = "$_mountpoint" ]; then |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
115 echo "${_ds}" |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
116 return 0 |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
117 fi |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
118 done |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
119 return 1 |
|
3181a6b5758e
FIX: Using a pipeline within a function correctly with regard to return values:
Franz Glasner <fzglas.hg@dom66.de>
parents:
196
diff
changeset
|
120 } |
|
161
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
121 } |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
122 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
123 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
124 _get_dataset_for_varempty() { |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
125 : 'Allow special handling for <mountpoint>/var/empty which may be |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
126 mounted read-only. |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
127 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
128 ' |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
129 local _mountpoint |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
130 local _ve_mount |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
131 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
132 _mountpoint="$1" |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
133 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
134 if [ "$_mountpoint" = '/' ]; then |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
135 _ve_mount='/var/empty' |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
136 else |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
137 _ve_mount="${_mountpoint}/var/empty" |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
138 fi |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
139 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
140 _get_dataset_for_mountpoint "${_ve_mount}" |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
141 } |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
142 |
|
57b9b899bf77
Provide functions that will be the base for "/var/empty" handling (manipulate the "readonly" property when doing some special operations)
Franz Glasner <fzglas.hg@dom66.de>
parents:
157
diff
changeset
|
143 |
|
346
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
144 #: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
145 #: Check whether a FreeBSD version at a given location matches the userland |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
146 #: version of the host where the current process run. |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
147 #: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
148 #: Args: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
149 #: $1: the location where to check for |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
150 #: $2: an optional reference FreeBSD version to compare to (default is the |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
151 #: version of the host) |
|
346
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
152 #: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
153 #: Returns: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
154 #: 0 if the userland versions match, 1 otherwise |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
155 #: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
156 #: Exit: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
157 #: 1 on fatal errors (e.g. /bin/freebsd-version not found or errors) |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
158 #: |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
159 _has_same_userland_version() { |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
160 local directory ref_version |
|
346
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
161 |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
162 local _directory_version |
|
346
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
163 |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
164 directory="$1" |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
165 ref_version="${2:-}" |
|
346
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
166 |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
167 if [ -z "${ref_version}" ]; then |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
168 ref_version=$(/bin/freebsd-version -u) || exit 1 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
169 fi |
|
346
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
170 _directory_version=$(chroot "${directory}" /bin/freebsd-version -u) || exit 1 |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
171 if [ "${ref_version%%-*}" = "${_directory_version%%-*}" ]; then |
|
346
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
172 return 0 |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
173 fi |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
174 return 1 |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
175 } |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
176 |
|
3b2935985c73
Prepare for some more future compatibility check on FreeBSD updates: implement _has_same_userland_version()
Franz Glasner <fzglas.hg@dom66.de>
parents:
331
diff
changeset
|
177 |
| 73 | 178 # |
| 179 # "datasets" -- create the ZFS dataset tree | |
| 180 # | |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
181 # command_datasets [ -u ] parent-dataset child-dataset |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
182 # |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
183 # -u do not automatically mount newly created datasets |
| 73 | 184 # |
| 185 command_datasets() { | |
| 186 # parent ZFS dataset -- child ZFS dataset name | |
| 187 local _pds _cds | |
| 188 # and its mount point | |
|
202
6b7a084ddf1d
Replace all calls to "zfs get" to "zfs list -o".
Franz Glasner <fzglas.hg@dom66.de>
parents:
201
diff
changeset
|
189 local _pmp _get |
| 73 | 190 # full name of the dataset |
| 191 local _ds | |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
192 # dynamic ZFS options -- create cache for freebsd-update -- use a more tiny layout |
|
211
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
193 local _zfsopts _fbsdupdate _tiny _zfsnoauto _varempty_ro |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
194 |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
195 _zfsopts="" |
|
177
9ffbe53dbc35
Flag for creating a separatate dataset for freebsd-update data.
Franz Glasner <hg@dom66.de>
parents:
176
diff
changeset
|
196 _fbsdupdate="" |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
197 _tiny="no" |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
198 _zfsnoauto="" |
|
211
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
199 _varempty_ro="-o readonly=on" |
|
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
200 while getopts "oustAT" _opt ; do |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
201 case ${_opt} in |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
202 A) |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
203 # |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
204 # set canmount=noauto where otherwise canmount=on would have been set |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
205 # or inherited |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
206 # |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
207 _zfsnoauto="-o canmount=noauto" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
208 ;; |
|
211
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
209 o) |
|
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
210 # Clear out the default setting of creating var/empty as read-only dataset |
|
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
211 _varempty_ro="" |
|
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
212 ;; |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
213 t) |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
214 # use a more tiny layout |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
215 _tiny="yes" |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
216 ;; |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
217 T) # extra tiny layout |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
218 _tiny="extra" |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
219 ;; |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
220 u) |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
221 # do not mount newly created datasets |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
222 _zfsopts="${_zfsopts} -u" |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
223 ;; |
|
177
9ffbe53dbc35
Flag for creating a separatate dataset for freebsd-update data.
Franz Glasner <hg@dom66.de>
parents:
176
diff
changeset
|
224 s) |
|
9ffbe53dbc35
Flag for creating a separatate dataset for freebsd-update data.
Franz Glasner <hg@dom66.de>
parents:
176
diff
changeset
|
225 # create also a dataset for freebsd-update data |
|
9ffbe53dbc35
Flag for creating a separatate dataset for freebsd-update data.
Franz Glasner <hg@dom66.de>
parents:
176
diff
changeset
|
226 _fbsdupdate="yes" |
|
179
6c144aca8ac5
FIX: Proper case-switch termination
Franz Glasner <hg@dom66.de>
parents:
178
diff
changeset
|
227 ;; |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
228 \?|:) |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
229 return 2; |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
230 ;; |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
231 esac |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
232 done |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
233 shift $((OPTIND-1)) |
|
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
234 OPTIND=1 |
| 73 | 235 |
| 236 _pds="$1" | |
| 237 if [ -z "${_pds}" ]; then | |
| 238 echo "ERROR: no parent dataset given" >&2 | |
| 239 return 2 | |
| 240 fi | |
|
203
eb95c986cc59
Use -t filesystem in all "zfs list" calls
Franz Glasner <fzglas.hg@dom66.de>
parents:
202
diff
changeset
|
241 _pmp=$(zfs list -H -o mountpoint -t filesystem "${_pds}" 2>/dev/null) || { echo "ERROR: dataset \`${_pds}' does not exist" >&2; return 1; } |
| 73 | 242 case "${_pmp}" in |
| 243 none) | |
| 244 echo "ERROR: dataset \`${_pds}' has no mountpoint" >&2 | |
| 245 return 1 | |
| 246 ;; | |
| 247 legacy) | |
| 248 echo "ERROR: dataset \`${_pds}' has a \`${_mp}' mountpoint" >&2 | |
| 249 return 1 | |
| 250 ;; | |
| 251 *) | |
| 252 # VOID | |
| 253 ;; | |
| 254 esac | |
| 255 _cds="$2" | |
| 256 if [ -z "${_cds}" ]; then | |
| 257 echo "ERROR: no child dataset given" >&2 | |
| 258 return 2 | |
| 259 fi | |
| 260 _ds="${_pds}/${_cds}" | |
| 261 echo "Resulting new root dataset is \`${_ds}' at mountpoint \`${_pmp}/${_cds}'" | |
|
203
eb95c986cc59
Use -t filesystem in all "zfs list" calls
Franz Glasner <fzglas.hg@dom66.de>
parents:
202
diff
changeset
|
262 if zfs list -H -o mountpoint -t filesystem "${_ds}" >/dev/null 2>/dev/null; then |
| 73 | 263 echo "ERROR: dataset \`${_ds}' does already exist" >&2 |
| 264 return 1 | |
| 265 fi | |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
266 |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
267 # |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
268 # NOTE: For BEs these directory will be *excluded* from the BE |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
269 # |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
270 # /tmp |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
271 # /usr/home |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
272 # /usr/ports |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
273 # /usr/src |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
274 # /var/audit |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
275 # /var/crash |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
276 # /var/log |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
277 # /var/mail |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
278 # /var/tmp |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
279 # |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
280 zfs create ${_zfsopts} ${_zfsnoauto} -o atime=off "${_ds}" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
281 zfs create ${_zfsopts} ${_zfsnoauto} -o sync=disabled -o setuid=off "${_ds}/tmp" |
|
182
dbd62c32b3fd
FIX: Do expansion then comparing
Franz Glasner <hg@dom66.de>
parents:
181
diff
changeset
|
282 if [ "${_tiny}" != "extra" ]; then |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
283 if [ "${_tiny}" = "yes" ]; then |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
284 zfs create ${_zfsopts} -o canmount=off "${_ds}/usr" |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
285 else |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
286 zfs create ${_zfsopts} ${_zfsnoauto} "${_ds}/usr" |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
287 fi |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
288 zfs create ${_zfsopts} ${_zfsnoauto} -o setuid=off "${_ds}/usr/home" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
289 zfs create ${_zfsopts} ${_zfsnoauto} "${_ds}/usr/local" |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
290 fi |
|
182
dbd62c32b3fd
FIX: Do expansion then comparing
Franz Glasner <hg@dom66.de>
parents:
181
diff
changeset
|
291 if [ \( "${_tiny}" = "yes" \) -o \( "${_tiny}" = "extra" \) ]; then |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
292 zfs create ${_zfsopts} -o canmount=off "${_ds}/var" |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
293 else |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
294 zfs create ${_zfsopts} ${_zfsnoauto} "${_ds}/var" |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
295 fi |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
296 if [ "${_tiny}" != "extra" ]; then |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
297 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off "${_ds}/var/audit" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
298 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off "${_ds}/var/cache" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
299 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/cache/pkg" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
300 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o compression=off "${_ds}/var/crash" |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
301 fi |
|
177
9ffbe53dbc35
Flag for creating a separatate dataset for freebsd-update data.
Franz Glasner <hg@dom66.de>
parents:
176
diff
changeset
|
302 if [ "$_fbsdupdate" = "yes" ]; then |
|
182
dbd62c32b3fd
FIX: Do expansion then comparing
Franz Glasner <hg@dom66.de>
parents:
181
diff
changeset
|
303 if [ \( "${_tiny}" = "yes" \) -o \( "${_tiny}" = "extra" \) ]; then |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
304 zfs create ${_zfsopts} -o canmount=off -o exec=off -o setuid=off "${_ds}/var/db" |
|
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
305 else |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
306 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off "${_ds}/var/db" |
|
181
d30a68e66d60
More dataset creation options: -t (tiny) and -T (extra tiny)
Franz Glasner <hg@dom66.de>
parents:
180
diff
changeset
|
307 fi |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
308 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/db/freebsd-update" |
|
177
9ffbe53dbc35
Flag for creating a separatate dataset for freebsd-update data.
Franz Glasner <hg@dom66.de>
parents:
176
diff
changeset
|
309 fi |
|
211
ee9b32ab0e9a
Implement the "-o" option for "datasets" to create var/empty with the default "readonly" setting instead of "readonly=on"
Franz Glasner <fzglas.hg@dom66.de>
parents:
210
diff
changeset
|
310 zfs create ${_zfsopts} ${_zfsnoauto} ${_varempty_ro} -o exec=off -o setuid=off "${_ds}/var/empty" |
|
204
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
311 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o primarycache=metadata "${_ds}/var/log" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
312 zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o atime=on "${_ds}/var/mail" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
313 zfs create ${_zfsopts} ${_zfsnoauto} -o sync=disabled -o exec=off -o setuid=off -o compression=off -o primarycache=all "${_ds}/var/run" |
|
ef397b84b047
Implement a "-A" flat for dataset creation: set canmount=noauto
Franz Glasner <fzglas.hg@dom66.de>
parents:
203
diff
changeset
|
314 zfs create ${_zfsopts} ${_zfsnoauto} -o sync=disabled -o setuid=off "${_ds}/var/tmp" |
| 73 | 315 } |
| 316 | |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
317 |
| 73 | 318 # |
|
76
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
319 # "populate" -- populate the datasets with content from a FreeBSD base.txz |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
320 # |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
321 # command_populate mountpoint basetxz |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
322 # |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
323 command_populate() { |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
324 # MOUNTPOINT -- base.txz |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
325 local _mp _basetxz |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
326 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
327 _mp="$1" |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
328 _basetxz="$2" |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
329 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
330 if [ -z "${_mp}" ]; then |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
331 echo "ERROR: no mountpoint given" >&2 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
332 return 2 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
333 fi |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
334 if [ -z "${_basetxz}" ]; then |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
335 echo "ERROR: no base.txz given" >&2 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
336 return 2 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
337 fi |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
338 if [ ! -d "${_mp}" ]; then |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
339 echo "ERROR: mountpoint \`${_mp}' does not exist" >&2 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
340 return 1 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
341 fi |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
342 if [ ! -r "${_basetxz}" ]; then |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
343 echo "ERROR: file \`${_basetxz}' is not readable" >&2 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
344 return 1 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
345 fi |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
346 |
|
173
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
347 # |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
348 # Handle /var/empty separately later: could be already there and |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
349 # mounted read-only. |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
350 # |
|
164
b62b8bc6184f
Because of mtree errors in freebsd-update: let the directory tree in /boot stay as expanded but delete all regular files
Franz Glasner <hg@dom66.de>
parents:
163
diff
changeset
|
351 tar -C "${_mp}" --exclude=./var/empty -xJp -f "${_basetxz}" || { echo "ERROR: tar encountered errors" >&2; return 1; } |
|
173
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
352 if [ -d "${_mp}/var/empty" ]; then |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
353 # |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
354 # If /var/empty exists already try to extract with changing the |
|
183
ea491007d7fb
FIX: Because of set -eu: ignore errors from tar explicitely
Franz Glasner <hg@dom66.de>
parents:
182
diff
changeset
|
355 # flags (e.g. `schg'). But be ignore errors here. |
|
173
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
356 # |
|
184
2e7d0c967c36
Print a message when tar errors regaring ./var/empty are ignored
Franz Glasner <hg@dom66.de>
parents:
183
diff
changeset
|
357 tar -C "${_mp}" -xJp -f "${_basetxz}" ./var/empty || { echo "tar warnings for handling ./var/empty ignored because ./var/empty exists already" >&2; } |
|
173
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
358 else |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
359 # Just extract /var/empty normally |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
360 tar -C "${_mp}" -xJp -f "${_basetxz}" ./var/empty || { echo "ERROR: tar encountered errors" >&2; return 1; } |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
361 fi |
|
6782ac823f86
Handle /var/empty more sanely when populating datasets from a base.txz image
Franz Glasner <fzglas.hg@dom66.de>
parents:
164
diff
changeset
|
362 |
|
164
b62b8bc6184f
Because of mtree errors in freebsd-update: let the directory tree in /boot stay as expanded but delete all regular files
Franz Glasner <hg@dom66.de>
parents:
163
diff
changeset
|
363 find "${_mp}/boot" -type f -delete |
|
76
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
364 } |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
365 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
366 |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
367 # |
|
226
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
368 # "hostid" -- print a proposal for hostid/hostuuid settings in a jail |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
369 # |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
370 # command_hostid |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
371 # |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
372 command_hostid() { |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
373 # |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
374 # hostid and hostuuid should be set (at least for consistency ressons) |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
375 # in vnet jails (see /etc/rc.d/hostid and /etc/rc.d/hostid_save). |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
376 # They can be set in the jail.conf. |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
377 # Print one here that can be pasted into the jail.conf if needed. |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
378 # |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
379 # hostid and hostuuid for non-vnet jails are inherited from the parent/host. |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
380 # |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
381 # See also /etc/rc.d/hostid and /etc/rc.d/hostid_save. |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
382 # |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
383 local _new_hostuuid _new_hostid |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
384 _new_hostuuid="$(uuidgen)" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
385 _new_hostid="$(echo -n ${_new_hostuuid} | /sbin/md5)" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
386 _new_hostid="0x${_new_hostid%%????????????????????????}" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
387 |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
388 echo "Proposed hostuuid/hostid:" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
389 echo " host.hostuuid = \"${_new_hostuuid}\";" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
390 echo " host.hostid = $((_new_hostid));" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
391 #echo " host.hostid = ${_new_hostid};" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
392 } |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
393 |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
394 |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
395 # |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
396 # "configure" -- configure the mountpoint |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
397 # |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
398 # command_configure mountpoint |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
399 # |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
400 command_configure() { |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
401 # mountpoint |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
402 local _mp |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
403 local _opt_devfs |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
404 |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
405 local _pcl _umount_devfs |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
406 |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
407 _umount_devfs="" |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
408 |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
409 _opt_devfs="" |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
410 while getopts "d" _opt ; do |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
411 case ${_opt} in |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
412 d) |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
413 _opt_devfs="yes" |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
414 ;; |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
415 \?) |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
416 return 2; |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
417 ;; |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
418 *) |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
419 echo "ERROR: option handling failed" 1>&2 |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
420 return 2 |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
421 ;; |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
422 esac |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
423 done |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
424 shift $((OPTIND-1)) |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
425 OPTIND=1 |
|
228
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
426 |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
427 _mp="$1" |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
428 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
429 if [ -z "${_mp}" ]; then |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
430 echo "ERROR: no mountpoint given" >&2 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
431 return 2 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
432 fi |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
433 if [ ! -d "${_mp}" ]; then |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
434 echo "ERROR: mountpoint \`${_mp}' does not exist" >&2 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
435 return 1 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
436 fi |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
437 |
|
331
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
438 if [ -c "${_mp}/dev/null" ]; then |
|
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
439 if [ "${_opt_devfs}" = "yes" ]; then |
|
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
440 echo "WARNING: devfs is already mounted - mounting skipped" |
|
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
441 fi |
|
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
442 else |
|
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
443 if [ "${_opt_devfs}" = "yes" ]; then |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
444 echo "Mounting devfs" |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
445 mount -t devfs devfs "${_mp}/dev" |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
446 _umount_devfs="yes" |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
447 else |
|
331
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
448 echo "ERROR: a working devfs is needed at \`{_mp}/dev' (use \`-d')" >&2 |
|
4a17b1f4c378
Require a mounted and working devfs within the jail when configuring a jail.
Franz Glasner <fzglas.hg@dom66.de>
parents:
329
diff
changeset
|
449 return 1 |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
450 fi |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
451 fi |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
452 |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
453 # Deactive the by default empty root password |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
454 pw -R "${_mp}" usermod -w no -n root |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
455 |
|
229
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
456 if [ -f "${_mp}/etc/defaults/rc.conf" ]; then |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
457 |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
458 sysrc -R "${_mp}" sendmail_enable=NONE |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
459 sysrc -R "${_mp}" clear_tmp_enable=YES |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
460 sysrc -R "${_mp}" clear_tmp_X=NO |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
461 sysrc -R "${_mp}" syslogd_flags=-ss |
|
366
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
462 sysrc -R "${_mp}" bsdstats_enable=NO # no automatic BSD stats when booting (for periodic see below) |
|
229
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
463 else |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
464 echo "WARNING: No \"${_mp}/etc/defaults/rc.conf\": not configuring \"rc.conf\"" |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
465 fi |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
466 |
|
229
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
467 if [ -f "${_mp}/usr/share/zoneinfo/Europe/Berlin" ]; then |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
468 # Timezone to CET |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
469 if [ ! -f "${_mp}/etc/localtime" ]; then |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
470 echo "Setting timezone to Europe/Berlin" |
|
250
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
471 # Handle thin jails automatically (but check expectations very strictly) |
|
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
472 if [ \( -L "${_mp}/etc" \) -a \( "$(readlink "${_mp}/etc")" = "skeleton/etc" \) ]; then |
|
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
473 ln -s ../../usr/share/zoneinfo/Europe/Berlin "${_mp}/etc/localtime" |
|
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
474 else |
|
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
475 ln -s ../usr/share/zoneinfo/Europe/Berlin "${_mp}/etc/localtime" |
|
c4d835ccb4ae
Implement configure for symlinked skeletons.
Franz Glasner <fzglas.hg@dom66.de>
parents:
229
diff
changeset
|
476 fi |
|
229
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
477 echo "Europe/Berlin" > "${_mp}/var/db/zoneinfo" |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
478 else |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
479 echo "WARNING: \"${_mp}/etc/localtime\" exists already -- not changed" |
|
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
480 fi |
|
222
16238e9032a9
Skip configuring a timezone when there already exists such a file /etc/localtime
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
221
diff
changeset
|
481 else |
|
229
243dba574ad3
More sanity checks when configuring jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
228
diff
changeset
|
482 echo "WARNING: No timezone data file found at \"${_mp}/usr/share/zoneinfo/Europe/Berlin\": skipping timezone setup" |
|
222
16238e9032a9
Skip configuring a timezone when there already exists such a file /etc/localtime
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
221
diff
changeset
|
483 fi |
|
221
f62f8ec6a19b
Mark a todo for setting a "hostid"
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
220
diff
changeset
|
484 |
|
224
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
485 # resolv.conf |
|
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
486 if [ ! -f "${_mp}/etc/resolv.conf" ]; then |
|
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
487 echo "Copying the host's resolv.conf into the jail" |
|
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
488 cp -p /etc/resolv.conf "${_mp}/etc/resolv.conf" |
|
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
489 else |
|
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
490 echo "WARNING: \"${_mp}/etc/resolv.conf\" exists already -- not changed" |
|
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
491 fi |
|
6713d97b4180
Copy the host's resolv.conf into a jail when configuring it.
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
223
diff
changeset
|
492 |
|
225
ffd24013d346
When configuring a jail also call "newaliases" within the jail
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
224
diff
changeset
|
493 # Call newaliases within the jail |
|
227
a7a9fd895d30
Print message when calling "newaliases"
Franz Glasner <fzglas.hg@dom66.de>
parents:
226
diff
changeset
|
494 echo "Calling \"newaliases\"" |
|
225
ffd24013d346
When configuring a jail also call "newaliases" within the jail
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
224
diff
changeset
|
495 chroot "${_mp}" /usr/bin/newaliases |
|
ffd24013d346
When configuring a jail also call "newaliases" within the jail
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
224
diff
changeset
|
496 |
|
228
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
497 _pcl="${_mp}/etc/periodic.conf.local" |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
498 if [ ! -f "${_pcl}" ]; then |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
499 echo "Adjusting periodic.conf.local" |
|
357
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
500 echo "Periodic script log into files ..." |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
501 echo "daily_output=\"/var/log/daily.log\"" > "${_pcl}" |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
502 echo "weekly_output=\"/var/log/weekly.log\"" >> "${_pcl}" |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
503 echo "monthly_output=\"/var/log/monthly.log\"" >> "${_pcl}" |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
504 echo "daily_status_security_output=\"/var/log/security\"" >> "${_pcl}" |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
505 echo "weekly_status_security_output=\"/var/log/security\"" >> "${_pcl}" |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
506 echo "monthly_status_security_output=\"/var/log/security\"" >> "${_pcl}" |
|
358
80c781a59aa7
FIX: Remove duplicate periodic setting
Franz Glasner <fzglas.hg@dom66.de>
parents:
357
diff
changeset
|
507 |
|
80c781a59aa7
FIX: Remove duplicate periodic setting
Franz Glasner <fzglas.hg@dom66.de>
parents:
357
diff
changeset
|
508 echo "security_status_chkmounts_enable=\"NO\"" >> "${_pcl}" |
|
80c781a59aa7
FIX: Remove duplicate periodic setting
Franz Glasner <fzglas.hg@dom66.de>
parents:
357
diff
changeset
|
509 |
|
357
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
510 echo "Disable some scripts that are enabled by default ..." |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
511 echo "daily_ntpd_leapfile_enable=\"NO\"" >> "${_pcl}" |
|
228
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
512 echo "daily_status_zfs_zpool_list_enable=\"NO\"" >> "${_pcl}" |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
513 echo "daily_status_disks_enable=\"NO\"" >> "${_pcl}" |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
514 echo "daily_status_uptime_enable=\"NO\"" >> "${_pcl}" |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
515 |
|
366
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
516 # |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
517 # bsdstats |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
518 # |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
519 echo "" >> "${_pcl}" |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
520 echo "#" >> "${_pcl}" |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
521 echo "# bsdstats" >> "${_pcl}" |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
522 echo "#" >> "${_pcl}" |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
523 # Disabled by default but make it more explicit |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
524 echo "monthly_statistics_enable=\"NO\"" >> "${_pcl}" |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
525 # If enabled: because we are in a jail there are no devices |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
526 echo "monthly_statistics_report_devices=\"NO\"" >> "${_pcl}" |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
527 # If enabled: report ports |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
528 echo "monthly_statistics_report_ports=\"YES\"" >> "${_pcl}" |
|
423c16c3280f
Also configure the periodic part of "bsdstats"
Franz Glasner <hg@dom66.de>
parents:
359
diff
changeset
|
529 |
| 359 | 530 echo "Creating system logfiles that are marked for automatic creation ..." |
|
357
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
531 chroot "${_mp}" /usr/sbin/newsyslog -CN |
|
c559074302e0
Configure periodic scripts to log into logfiles instead of mails.
Franz Glasner <hg@dom66.de>
parents:
347
diff
changeset
|
532 |
|
228
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
533 else |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
534 echo "WARNING: \"${_pcl}\" exists already -- not changed" |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
535 fi |
|
4493e364cabf
Also configure periodic when configuring a jail
Franz Glasner <fzglas.hg@dom66.de>
parents:
227
diff
changeset
|
536 |
|
226
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
537 command_hostid |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
538 |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
539 if [ "${_umount_devfs}" = "yes" ]; then |
|
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
540 echo "Unmounting devfs" |
|
329
2623f7e775e3
FIX: Shell variable expansion was not done in fjail's command configure sometimes
Franz Glasner <fzglas.hg@dom66.de>
parents:
328
diff
changeset
|
541 umount "${_mp}/dev" |
|
328
184412e2543e
Implement the -d option for fjail configure: temporarily mount a devfs filesystem
Franz Glasner <fzglas.hg@dom66.de>
parents:
313
diff
changeset
|
542 fi |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
543 } |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
544 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
545 |
|
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
546 # |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
547 # "copy" -- ZFS copy of datasets |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
548 # |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
549 # command_copy source-dataset destination-dataset |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
550 # |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
551 command_copy() { |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
552 # source dataset -- destination dataset |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
553 local _source _dest |
|
178
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
554 # dynamic ZFS options -- ZFS copy options |
|
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
555 local _zfsopts _zfscopyopts |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
556 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
557 _zfsopts="" |
|
178
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
558 _zfscopyopts="" |
|
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
559 while getopts "ru" _opt ; do |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
560 case ${_opt} in |
|
178
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
561 r) |
|
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
562 # Use raw datasets |
|
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
563 _zfscopyopts="-Lec" |
|
179
6c144aca8ac5
FIX: Proper case-switch termination
Franz Glasner <hg@dom66.de>
parents:
178
diff
changeset
|
564 ;; |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
565 u) |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
566 # do not mount newly created datasets |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
567 _zfsopts="${_zfsopts} -u" |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
568 ;; |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
569 \?|:) |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
570 return 2; |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
571 ;; |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
572 esac |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
573 done |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
574 shift $((OPTIND-1)) |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
575 OPTIND=1 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
576 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
577 _source="$1" |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
578 if [ -z "${_source}" ]; then |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
579 echo "ERROR: no source dataset given" >&2 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
580 return 2 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
581 fi |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
582 _dest="$2" |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
583 if [ -z "${_dest}" ]; then |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
584 echo "ERROR: no source dataset given" >&2 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
585 return 2 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
586 fi |
|
178
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
587 zfs send -R ${_zfscopyopts} -n -v "${_source}" || { echo "ERROR: ZFS operation failed in no-op mode" >&2; return 1; } |
|
00fbf2b4b44f
Allow to copy ZFS datasets in "raw" mode (with "-Lec" set)
Franz Glasner <hg@dom66.de>
parents:
177
diff
changeset
|
588 zfs send -R ${_zfscopyopts} "${_source}" | zfs receive ${_zfsopts} "${_dest}" || { echo "ERROR: ZFS operation failed" >&2; return 1; } |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
589 } |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
590 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
591 |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
592 # |
| 73 | 593 # "privs" -- adjust privileges |
| 594 # | |
| 595 # To be used when all ZFS datasets are mounted. | |
| 596 # | |
| 597 command_privs() { | |
| 598 # mountpoint | |
|
162
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
599 local _mp _d _veds _get _vestatus |
| 73 | 600 |
| 601 _mp="$1" | |
| 602 if [ -z "${_mp}" ]; then | |
| 603 echo "ERROR: no mountpoint given" >&2 | |
| 604 return 2 | |
| 605 fi | |
| 606 if [ ! -d "${_mp}" ]; then | |
| 607 echo "ERROR: directory \`${_mp}' does not exist" >&2 | |
| 608 return 1 | |
| 609 fi | |
| 610 for _d in tmp var/tmp ; do | |
| 611 chmod 01777 "${_mp}/${_d}" | |
| 612 done | |
| 613 chown root:mail "${_mp}/var/mail" | |
| 614 chmod 0775 "${_mp}/var/mail" | |
|
162
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
615 |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
616 # |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
617 # Handle <mountpoint>/var/empty specially: |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
618 # make it writeable temporarily if it is mounted read-only: |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
619 # |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
620 _vestatus="" |
|
196
a4fd3bcbbf1c
Use "mount -p" instead of "zfs mount" when determining devices for the real mountpoints
Franz Glasner <fzglas.hg@dom66.de>
parents:
195
diff
changeset
|
621 _veds="$(_get_dataset_for_varempty "${_mp}")" |
|
162
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
622 if [ $? -eq 0 ]; then |
|
203
eb95c986cc59
Use -t filesystem in all "zfs list" calls
Franz Glasner <fzglas.hg@dom66.de>
parents:
202
diff
changeset
|
623 _vestatus=$(zfs list -H -o readonly -t filesystem ${_veds} 2>/dev/null) || { echo "ERROR: cannot determine readonly status of ${_mp}/var/empty" >&2; return 1; } |
|
162
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
624 if [ "${_vestatus}" = "on" ]; then |
|
199
a8b6584d24ec
FIX: Do not suppress stderr messages from some "zfs set" calls.
Franz Glasner <fzglas.hg@dom66.de>
parents:
198
diff
changeset
|
625 zfs set readonly=off ${_veds} 1> /dev/null || { echo "ERROR: cannot reset readonly-status of ${_mp}/var/empty" >&2; return 1; } |
|
162
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
626 fi |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
627 fi |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
628 # Set the access rights and the file flags as given in mtree |
|
198
dd8a9bbdf8c0
Better error handling when changing privileges and flags of var/empty
Franz Glasner <fzglas.hg@dom66.de>
parents:
197
diff
changeset
|
629 chmod 0555 "${_mp}/var/empty" || { echo "WARNING: Cannot chmod on var/empty" >&2; } |
|
dd8a9bbdf8c0
Better error handling when changing privileges and flags of var/empty
Franz Glasner <fzglas.hg@dom66.de>
parents:
197
diff
changeset
|
630 chflags schg "${_mp}/var/empty" || { echo "WARNING: Cannot chflags on var/empty" >&2; } |
|
162
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
631 # Reset the read-only status of the mountpoint as it was before |
|
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
632 if [ "${_vestatus}" = "on" ]; then |
|
199
a8b6584d24ec
FIX: Do not suppress stderr messages from some "zfs set" calls.
Franz Glasner <fzglas.hg@dom66.de>
parents:
198
diff
changeset
|
633 zfs set readonly=on ${_veds} 1> /dev/null || { echo "ERROR: cannot reactivate readonly-status of ${_mp}/var/empty" >&2; return 1; } |
|
162
9bd38c55a75c
When executing the "privs" command try to make <mountpoint>/var/empty writeable temporarily to set proper permissions and file flags
Franz Glasner <hg@dom66.de>
parents:
161
diff
changeset
|
634 fi |
| 73 | 635 } |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
636 |
|
74
247d35f910ca
fjail datasets now recognized a "-u" command option to not automatically mount created datasets
Franz Glasner <hg@dom66.de>
parents:
73
diff
changeset
|
637 |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
638 #: |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
639 #: Implement the "freebsd-update" command |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
640 #: |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
641 command_freebsd_update() { |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
642 local directory operations |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
643 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
644 local opt_currently_running |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
645 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
646 opt_currently_running="" |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
647 while getopts "c:" _opt ; do |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
648 case ${_opt} in |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
649 c) |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
650 opt_currently_running="$OPTARG" |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
651 ;; |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
652 \?|:) |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
653 return 2; |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
654 ;; |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
655 esac |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
656 done |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
657 shift $((OPTIND-1)) |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
658 OPTIND=1 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
659 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
660 directory="${1-}" |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
661 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
662 [ -z "${directory}" ] && { echo "ERROR: no directory given" 1>&2; return 2; } |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
663 [ -d "${directory}" ] || { echo "ERROR: directory \`${directory}' does not exist" 1>&2; return 1; } |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
664 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
665 shift |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
666 operations="$@" |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
667 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
668 if _has_same_userland_version "${directory}" "${opt_currently_running}" ; then |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
669 if [ -n "${opt_currently_running}" ]; then |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
670 freebsd-update -b "${directory}" --currently-running "${opt_currently_running}" ${operations} |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
671 else |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
672 freebsd-update -b "${directory}" ${operations} |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
673 fi |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
674 else |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
675 echo "ERROR: Userland version mismatch" 1>&2 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
676 return 1 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
677 fi |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
678 } |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
679 |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
680 |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
681 # |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
682 # Global option handling |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
683 # |
|
81
124faa20ae80
Implemented a "-V" global option to print the program's name and version number to stdout
Franz Glasner <fzglas.hg@dom66.de>
parents:
80
diff
changeset
|
684 while getopts "Vh" _opt ; do |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
685 case ${_opt} in |
|
81
124faa20ae80
Implemented a "-V" global option to print the program's name and version number to stdout
Franz Glasner <fzglas.hg@dom66.de>
parents:
80
diff
changeset
|
686 V) |
|
386
84d2735fe7f6
Simplified version tagging a lot: it is also faster now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
366
diff
changeset
|
687 printf 'fjail %s\n' '@@SIMPLEVERSIONSTR@@' |
|
81
124faa20ae80
Implemented a "-V" global option to print the program's name and version number to stdout
Franz Glasner <fzglas.hg@dom66.de>
parents:
80
diff
changeset
|
688 exit 0 |
|
124faa20ae80
Implemented a "-V" global option to print the program's name and version number to stdout
Franz Glasner <fzglas.hg@dom66.de>
parents:
80
diff
changeset
|
689 ;; |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
690 h) |
| 75 | 691 echo "${USAGE}" |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
692 exit 0 |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
693 ;; |
|
80
f5cf08e8d246
Handle the error case when option handling fails because of wrong case labels
Franz Glasner <fzglas.hg@dom66.de>
parents:
77
diff
changeset
|
694 \?) |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
695 exit 2; |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
696 ;; |
|
80
f5cf08e8d246
Handle the error case when option handling fails because of wrong case labels
Franz Glasner <fzglas.hg@dom66.de>
parents:
77
diff
changeset
|
697 *) |
|
f5cf08e8d246
Handle the error case when option handling fails because of wrong case labels
Franz Glasner <fzglas.hg@dom66.de>
parents:
77
diff
changeset
|
698 echo "ERROR: option handling failed" >&2 |
|
f5cf08e8d246
Handle the error case when option handling fails because of wrong case labels
Franz Glasner <fzglas.hg@dom66.de>
parents:
77
diff
changeset
|
699 exit 2 |
|
f5cf08e8d246
Handle the error case when option handling fails because of wrong case labels
Franz Glasner <fzglas.hg@dom66.de>
parents:
77
diff
changeset
|
700 ;; |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
701 esac |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
702 done |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
703 |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
704 # |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
705 # Reset the Shell's option handling system to prepare for handling |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
706 # command-local options. |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
707 # |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
708 shift $((OPTIND-1)) |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
709 OPTIND=1 |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
710 |
|
92
a8e76893140f
Extra error message if no command is given
Franz Glasner <fzglas.hg@dom66.de>
parents:
86
diff
changeset
|
711 test $# -gt 0 || { echo "ERROR: no command given" >&2; exit 2; } |
|
a8e76893140f
Extra error message if no command is given
Franz Glasner <fzglas.hg@dom66.de>
parents:
86
diff
changeset
|
712 |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
713 command="$1" |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
714 shift |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
715 |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
716 case "${command}" in |
| 73 | 717 datasets) |
| 718 command_datasets "$@" | |
| 719 ;; | |
|
194
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
720 mount) |
|
276
3c24b07240f2
Move the implementation of "mount" and "umount" into the new tool fzfs.
Franz Glasner <fzglas.hg@dom66.de>
parents:
265
diff
changeset
|
721 exec "$(dirname $0)/fzfs" mount "$@" |
|
194
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
722 ;; |
|
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
723 umount|unmount) |
|
276
3c24b07240f2
Move the implementation of "mount" and "umount" into the new tool fzfs.
Franz Glasner <fzglas.hg@dom66.de>
parents:
265
diff
changeset
|
724 exec "$(dirname $0)/fzfs" umount "$@" |
|
194
379d3178f3ce
mount and umount support for ZFS datasets: recursively mount and unmount
Franz Glasner <fzglas.hg@dom66.de>
parents:
193
diff
changeset
|
725 ;; |
| 73 | 726 privs) |
| 727 command_privs "$@" | |
| 728 ;; | |
|
76
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
729 populate) |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
730 command_populate "$@" |
|
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
731 ;; |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
732 configure) |
|
220
9addf133d208
FIX: Typo when calling the internal implementation of "configure"
Franz Glasner <f.glasner@feldmann-mg.com>
parents:
219
diff
changeset
|
733 command_configure "$@" |
|
219
39b736a91d0d
Begin a "configure" command for jails
Franz Glasner <fzglas.hg@dom66.de>
parents:
211
diff
changeset
|
734 ;; |
|
226
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
735 hostid) |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
736 command_hostid "$@" |
|
73f2436fdf86
Make "hostid" a separate command for printint hostid proposals
Franz Glasner <fzglas.hg@dom66.de>
parents:
225
diff
changeset
|
737 ;; |
|
77
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
738 copy) |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
739 command_copy "$@" |
|
5aab3a28895f
Implemented a "copy" command to employ zfs send/receive for recursively copying jail datasets
Franz Glasner <hg@dom66.de>
parents:
76
diff
changeset
|
740 ;; |
|
347
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
741 freebsd-update) |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
742 command_freebsd_update "$@" |
|
673505e96cea
Implement a "fjail freebsd-update": update "normal" jails and other directories where an OS is mounted
Franz Glasner <hg@dom66.de>
parents:
346
diff
changeset
|
743 ;; |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
744 *) |
|
76
fea2ef3ff89a
Populate an existing directory tree with the contents of base.txz
Franz Glasner <hg@dom66.de>
parents:
75
diff
changeset
|
745 echo "ERROR: unknown command \`${command}'" >&2 |
|
72
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
746 exit 2 |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
747 ;; |
|
929051be7845
Begin a simple (ZFS-related) jail setup tool
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff
changeset
|
748 esac |