Preservation/kaiten-yaki
1
0
Fork 0
mirror of https://github.com/suikan4github/kaiten-yaki.git synced 2025-12-20 02:21:17 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs support

Browse source 
Fail to install the ubuntu when the / volume is btrfs
 #24
This commit is contained in:
Suikan 2021-07-12 17:55:02 +09:00
parent 456cbf87cd
commit 47b40316c0
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
script/lib/common.sh
View file

@ -291,8 +291,9 @@ function para_install_msg() {
function post_install() { function post_install() {
## Mount the target file system ## Mount the target file system
# ${TARGETMOUNTPOINT} is created by the GUI/TUI installer # ${TARGETMOUNTPOINT} is created by the GUI/TUI installer
# ${BTRFSOPTION} is defined by the caller of this function for BTRFS formated volume.
echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}." echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}."
mount /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" "${TARGETMOUNTPOINT}" mount "${BTRFSOPTION}" /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" "${TARGETMOUNTPOINT}"
# And mount other directories # And mount other directories
echo "...Mounting all other dirs." echo "...Mounting all other dirs."

9
script/ubuntu-kaiten-yaki.sh
View file

@ -53,6 +53,15 @@ function main() {
# Post-install stage # Post-install stage
# ******************************************************************************* # *******************************************************************************
# If the target volume is formated by btrfs, Ubiquity install the root into the
# @ sub-volume. Thus, mount command inside post_install have to use special option
# to specify @ as mount target.
if lsblk -o NAME,FSTYPE | grep -i "${VGNAME}-${LVROOTNAME}" | grep -i "btrfs" > /dev/null ; then
export BTRFSOPTION="-o subvol=@"
else
export BTRFSOPTION=""
fi
# Distribution dependent finalizing. Embedd encryption key into the ramfs image. # Distribution dependent finalizing. Embedd encryption key into the ramfs image.
# The script is parameterized by env-variable to fit to the distribution # The script is parameterized by env-variable to fit to the distribution
post_install post_install

3
script/void-kaiten-yaki.sh
View file

@ -74,6 +74,9 @@ function main() {
# Post-install stage # Post-install stage
# ******************************************************************************* # *******************************************************************************
# We don't need special option for BTRFSOPTION.
export BTRFSOPTION=""
# Distribution dependent finalizing. Embedd encryption key into the ramfs image. # Distribution dependent finalizing. Embedd encryption key into the ramfs image.
# The script is parameterized by env-variable to fit to the distribution # The script is parameterized by env-variable to fit to the distribution
post_install post_install