update
This commit is contained in:
@@ -16,8 +16,16 @@
|
||||
[ -d "{{AGI_GENTOO_FROM_MP}}" ] || exit 5
|
||||
check_mode: false
|
||||
|
||||
- name: check for partitions
|
||||
shell: |
|
||||
grep '/dev/{{AGI_NBD_DEV}}p3' /proc/partitions && exit 0
|
||||
exit 1
|
||||
register: partitions_out
|
||||
failed_when: false
|
||||
|
||||
- block:
|
||||
|
||||
# old code
|
||||
|
||||
- name: create disklabel
|
||||
command: parted -s {{ AGI_install_disk }} mklabel {{ AGI_install_disklabel }}
|
||||
register: disklabel_out
|
||||
@@ -44,7 +52,7 @@
|
||||
# able to install to the MBR
|
||||
- name: create boot partition
|
||||
shell: |
|
||||
parted -s {{ AGI_install_disk }} mkpart primary ext2 1M 200M
|
||||
parted -s {{ AGI_install_disk }} mkpart primary {{'ext2' if AGI_install_bootloader != 'syslinux' else 'fat32'}} 1M 200M
|
||||
args:
|
||||
creates: "{{ AGI_install_disk }}p1"
|
||||
|
||||
@@ -65,7 +73,7 @@
|
||||
creates: "{{ AGI_install_disk }}p3"
|
||||
|
||||
- name: format boot partition
|
||||
filesystem: dev={{ AGI_install_disk }}p1 fstype=ext2 force=yes
|
||||
filesystem: dev={{ AGI_install_disk }}p1 fstype={{'ext2' if AGI_install_bootloader != 'syslinux' else 'vfat'}} force=yes
|
||||
check_mode: false
|
||||
when: not ansible_check_mode
|
||||
|
||||
@@ -85,7 +93,15 @@
|
||||
e2label {{ AGI_install_disk }}p3 root
|
||||
e2label {{ AGI_install_disk }}p1 boot
|
||||
mkswap -L swap "{{ AGI_install_disk }}p2"
|
||||
sync
|
||||
when: AGI_install_bootloader != 'syslinux'
|
||||
|
||||
- name: label partitions syslinux
|
||||
shell: |
|
||||
partprobe
|
||||
fatlabel {{ AGI_install_disk }}p3 root
|
||||
e2label {{ AGI_install_disk }}p1 boot
|
||||
mkswap -L swap "{{ AGI_install_disk }}p2"
|
||||
when: AGI_install_bootloader == 'syslinux'
|
||||
|
||||
when: false
|
||||
|
||||
@@ -100,15 +116,29 @@
|
||||
unit: sectors
|
||||
sector-size: 512
|
||||
|
||||
{{ AGI_install_disk }}p1 : start= 2048, size= 819200, type=83, bootable
|
||||
{{ AGI_install_disk }}p1 : start= 2048, size= 819200, type={{'83' if AGI_install_bootloader != 'syslinux' else 'c'}}, bootable
|
||||
{{ AGI_install_disk }}p2 : start= 821248, size= 4096000, type=82
|
||||
{{ AGI_install_disk }}p3 : start= 4917248, size= 37025792, type=83
|
||||
EOF
|
||||
partprobe
|
||||
|
||||
- name: format disk partitions grub:2
|
||||
shell: |
|
||||
mke2fs -L boot {{ AGI_install_disk }}p1
|
||||
mke2fs -L root {{ AGI_install_disk }}p3
|
||||
mkswap -L swap "{{ AGI_install_disk }}p2"
|
||||
sync
|
||||
|
||||
when: true
|
||||
|
||||
when: AGI_install_bootloader != 'syslinux'
|
||||
|
||||
- name: format disk partitions syslinux
|
||||
shell: |
|
||||
mkfs.vfat -F 32 -n boot {{ AGI_install_disk }}p1
|
||||
mke2fs -L root {{ AGI_install_disk }}p3
|
||||
mkswap -L swap "{{ AGI_install_disk }}p2"
|
||||
|
||||
when: AGI_install_bootloader == 'syslinux'
|
||||
|
||||
when:
|
||||
- partitions_out.rc != 0
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user