mirror of
https://github.com/suikan4github/kaiten-yaki.git
synced 2025-12-20 02:21:17 -03:00
btrfs support
Fail to install the ubuntu when the / volume is btrfs #24
This commit is contained in:
parent
456cbf87cd
commit
47b40316c0
3 changed files with 14 additions and 1 deletions
|
|
@ -291,8 +291,9 @@ function para_install_msg() {
|
|||
function post_install() {
|
||||
## Mount the target file system
|
||||
# ${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}."
|
||||
mount /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" "${TARGETMOUNTPOINT}"
|
||||
mount "${BTRFSOPTION}" /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" "${TARGETMOUNTPOINT}"
|
||||
|
||||
# And mount other directories
|
||||
echo "...Mounting all other dirs."
|
||||
|
|
|
|||
|
|
@ -53,6 +53,15 @@ function main() {
|
|||
# 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.
|
||||
# The script is parameterized by env-variable to fit to the distribution
|
||||
post_install
|
||||
|
|
|
|||
|
|
@ -74,6 +74,9 @@ function main() {
|
|||
# Post-install stage
|
||||
# *******************************************************************************
|
||||
|
||||
# We don't need special option for BTRFSOPTION.
|
||||
export BTRFSOPTION=""
|
||||
|
||||
# Distribution dependent finalizing. Embedd encryption key into the ramfs image.
|
||||
# The script is parameterized by env-variable to fit to the distribution
|
||||
post_install
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue