Merging upstream version 4.3.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
07b992239b
commit
0a7cc54657
13 changed files with 76 additions and 100 deletions
|
@ -63,8 +63,7 @@ function names_verify() {
|
|||
names_make_conf() {
|
||||
local UUID="$1"
|
||||
local WANTED_DEVNAME="$2"
|
||||
local WANTED_NAME="$3"
|
||||
local CONF="$4"
|
||||
local CONF="$3"
|
||||
|
||||
local LINE="ARRAY metadata=1.2 UUID=$UUID"
|
||||
|
||||
|
@ -72,9 +71,5 @@ names_make_conf() {
|
|||
LINE="$LINE $WANTED_DEVNAME"
|
||||
fi
|
||||
|
||||
if [[ "$WANTED_NAME" != "empty" ]]; then
|
||||
LINE="$LINE name=$WANTED_NAME"
|
||||
fi
|
||||
|
||||
echo $LINE > $CONF
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue