import fixes from Kali's method

This commit is contained in:
Nicholas D Steeves 2021-01-20 03:23:32 -05:00 committed by Cyril Brulebois
parent 1ad33a62ea
commit c082c32de0

View file

@ -11,14 +11,19 @@ pass=$6
case $type in
btrfs)
if [ "$mp" = "/" ]; then
mount -t btrfs ${options:+-o "$options"} $fs /target/ || exit 1
btrfs subvolume create /target/@rootfs || exit 1
umount /target || exit 1
mount -t btrfs ${options:+-o "$options,subvol=@rootfs"} $fs /target || exit 1
else
mount -t btrfs ${options:+-o "$options"} $fs /target"$mp" || exit 1
fi
# import workaround from Kali's partman-btrfs commit:7f43d2c
options="${options%,subvol=*}"
#for removing the option subvol,when thats the only option
#eg: options=="subvol=@", no comma present
options="${options%subvol=*}"
mount -t btrfs ${options:+-o "$options"} $fs /target"$mp" || exit 1
if [ $mp = / ]; then
btrfs subvolume create /target$mp/@rootfs
chmod 755 /target$mp/@rootfs
umount /target$mp
options="${options:+$options,}subvol=@rootfs"
mount -t btrfs -o $options $fs /target$mp
fi
echo "umount /target$mp"
exit 0
;;