merge
This commit is contained in:
commit
1e04852c3d
|
@ -67,8 +67,11 @@ the broken processes.
|
||||||
flags processes matching the program name
|
flags processes matching the program name
|
||||||
.I regexp
|
.I regexp
|
||||||
as not to be killed in the event of memory
|
as not to be killed in the event of memory
|
||||||
exhaustion. This is usualy run from termrc
|
exhaustion. This is usually run from
|
||||||
and cpurc (see
|
.B termrc
|
||||||
|
and
|
||||||
|
.B cpurc
|
||||||
|
(see
|
||||||
.IR cpurc (8))
|
.IR cpurc (8))
|
||||||
to protect important system processes from
|
to protect important system processes from
|
||||||
getting killed.
|
getting killed.
|
||||||
|
|
|
@ -21,12 +21,10 @@ device.
|
||||||
.PP
|
.PP
|
||||||
The
|
The
|
||||||
.B -f
|
.B -f
|
||||||
flag formats the partitions
|
flag formats the partition
|
||||||
.I files,
|
.I files,
|
||||||
generating a new encryption key. The encryption key is
|
generating a new encryption key. The user will be prompted
|
||||||
protected by a password that
|
for a password that will be used to protect the encryption key.
|
||||||
.I cryptsetup
|
|
||||||
will prompt for confirmation.
|
|
||||||
.PP
|
.PP
|
||||||
The flags
|
The flags
|
||||||
.B -i
|
.B -i
|
||||||
|
|
Loading…
Reference in a new issue