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
32542760
Commit
32542760
authored
Apr 09, 2019
by
Matti Hyttinen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set root value for refind when luks is used
parent
7eb4fa89
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
20 deletions
+8
-20
lib/util-base.sh
lib/util-base.sh
+8
-20
No files found.
lib/util-base.sh
View file @
32542760
...
...
@@ -506,24 +506,12 @@ install_refind()
sed
-i
"s|
\"
$|
\
$rootflag
\"
|g"
/mnt/boot/refind_linux.conf
fi
# 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
# LUKS
if
[[
$LUKS
==
1
]]
;
then
mapper_name
=
"
$(
mount |
awk
'/\/mnt / {print $1}'
)
"
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')"
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
sed
-i
"s|root=.* |
$luks_opt
root=
$mapper_name
|g"
/mnt/boot/refind_linux.conf
sed
-i
'/Boot with minimal options/d'
/mnt/boot/refind_linux.conf
fi
# Figure out microcode
...
...
@@ -647,14 +635,14 @@ pacman -S --noconfirm grub-theme-manjaro" > ${MOUNTPOINT}/usr/bin/grub_installer
# If encryption used amend grub
if
[[
$(
cat
/tmp/.luks_dev
)
!=
""
]]
;
then
sed
-i
'/noconfirm grub-theme-manjaro/d'
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
echo
"sed -i
\"
s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=
\
\\"
"
$(
cat
/tmp/.luks_dev |
awk
'{print $1}'
)
\\\"
~g
\"
" /etc/default/grub"
>>
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
&&
echo
"adding kernel parameter
$(
cat
/tmp/.luks_dev
)
"
echo
"sed -i
\"
s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=
\
"
$(
cat
/tmp/.luks_dev
)
\"
~g"
/etc/default/grub
\"
>>
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
echo
"pacman -S --noconfirm grub-theme-manjaro"
>>
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
fi
# If Full disk encryption is used, use a keyfile
if
$fde
;
then
echo
"Full disk encryption enabled"
sed
-i
'/noconfirm grub-theme-manjaro/d'
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
echo
'grep -q "^GRUB_ENABLE_CRYPTODISK=y" /etc/default/grub || sed -i "s/#GRUB_ENABLE_CRYPTODISK=y/GRUB_ENABLE_CRYPTODISK=y/" /etc/default/grub'
>>
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
echo
'grep -q "^GRUB_ENABLE_CRYPTODISK=y" /etc/default/grub || \
sed -i "s/#GRUB_ENABLE_CRYPTODISK=y/GRUB_ENABLE_CRYPTODISK=y/" /etc/default/grub'
>>
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
echo
"pacman -S --noconfirm grub-theme-manjaro"
>>
${
MOUNTPOINT
}
/usr/bin/grub_installer.sh
fi
...
...
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