From 6c8564633bbe32b7c37510fe903378872987ecde Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Thu, 30 Jan 2025 16:47:08 -0600 Subject: [PATCH] fedora-disk-dch: Factor out disk layout This will allow the `fedora-rpi-common.ks` kickstart fragment to be more composeable, making it usable for systems other than "servers" that may need a different disk layout. --- fedora-disk-dch.ks | 9 +++++++++ fedora-rpi-common.ks | 8 -------- fedora-rpi-nvme-noswap.ks | 1 + fedora-rpi.ks | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 fedora-disk-dch.ks diff --git a/fedora-disk-dch.ks b/fedora-disk-dch.ks new file mode 100644 index 0000000..e0bc7d8 --- /dev/null +++ b/fedora-disk-dch.ks @@ -0,0 +1,9 @@ +# vim: set ft=sh : +part /boot/efi --fstype vfat --size 128 --label RASPBERRYPI +part /boot --fstype ext4 --size 512 --label boot +part pv.01 --size 1 --grow +volgroup fedora pv.01 +logvol / --fstype ext4 --name rootfs --vgname fedora --size 3072 --label rootfs +logvol /var --fstype ext4 --name var --vgname fedora --size 1024 --label var --grow +logvol /var/log --fstype ext4 --name var_log --vgname fedora --size 1024 --label var-log +logvol /home --fstype ext4 --name home --vgname fedora --size 100 --label home diff --git a/fedora-rpi-common.ks b/fedora-rpi-common.ks index e6d3f6a..8256d61 100644 --- a/fedora-rpi-common.ks +++ b/fedora-rpi-common.ks @@ -1,14 +1,6 @@ # vim: set ft=sh : bootloader --location none clearpart --all --initlabel --disklabel msdos -part /boot/efi --fstype vfat --size 128 --label RASPBERRYPI -part /boot --fstype ext4 --size 512 --label boot -part pv.01 --size 1 --grow -volgroup fedora pv.01 -logvol / --fstype ext4 --name rootfs --vgname fedora --size 3072 --label rootfs -logvol /var --fstype ext4 --name var --vgname fedora --size 1024 --label var --grow -logvol /var/log --fstype ext4 --name var_log --vgname fedora --size 1024 --label var-log -logvol /home --fstype ext4 --name home --vgname fedora --size 100 --label home timesource --ntp-pool 2.fedora.pool.ntp.org diff --git a/fedora-rpi-nvme-noswap.ks b/fedora-rpi-nvme-noswap.ks index 2bd3b24..d03cf4f 100644 --- a/fedora-rpi-nvme-noswap.ks +++ b/fedora-rpi-nvme-noswap.ks @@ -1,4 +1,5 @@ # vim: set ft=sh : +%include http://git.pyrocufflink.net/infra/kickstart/raw/branch/master/fedora-disk-dch.ks %include http://git.pyrocufflink.net/infra/kickstart/raw/branch/master/fedora-rpi-common.ks ignoredisk --only-use /dev/nvme0n1 diff --git a/fedora-rpi.ks b/fedora-rpi.ks index 058290c..194248d 100644 --- a/fedora-rpi.ks +++ b/fedora-rpi.ks @@ -1,4 +1,4 @@ # vim: set ft=sh : ignoredisk --only-use /dev/mmcblk0 - +%include http://git.pyrocufflink.net/infra/kickstart/raw/branch/master/fedora-disk-dch.ks %include http://git.pyrocufflink.net/infra/kickstart/raw/branch/master/fedora-rpi-common.ks