diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2021-11-16 14:25:13 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2021-11-16 14:25:13 +0100 |
| commit | ca0d44eadabefa305c30bd5af43a33a852fc4a6d (patch) | |
| tree | c5f1e8289b0fb72778ccad48bd805d08f2eb5214 /setup-disk.in | |
| parent | b0600bfc61aaeea165e36a610425a93ef901d931 (diff) | |
| download | alpine-conf-ca0d44eadabefa305c30bd5af43a33a852fc4a6d.zip | |
setup-disk: fix kernel options with encrypted root
We should append the kernel options for cryptroot, not replace. This is
so nomodeset, quiet and other options are kept.
Diffstat (limited to 'setup-disk.in')
| -rw-r--r-- | setup-disk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup-disk.in b/setup-disk.in index 5754c04..2f310fc 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -619,7 +619,7 @@ install_mounted_root() { if cryptsetup status "$cryptroot" 2>&1 >/dev/null; then cryptroot=$(cryptsetup status "$cryptroot" | awk '/device:/ { print $2 }') cryptroot=$(uuid_or_device $cryptroot) - kernel_opts="cryptroot=$cryptroot cryptdm=root" + kernel_opts="cryptroot=$cryptroot cryptdm=root $kernel_opts" root=$([ -n "$pvs" ] && echo "$rootdev" || echo "/dev/mapper/root") fi |