fixes
This commit is contained in:
parent
0500c02755
commit
e2a316f6b7
|
@ -18,7 +18,7 @@ if [[ -n "${cfg[wipe]}" ]]; then
|
||||||
w
|
w
|
||||||
q" | fdisk "${cfg[diskname]}" > /dev/null
|
q" | fdisk "${cfg[diskname]}" > /dev/null
|
||||||
fi
|
fi
|
||||||
|
sleep 2
|
||||||
if [[ "${cfg[fde_key_store]}" == "once" ]]; then
|
if [[ "${cfg[fde_key_store]}" == "once" ]]; then
|
||||||
echo "create bootpartition"
|
echo "create bootpartition"
|
||||||
target_boot="${cfg[diskname]}1"
|
target_boot="${cfg[diskname]}1"
|
||||||
|
@ -30,6 +30,7 @@ if [[ "${cfg[fde_key_store]}" == "once" ]]; then
|
||||||
a
|
a
|
||||||
w
|
w
|
||||||
q" | fdisk "${cfg[diskname]}" > /dev/null
|
q" | fdisk "${cfg[diskname]}" > /dev/null
|
||||||
|
sleep 2
|
||||||
if [[ "${cfg[rootfssize]}" == "rest" ]]; then
|
if [[ "${cfg[rootfssize]}" == "rest" ]]; then
|
||||||
target_partition_tmp="${cfg[diskname]}2"
|
target_partition_tmp="${cfg[diskname]}2"
|
||||||
echo "create rootfs"
|
echo "create rootfs"
|
||||||
|
@ -76,22 +77,27 @@ else
|
||||||
q" | fdisk "${cfg[diskname]}" > /dev/null
|
q" | fdisk "${cfg[diskname]}" > /dev/null
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
sleep 2
|
||||||
|
|
||||||
target_partition="${target_partition_tmp}"
|
target_partition="${target_partition_tmp}"
|
||||||
if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
|
if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
|
||||||
echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||||
|
sleep 1
|
||||||
echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||||
|
sleep 1
|
||||||
#echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
#echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||||
#echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
#echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||||
target_partition="/dev/mapper/voidluks-${diskid}"
|
target_partition="/dev/mapper/voidluks-${diskid}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkswap "${target_partition}"
|
mkswap "${target_partition}"
|
||||||
|
sleep 1
|
||||||
vgcreate -q -f "voidvg.${diskid}" "${target_partition}" || exit 1
|
vgcreate -q -f "voidvg.${diskid}" "${target_partition}" || exit 1
|
||||||
|
sleep 1
|
||||||
lvcreate -q -y --name swap -L "${cfg[swapsize]}"G "voidvg.${diskid}"
|
lvcreate -q -y --name swap -L "${cfg[swapsize]}"G "voidvg.${diskid}"
|
||||||
|
sleep 1
|
||||||
lvcreate -q -y --name root -l 100%FREE "voidvg.${diskid}"
|
lvcreate -q -y --name root -l 100%FREE "voidvg.${diskid}"
|
||||||
|
sleep 1
|
||||||
mkfs.btrfs -q -f "/dev/mapper/voidvg.${diskid}-root"
|
mkfs.btrfs -q -f "/dev/mapper/voidvg.${diskid}-root"
|
||||||
mkswap "/dev/mapper/voidvg.${diskid}-swap"
|
mkswap "/dev/mapper/voidvg.${diskid}-swap"
|
||||||
mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
|
mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
|
||||||
|
|
|
@ -4,13 +4,6 @@ fi
|
||||||
|
|
||||||
module start "disk" "Partition disk"
|
module start "disk" "Partition disk"
|
||||||
|
|
||||||
|
|
||||||
#umounter "${dest}" || exit
|
|
||||||
|
|
||||||
#if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
|
|
||||||
# addpkg cryptsetup
|
|
||||||
#fi
|
|
||||||
|
|
||||||
diskid="${cfg[diskid]//-/_}"
|
diskid="${cfg[diskid]//-/_}"
|
||||||
if [[ -n "${cfg[wipe]}" ]]; then
|
if [[ -n "${cfg[wipe]}" ]]; then
|
||||||
echo "Formatting disk"
|
echo "Formatting disk"
|
||||||
|
@ -24,7 +17,7 @@ if [[ -n "${cfg[wipe]}" ]]; then
|
||||||
w
|
w
|
||||||
q" | fdisk "${cfg[diskname]}" > /dev/null
|
q" | fdisk "${cfg[diskname]}" > /dev/null
|
||||||
fi
|
fi
|
||||||
|
sleep 2
|
||||||
if [[ "${cfg[fde_key_store]}" == "once" ]]; then
|
if [[ "${cfg[fde_key_store]}" == "once" ]]; then
|
||||||
echo "create bootpartition"
|
echo "create bootpartition"
|
||||||
target_boot="${cfg[diskname]}2"
|
target_boot="${cfg[diskname]}2"
|
||||||
|
@ -34,6 +27,7 @@ if [[ "${cfg[fde_key_store]}" == "once" ]]; then
|
||||||
+${cfg[bootsize]}G
|
+${cfg[bootsize]}G
|
||||||
w
|
w
|
||||||
q" | fdisk "${cfg[diskname]}" > /dev/null
|
q" | fdisk "${cfg[diskname]}" > /dev/null
|
||||||
|
sleep 2
|
||||||
if [[ "${cfg[rootfssize]}" == "rest" ]]; then
|
if [[ "${cfg[rootfssize]}" == "rest" ]]; then
|
||||||
target_partition_tmp="${cfg[diskname]}3"
|
target_partition_tmp="${cfg[diskname]}3"
|
||||||
echo "create rootfs"
|
echo "create rootfs"
|
||||||
|
@ -76,22 +70,27 @@ else
|
||||||
q" | fdisk "${cfg[diskname]}" > /dev/null
|
q" | fdisk "${cfg[diskname]}" > /dev/null
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
sleep 2
|
||||||
|
|
||||||
target_partition="${target_partition_tmp}"
|
target_partition="${target_partition_tmp}"
|
||||||
if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
|
if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
|
||||||
echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||||
|
sleep 1
|
||||||
echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||||
|
sleep 1
|
||||||
#echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
#echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||||
#echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
#echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||||
target_partition="/dev/mapper/voidluks-${diskid}"
|
target_partition="/dev/mapper/voidluks-${diskid}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkswap "${target_partition}"
|
mkswap "${target_partition}"
|
||||||
|
sleep 1
|
||||||
vgcreate -q -f "voidvg.${diskid}" "${target_partition}" || exit 1
|
vgcreate -q -f "voidvg.${diskid}" "${target_partition}" || exit 1
|
||||||
|
sleep 1
|
||||||
lvcreate -q -y --name swap -L "${cfg[swapsize]}"G "voidvg.${diskid}"
|
lvcreate -q -y --name swap -L "${cfg[swapsize]}"G "voidvg.${diskid}"
|
||||||
|
sleep 1
|
||||||
lvcreate -q -y --name root -l 100%FREE "voidvg.${diskid}"
|
lvcreate -q -y --name root -l 100%FREE "voidvg.${diskid}"
|
||||||
|
sleep 1
|
||||||
mkfs.btrfs -q -f "/dev/mapper/voidvg.${diskid}-root"
|
mkfs.btrfs -q -f "/dev/mapper/voidvg.${diskid}-root"
|
||||||
mkswap "/dev/mapper/voidvg.${diskid}-swap"
|
mkswap "/dev/mapper/voidvg.${diskid}-swap"
|
||||||
mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
|
mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
|
||||||
|
|
Loading…
Reference in New Issue