From 8c34b5ffa988f7e772de39d9d27436c435590109 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 6 May 2014 12:31:06 -0500 Subject: [PATCH] ARM: kickstart cleanups remove vfat kickstarts, we are going to use u-boot in raw space without needing two sets of images with different partitioning we can remove the seperate partitioning snippets and put the partitioning in base. --- fedora-arm-base.ks | 4 ++++ fedora-arm-desktop-vfat.ks | 12 ------------ fedora-arm-kde-vfat.ks | 13 ------------- fedora-arm-kde.ks | 1 - fedora-arm-lxde-vfat.ks | 11 ----------- fedora-arm-lxde.ks | 1 - fedora-arm-mate-vfat.ks | 13 ------------- fedora-arm-mate.ks | 1 - fedora-arm-minimal-vfat.ks | 26 -------------------------- fedora-arm-minimal.ks | 1 - fedora-arm-partitioning.ks | 4 ---- fedora-arm-soas-vfat.ks | 11 ----------- fedora-arm-soas.ks | 1 - fedora-arm-vfat-partitioning.ks | 4 ---- fedora-arm-workstation.ks | 1 - fedora-arm-xfce-vfat.ks | 11 ----------- fedora-arm-xfce.ks | 1 - 17 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 fedora-arm-desktop-vfat.ks delete mode 100644 fedora-arm-kde-vfat.ks delete mode 100644 fedora-arm-lxde-vfat.ks delete mode 100644 fedora-arm-mate-vfat.ks delete mode 100644 fedora-arm-minimal-vfat.ks delete mode 100644 fedora-arm-partitioning.ks delete mode 100644 fedora-arm-soas-vfat.ks delete mode 100644 fedora-arm-vfat-partitioning.ks delete mode 100644 fedora-arm-xfce-vfat.ks diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index 7eb5f38..15f3cc7 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -7,6 +7,10 @@ firewall --enabled --service=mdns,ssh # configure extlinux bootloader bootloader extlinux +part /boot --size=512 --fstype ext3 +part swap --size=512 --fstype swap +part / --size=3000 --fstype ext4 + # make sure that initial-setup runs and lets us do all the configuration bits firstboot --reconfig diff --git a/fedora-arm-desktop-vfat.ks b/fedora-arm-desktop-vfat.ks deleted file mode 100644 index 375c5e6..0000000 --- a/fedora-arm-desktop-vfat.ks +++ /dev/null @@ -1,12 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-arm-xbase.ks -%include fedora-desktop-packages.ks -%include fedora-arm-vfat-partitioning.ks - -part / --size=4000 --fstype ext4 - -%packages --initial-setup - -%end - diff --git a/fedora-arm-kde-vfat.ks b/fedora-arm-kde-vfat.ks deleted file mode 100644 index 9c4848a..0000000 --- a/fedora-arm-kde-vfat.ks +++ /dev/null @@ -1,13 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-arm-xbase.ks -%include fedora-kde-packages.ks -%include fedora-arm-vfat-partitioning.ks - -part / --size=4000 --fstype ext4 - -%post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . - -%end diff --git a/fedora-arm-kde.ks b/fedora-arm-kde.ks index 6d8c0aa..c5abd5d 100644 --- a/fedora-arm-kde.ks +++ b/fedora-arm-kde.ks @@ -1,7 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-kde-packages.ks -%include fedora-arm-partitioning.ks part / --size=4000 --fstype ext4 diff --git a/fedora-arm-lxde-vfat.ks b/fedora-arm-lxde-vfat.ks deleted file mode 100644 index 3c18eac..0000000 --- a/fedora-arm-lxde-vfat.ks +++ /dev/null @@ -1,11 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-arm-xbase.ks -%include fedora-lxde-packages.ks -%include fedora-arm-vfat-partitioning.ks - -%post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . - -%end diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks index d0804ea..28a4a74 100644 --- a/fedora-arm-lxde.ks +++ b/fedora-arm-lxde.ks @@ -1,7 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-lxde-packages.ks -%include fedora-arm-partitioning.ks %post echo -n "Enabling initial-setup gui mode on startup" diff --git a/fedora-arm-mate-vfat.ks b/fedora-arm-mate-vfat.ks deleted file mode 100644 index ae3cc6f..0000000 --- a/fedora-arm-mate-vfat.ks +++ /dev/null @@ -1,13 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-arm-xbase.ks -%include fedora-mate-packages.ks -%include fedora-arm-vfat-partitioning.ks - -part / --size=5000 --fstype ext4 - -%post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . - -%end diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks index 15ee57d..7c0b5c9 100644 --- a/fedora-arm-mate.ks +++ b/fedora-arm-mate.ks @@ -1,7 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-mate-packages.ks -%include fedora-arm-partitioning.ks part / --size=5000 --fstype ext4 diff --git a/fedora-arm-minimal-vfat.ks b/fedora-arm-minimal-vfat.ks deleted file mode 100644 index b41873e..0000000 --- a/fedora-arm-minimal-vfat.ks +++ /dev/null @@ -1,26 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-arm-vfat-partitioning.ks - -part swap --size=128 --fstype swap -part / --size=1400 --fstype ext4 - -%packages --@standard --@dial-up --initial-setup-gui -%end - -%post - -# setup systemd to boot to the right runlevel -echo -n "Setting default runlevel to multiuser text mode" -rm -f /etc/systemd/system/default.target -ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target -echo . - -echo -n "Enabling initial-setup text mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service -echo . - -%end - diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index ae9fdc4..fd88555 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -1,5 +1,4 @@ %include fedora-arm-base.ks -%include fedora-arm-partitioning.ks part swap --size=128 --fstype swap part / --size=1400 --fstype ext4 diff --git a/fedora-arm-partitioning.ks b/fedora-arm-partitioning.ks deleted file mode 100644 index 32e59a3..0000000 --- a/fedora-arm-partitioning.ks +++ /dev/null @@ -1,4 +0,0 @@ -part /boot --size=512 --fstype ext3 -part swap --size=512 --fstype swap -part / --size=3000 --fstype ext4 - diff --git a/fedora-arm-soas-vfat.ks b/fedora-arm-soas-vfat.ks deleted file mode 100644 index d736cb5..0000000 --- a/fedora-arm-soas-vfat.ks +++ /dev/null @@ -1,11 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-arm-xbase.ks -%include fedora-soas-packages.ks -%include fedora-arm-vfat-partitioning.ks - -%post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . - -%end diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks index dc69b9c..3d87a0b 100644 --- a/fedora-arm-soas.ks +++ b/fedora-arm-soas.ks @@ -1,7 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-soas-packages.ks -%include fedora-arm-partitioning.ks %post echo -n "Enabling initial-setup gui mode on startup" diff --git a/fedora-arm-vfat-partitioning.ks b/fedora-arm-vfat-partitioning.ks deleted file mode 100644 index 3312ca8..0000000 --- a/fedora-arm-vfat-partitioning.ks +++ /dev/null @@ -1,4 +0,0 @@ -part /boot/uboot --size=20 --fstype vfat -part swap --size=512 --fstype swap -part / --size=3400 --fstype ext4 - diff --git a/fedora-arm-workstation.ks b/fedora-arm-workstation.ks index 7d758b4..bff5895 100644 --- a/fedora-arm-workstation.ks +++ b/fedora-arm-workstation.ks @@ -1,7 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-workstation-packages.ks -%include fedora-arm-partitioning.ks part / --size=5000 --fstype ext4 diff --git a/fedora-arm-xfce-vfat.ks b/fedora-arm-xfce-vfat.ks deleted file mode 100644 index ba42ac7..0000000 --- a/fedora-arm-xfce-vfat.ks +++ /dev/null @@ -1,11 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-arm-xbase.ks -%include fedora-xfce-packages.ks -%include fedora-arm-vfat-partitioning.ks - -%post -echo -n "Enabling initial-setup gui mode on startup" -ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service -echo . - -%end diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks index 7594d9f..5923c6b 100644 --- a/fedora-arm-xfce.ks +++ b/fedora-arm-xfce.ks @@ -1,7 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-xfce-packages.ks -%include fedora-arm-partitioning.ks %post echo -n "Enabling initial-setup gui mode on startup"