Commit rename

[distgen] / lib / device.sh

diff --git a/lib/device.sh b/lib/device.sh
index 1957287df014d66560349bf4012640f12bc0c8e7..a4d4f510bab3a12ddad0bc2c3482e04125ed18ef 100644 (file)
--- a/lib/device.sh
+++ b/lib/device.sh
@@ -5,101 +5,46 @@ for i in ${SDA} ${SDB}; do
        # Create empty file of 8GB
        dd if=/dev/zero of=${i} bs=$((8192*1024)) count=1024
        # Create partition table
        # Create empty file of 8GB
        dd if=/dev/zero of=${i} bs=$((8192*1024)) count=1024
        # Create partition table

-       #XXX: we generate gpt table then fake mbr compat one
-       cat << EOF | fdisk ${i}
-g
+       #XXX: we generate gpt table
+       cat << EOF | gdisk ${i}
+o
+Y

 n
 1
 2048
 n
 1
 2048

-+256M
-t
-29
++2M
+ef02

 n
 2
 n
 2

-526336
-+4G
-t
-2
-29
-n
-3
-8914944
-+2G
-t
-3
-19
-n
-4
-13109248
-16777182
-t
-4
-29
-x
-A
-1
-M
-r
-d
-n
-p
-1
-2048
+

 +256M
 +256M

-t
-fd
+fd00

 n
 n

-p
-2
-526336
-+4G
-t
-2
-fd
-n
-p

 3
 3

-8914944
+

 +2G
 +2G

-t
-3
-82
+8200

 n
 n

-p
-13109248
-16777182
-t

 4
 4

-fd
-a
-1
-p
-x
-M
-r
-p
+
+
+fd00

 w
 w

+Y

 EOF
        # Add it with partition scan
        losetup -f -P ${i}
 done
 
 # Create raids
 EOF
        # Add it with partition scan
        losetup -f -P ${i}
 done
 
 # Create raids

-mdadm --create /dev/md/${MDBOOT} --level=1 --metadata=0.90 --homehost=${NETHOSTNAME} --name=${MDBOOT} --assume-clean --raid-devices=2 ${LOOPA}p1 ${LOOPB}p1
-mdadm --create /dev/md/${MDSLASH} --level=1 --metadata=default --homehost=${NETHOSTNAME} --name=${MDSLASH} --assume-clean --raid-devices=2 ${LOOPA}p2 ${LOOPB}p2
+#XXX: grub2 support standard linux raid1 device
+#mdadm --create /dev/md/${MDBOOT} --level=1 --metadata=0.90 --homehost=${NETHOSTNAME} --name=${MDBOOT} --assume-clean --raid-devices=2 ${LOOPA}p2 ${LOOPB}p2
+mdadm --create /dev/md/${MDBOOT} --level=1 --metadata=default --homehost=${NETHOSTNAME} --name=${MDBOOT} --assume-clean --raid-devices=2 ${LOOPA}p2 ${LOOPB}p2

 mdadm --create /dev/md/${MDDATA} --level=1 --metadata=default --homehost=${NETHOSTNAME} --name=${MDDATA} --assume-clean --raid-devices=2 ${LOOPA}p4 ${LOOPB}p4
 
 # Create slash luks partition
 #XXX: low iter time, should need around 100000 minimum
 mdadm --create /dev/md/${MDDATA} --level=1 --metadata=default --homehost=${NETHOSTNAME} --name=${MDDATA} --assume-clean --raid-devices=2 ${LOOPA}p4 ${LOOPB}p4
 
 # Create slash luks partition
 #XXX: low iter time, should need around 100000 minimum

-echo -n $LUKSPASSWORD | cryptsetup -c aes-xts-plain64 -h sha512 -s 512 --iter-time 2000 --use-urandom --uuid ${LUKSSLASHUUID} -d - --batch-mode luksFormat /dev/md/${MDSLASH} 
-
-# Open luks partition
-echo -n $LUKSPASSWORD | cryptsetup -d - --batch-mode luksOpen /dev/md/${MDSLASH} ${SLASHNAME}
-
-# Create data luks partition
-#XXX: low iter time, should need around 100000 minimum
-echo -n $LUKSPASSWORD | cryptsetup -c aes-xts-plain64 -h sha512 -s 512 --iter-time 2000 --use-urandom --uuid ${LUKSDATAUUID} -d - --batch-mode luksFormat /dev/md/${MDDATA} 
+echo -n $LUKSPASSWORD | cryptsetup -c aes-xts-plain64 -h sha512 -s 512 --iter-time 2000 --use-urandom --uuid ${LUKSDATAUUID} -d - --batch-mode luksFormat /dev/md/${MDDATA}

 
 # Open luks partition
 echo -n $LUKSPASSWORD | cryptsetup -d - --batch-mode luksOpen /dev/md/${MDDATA} ${DATANAME}
 
 # Open luks partition
 echo -n $LUKSPASSWORD | cryptsetup -d - --batch-mode luksOpen /dev/md/${MDDATA} ${DATANAME}

-