[spin-kickstarts/arm] some cleanups needed for livemedia-creator add minimal panda kickstart

[Dennis Gilmore]

commit b132b857b97cf46f1037f2c01ce54288b94a0c25
Author: Dennis Gilmore <dennis(a)ausil.us&gt;
Date:   Tue Jun 19 10:51:52 2012 -0500

    some cleanups needed for livemedia-creator
    add minimal panda kickstart

 fedora-arm-base-x.ks        |    2 +-
 fedora-arm-base.ks          |    6 ++++++
 fedora-arm-panda-minimal.ks |   43 +++++++++++++++++++++++++++++++++++++++++++
 fedora-arm-panda-xfce.ks    |   13 +++----------
 4 files changed, 53 insertions(+), 11 deletions(-)
---
diff --git a/fedora-arm-base-x.ks b/fedora-arm-base-x.ks
index c948712..74d5174 100644
--- a/fedora-arm-base-x.ks
+++ b/fedora-arm-base-x.ks
@@ -1,5 +1,5 @@
 
-@include fedora-arm-base.ks
+%include fedora-arm-base.ks
 xconfig --startxonboot
 
 
diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index de40d76..790a096 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -6,13 +6,19 @@
 #
 # Does includes "default" language configuration (kickstarts including
 # this template can override these settings)
+bootloader --location=none
 
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 auth --useshadow --enablemd5
+rootpw --plaintext fedora
 selinux --enforcing
 firewall --enabled --service=mdns,sshd
+
+# Disk partitioning information
+zerombr
+clearpart --all
 part /boot --fstype=ext3  --size=256
 part / --size 3072 --fstype ext4
 services --enabled=NetworkManager,sshd
diff --git a/fedora-arm-panda-minimal.ks b/fedora-arm-panda-minimal.ks
new file mode 100644
index 0000000..cbcdf74
--- /dev/null
+++ b/fedora-arm-panda-minimal.ks
@@ -0,0 +1,43 @@
+
+part /boot/uboot --fstype=vfat --grow --maxsize=20 --size=20
+%include fedora-arm-base.ks
+
+
+
+%packages
+#for panda we only want to have the omap kernel installed
+-kernel
+-kernel-highbank
+-kernel-imx
+-kernel-tegra
+kernel-omap
+uboot-panda
+
+%end
+
+%post
+# install the moodloader bits into the vfat partition at the start of the disk
+# MLO file must be the first thing written to the partition
+cp /usr/share/uboot-panda/MLO /boot/uboot/MLO
+sync
+cp /usr/share/uboot-panda/u-boot.img /boot/uboot/u-boot.img
+
+# setup uEnv.txt on efi  to load kernel and initrd from ext3 /boot
+echo >> /boot/uboot/uEnv.txt << EOF
+bootfile=/uImage
+bootinitrd=/uInitrd
+boot=bootm
+console=ttyO2,115200n8
+address_image=0x80300000
+address_initrd=0x81600000
+mmcroot=%ROOTFSID% ro
+mmcargs=setenv bootargs console=${console} root=${mmcroot} quiet rootwait rhgb
+loaduimage=run xyz_mmcboot; run mmcargs; ${boot} ${address_image} ${address_initrd}
+xyz_load_image=ext2load mmc 0:2 ${address_image} ${bootfile}
+xyz_load_initrd=ext2load mmc 0:2 ${address_initrd} ${bootinitrd}
+xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
+EOF
+
+sed -i -e "|%ROOTFSID%|$(grep ' / ' /etc/fstab |sed -e 's|
.*$||g')|g" /boot/uEnv.txt
+
+%end
diff --git a/fedora-arm-panda-xfce.ks b/fedora-arm-panda-xfce.ks
index 01af8a9..ed5a23b 100644
--- a/fedora-arm-panda-xfce.ks
+++ b/fedora-arm-panda-xfce.ks
@@ -23,22 +23,15 @@ cp /usr/share/uboot-panda/MLO /boot/efi/MLO
 sync
 cp /usr/share/uboot-panda/u-boot.img /boot/efi/u-boot.img
 
-# setup uEnv.txt on efi  partition to load uEnv.txt on /boot
-cat >> /boot/efi/uEnv.txt << EOF
-bootenv=/uEnv.txt
-loaduimage=ext2load mmc 0:2 ${loadaddr} ${bootenv}
-mmcboot=echo Running script from mmc ...; source ${loadaddr}
-EOF
-
-# setup uEnv.txt on /boot to load kernel
-echo >> /boot/uEnv.txt << EOF
+# setup uEnv.txt on efi  to load kernel and initrd from ext3 /boot
+echo >> /boot/uboot/uEnv.txt << EOF
 bootfile=/uImage
 bootinitrd=/uInitrd
 boot=bootm
 console=ttyO2,115200n8
 address_image=0x80300000
 address_initrd=0x81600000
-mmcroot=LABEL=%ROOTFSID% ro
+mmcroot=%ROOTFSID% ro
 mmcargs=setenv bootargs console=${console} root=${mmcroot} quiet rootwait rhgb
 loaduimage=run xyz_mmcboot; run mmcargs; ${boot} ${address_image} ${address_initrd}
 xyz_load_image=ext2load mmc 0:2 ${address_image} ${bootfile}