Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
manjaro-architect
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
61
Issues
61
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Applications
manjaro-architect
Commits
dc593e3c
Commit
dc593e3c
authored
Apr 03, 2019
by
Matti Hyttinen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify the luks options in refind
parent
3a07ed52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
11 deletions
+15
-11
lib/util-advanced.sh
lib/util-advanced.sh
+1
-1
lib/util-base.sh
lib/util-base.sh
+14
-10
No files found.
lib/util-advanced.sh
View file @
dc593e3c
...
...
@@ -674,7 +674,7 @@ if DIALOG " Hibernation setup " --yesno "\nAre you sure you want to enable hiber
if
!
[[
-e
/mnt/etc/fstab
]]
;
then
generate_fstab
fi
basestrap
${
MOUNTPOINT
}
"hibernator"
inst_needed
"hibernator"
arch_chroot
"hibernator"
2>
$ERR
check_for_error
"Running hibernator"
$?
[[
$?
==
0
]]
&&
DIALOG
" Hibernation setup "
--infobox
"
\n
Hibernator was successfully run
\n
"
0 0
...
...
lib/util-base.sh
View file @
dc593e3c
...
...
@@ -498,18 +498,22 @@ install_refind()
# LVM on LUKS
if
[[
$LUKS
==
1
]]
&&
[[
$(
lsblk
-i
|
sed
-r
's/^[^[:alnum:]]+//'
|
grep
"/mnt$"
|
awk
'{print $6}'
)
==
lvm
]]
;
then
mapper_name
=
"
$(
mount |
awk
'/\/mnt / {print $1}'
)
"
ROOTY_PARTY
=
"/dev/
$(
lsblk
-i
|
sed
-r
's/^[^[:alnum:]]+//'
|
grep
-B2
"
$root_name
"
|
awk
'/part/ {print $1}'
|
cut
-c
3-
)
"
bl_root
=
"PARTUUID=
$(
blkid
-s
PARTUUID
${
ROOTY_PARTY
}
|
sed
's/.*=//g'
|
sed
's/"//g'
)
"
crypt_name
=
"
$(
lsblk
-i
|
sed
-r
's/^[^[:alnum:]]+//'
|
grep
-B1
"
$root_name
"
|
awk
'/crypt/ {print $1}'
|
cut
-c
3-
)
"
sed
-i
"s|root=.* |cryptdevice=
$bl_root
:
$crypt_name
root=
$mapper_name
|g"
/mnt/boot/refind_linux.conf
sed
-i
'/Boot with minimal options/d'
/mnt/boot/refind_linux.conf
#mapper_name="$(mount | awk '/\/mnt / {print $1}')"
#ROOTY_PARTY="/dev/$(lsblk -i | sed -r 's/^[^[:alnum:]]+//' | grep -B2 "$root_name" | awk '/part/ {print $1}' | cut -c 3-)"
#bl_root="PARTUUID=$(blkid -s PARTUUID ${ROOTY_PARTY} | sed 's/.*=//g' | sed 's/"//g')"
#crypt_name="$(lsblk -i | sed -r 's/^[^[:alnum:]]+//' | grep -B1 "$root_name" | awk '/crypt/ {print $1}' | cut -c 3-)"
#sed -i "s|root=.* |cryptdevice=$bl_root:$crypt_name root=$mapper_name |g" /mnt/boot/refind_linux.conf
#sed -i '/Boot with minimal options/d' /mnt/boot/refind_linux.conf
luks_opt
=
$(
cat
/tmp/.luks_dev
)
sed
-i
"s|root=.* |
$luks_opt
|g"
/mnt/boot/refind_linux.conf
sed
-i
'/Boot with minimal options/d'
/mnt/boot/refind_linux.conf
# Plain LUKS
elif
[[
$LUKS
==
1
]]
;
then
mapper_name
=
"
$(
mount |
awk
'/\/mnt / {print $1}'
)
"
ROOTY_PARTY
=
"/dev/
$(
lsblk
-i
|
sed
-r
's/^[^[:alnum:]]+//'
|
grep
-B1
"
$root_name
"
|
awk
'/part/ {print $1}'
|
cut
-c
3-
)
"
bl_root
=
"PARTUUID=
$(
blkid
-s
PARTUUID
${
ROOTY_PARTY
}
|
sed
's/.*=//g'
|
sed
's/"//g'
)
"
sed
-i
"s|root=.* |cryptdevice=
$bl_root
:
$root_name
root=
$mapper_name
|g"
/mnt/boot/refind_linux.conf
#mapper_name="$(mount | awk '/\/mnt / {print $1}')"
#ROOTY_PARTY="/dev/$(lsblk -i | sed -r 's/^[^[:alnum:]]+//' | grep -B1 "$root_name" | awk '/part/ {print $1}' | cut -c 3-)"
#bl_root="PARTUUID=$(blkid -s PARTUUID ${ROOTY_PARTY} | sed 's/.*=//g' | sed 's/"//g')"
luks_opt
=
$(
cat
/tmp/.luks_dev
)
sed
-i
"s|root=.* |
$luks_opt
|g"
/mnt/boot/refind_linux.conf
sed
-i
'/Boot with minimal options/d'
/mnt/boot/refind_linux.conf
fi
# Figure out microcode
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment