Update for F18 final release. Changes include:

- replace ntp with chrony
- remove /etc/RELEASE datestamp
- change all hostnames to localhost
- move xorg.conf file for XFCE images
- add kickstarts for Soft-FP (armv5tel) images

9 files changed, 787 insertions, 82 deletions

diff --git a/F18-beagle-xfce-sfp.ks b/F18-beagle-xfce-sfp.ks
new file mode 100644
index 0000000..46c1f79
--- /dev/null
+++ b/F18-beagle-xfce-sfp.ks
@@ -0,0 +1,236 @@
+# Build an XFCE Fedora ARM (OMAP) BeagleBoard image using livemedia-creator
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc US/Eastern
+auth --useshadow --enablemd5
+selinux --enforcing
+firstboot --enable
+firewall --enabled --service=mdns,ssh
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
+
+# Set a default root password for Fedora
+rootpw --plaintext fedora
+
+# Repositories
+# apparently we must use 'url' for the install repo for livemedia-creator
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/arm/os/"
+
+#
+# Define how large you want your rootfs to be
+#
+# NOTE: /boot and swap MUST use --asprimary to ensure '/' is 
+#       the last partition in order for rootfs-resize to work.
+#
+bootloader --location=none
+zerombr
+clearpart --all
+part /boot/uboot --size 200 --fstype vfat --label=uboot
+part swap --size 500 --label=swap
+part / --size 2200 --fstype ext4 --label=rootfs
+
+#
+# Add all the packages after the base packages
+#
+%packages --nobase
+@standard
+
+# vvvvvvvvvvvvvvvvvvvvvvv
+@base-x
+@fonts
+
+@xfce-desktop
+@xfce-apps
+@xfce-extra-plugins
+@xfce-media
+
+# lm_sensors cause warnings on ARM systems
+#-lm_sensors
+-xfce4-sensors-plugin
+
+# apparently, xfce-desktop does not include gdm or a theme (icons)
+gdm
+xfce4-icon-theme
+
+# First, no office
+-libreoffice-*
+-planner
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.6.0-openjdk
+
+# save some space
+-autofs
+-acpid
+
+# Remove default unwanted hardware firmware and support we don't want
+-foomatic*
+-ghostscript*
+-ivtv-firmware
+# These are listed somewhere other than hardware support!
+-irda-utils
+-fprintd*
+
+-hplip
+-hpijs
+
+# Dictionaries are big
+-aspell-*
+-hunspell-*
+-man-pages*
+-words
+
+# scanning takes quite a bit of space :/
+-xsane
+-xsane-gimp
+-sane-backends
+
+# qlogic firmwares
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+-ql2400-firmware
+
+#-xfburn  appears twice in the menu, but the same behavior in PA
+
+# ^^^^^^^^^^^^^^^^^^^^^^^
+
+# apparently none of the groups sets the clock.
+chrony
+
+# and ifconfig would be nice.
+net-tools
+
+# we'll want to resize the rootfs on first boot
+rootfs-resize
+
+# get the uboot tools
+uboot-tools
+# get MLO and uboot.bin 
+uboot-beagle
+
+
+%end
+
+
+# more configuration
+%post --erroronfail
+
+# vvvvvvvvvvvvvvvvvvvvvvv
+# xfce configuration
+
+# create /etc/sysconfig/desktop (needed for installation)
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+mkdir -p /root/.config/xfce4
+
+cat > /root/.config/xfce4/helpers.rc << FOE
+MailReader=sylpheed-claws
+FileManager=Thunar
+FOE
+
+# disable screensaver locking (#674410)
+cat >> /root/.xscreensaver << FOE
+mode:           off
+lock:           False
+dpmsEnabled:    False
+FOE
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# deactivate xfce4-panel first-run dialog (#693569)
+mkdir -p /root/.config/xfce4/xfconf/xfce-perchannel-xml
+cp /etc/xdg/xfce4/panel/default.xml /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+
+# make sure the default target is graphical
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
+ln -sf /lib/systemd/system/graphical.target /lib/systemd/system/default.target
+
+# firstboot does not run for us, so force it
+/bin/systemctl enable firstboot-graphical.service
+
+# force xorg to use framebuffer until we get omapdrm working well
+cat > /etc/X11/xorg.conf.d/arm-fbdev.conf << EOF
+Section "Device"
+    Identifier             "Device0"
+    Driver                 "fbdev"	# Choose the driver used for this monitor
+EndSection
+EOF
+
+# ^^^^^^^^^^^^^^^^^^^^^^^
+
+
+# set up the U-Boot config for Beagle
+cat << EOF >> /etc/sysconfig/uboot
+UBOOT_DEVICE=mmcblk0p1
+UBOOT_DIR=/boot/uboot
+EOF
+
+
+# Set up the bootloader bits on the U-Boot partition
+pushd /boot
+
+# MLO _must_ be the first thing copied to the partition
+cp -p /usr/share/uboot-beagle/MLO /boot/uboot/.
+
+sleep 3
+sync
+
+# try to make damned sure that MLO is written first!
+sleep 3
+sync; sync; sync;
+
+# now copy the bootloader
+cp -p /usr/share/uboot-beagle/u-boot.* /boot/uboot/.
+
+# and move the U-Boot kernel and initrd images
+mv boot.cmd uImage* uInitrd* uEnv* /boot/uboot/.
+
+
+# Install U-Boot boot script and environment
+pushd uboot
+
+# get the root device from fstab, typically UUID=<string>
+ROOTDEV=`grep -w / /etc/fstab | cut -d ' ' -f1`
+KERNEL_ADDR=0x80300000
+INITRD_ADDR=0x81600000
+
+# setup uEnv.txt
+cat <<EOL > uEnv.txt
+mmcargs=setenv bootargs console=\${console} vram=\${vram} root=$ROOTDEV ro rootwait quiet rhgb
+mmcload=fatload mmc 0:1 $INITRD_ADDR uInitrd; fatload mmc 0:1 $KERNEL_ADDR uImage; 
+loaduimage=run mmcload; run mmcargs; bootm $KERNEL_ADDR $INITRD_ADDR
+EOL
+
+# and boot.scr
+cat <<EOL > boot.cmd
+setenv bootargs console=\${console} vram=\${vram} root=$ROOTDEV ro rootwait quiet rhgb
+fatload mmc 0:1 $INITRD_ADDR uInitrd
+fatload mmc 0:1 $KERNEL_ADDR uImage
+bootm $KERNEL_ADDR $INITRD_ADDR
+EOL
+
+/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Beagle F18" -d boot.cmd boot.scr
+
+popd
+
+popd
+
+
+# force resize of the rootfs
+touch /.rootfs-repartition
+
+# try Brendan's tip for workaround.
+setfiles -v -F -e /proc -e /sys -e /dev \
+  /etc/selinux/targeted/contexts/files/file_contexts /
+
+
+%end
+
diff --git a/F18-beagle-xfce.ks b/F18-beagle-xfce.ks
index 4141edb..290a0f8 100644
--- a/F18-beagle-xfce.ks
+++ b/F18-beagle-xfce.ks
@@ -7,15 +7,15 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firstboot --enable
 firewall --enabled --service=mdns,ssh
-network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=beagle-f18-v7hl
-services --enabled=NetworkManager,sshd,ntpd --disabled=network
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
 
 # Set a default root password for Fedora
 rootpw --plaintext fedora
 
 # Repositories
 # apparently we must use 'url' for the install repo for livemedia-creator
-url --url="http://archive.kernel.org/fedora-secondary/development/18/armhfp/os/"
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/armhfp/os/"
 
 #
 # Define how large you want your rootfs to be
@@ -98,8 +98,7 @@ xfce4-icon-theme
 # ^^^^^^^^^^^^^^^^^^^^^^^
 
 # apparently none of the groups sets the clock.
-ntp
-ntpdate
+chrony
 
 # and ifconfig would be nice.
 net-tools
@@ -158,21 +157,13 @@ ln -sf /lib/systemd/system/graphical.target /lib/systemd/system/default.target
 /bin/systemctl enable firstboot-graphical.service
 
 # force xorg to use framebuffer until we get omapdrm working well
-cat > /etc/X11/xorg.conf << EOF
+cat > /etc/X11/xorg.conf.d/arm-fbdev.conf << EOF
 Section "Device"
     Identifier             "Device0"
     Driver                 "fbdev"	# Choose the driver used for this monitor
 EndSection
 EOF
 
-# include an xorg.config to use the OMAP DRM driver, if desired
-cat > /etc/X11/xorg.conf.omapdrm << EOF
-Section "Device"
-    Identifier "Device0"
-    Driver "omap"
-EndSection
-EOF
-
 # ^^^^^^^^^^^^^^^^^^^^^^^
 
 
@@ -233,15 +224,9 @@ popd
 popd
 
 
-# datestamp this release
-date +F18-%Y%m%d-beta > /etc/RELEASE
-
 # force resize of the rootfs
 touch /.rootfs-repartition
 
-# force SELinux relabel of the rootfs
-#touch /.autorelabel
-
 # try Brendan's tip for workaround.
 setfiles -v -F -e /proc -e /sys -e /dev \
   /etc/selinux/targeted/contexts/files/file_contexts /
diff --git a/F18-kirkwood.ks b/F18-kirkwood.ks
index 4da3049..abd315a 100644
--- a/F18-kirkwood.ks
+++ b/F18-kirkwood.ks
@@ -6,8 +6,8 @@ timezone --utc US/Eastern
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
-network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=kirkwood-f18-v5tel
-services --enabled=NetworkManager,sshd,ntpd --disabled=network
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
 
 skipx
 
@@ -16,7 +16,7 @@ rootpw --plaintext fedora
 
 # Repositories
 # apparently we must use 'url' for the install repo for livemedia-creator
-url --url="http://archive.kernel.org/fedora-secondary/development/18/arm/os/"
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/arm/os/"
 
 #
 # Define how large you want your rootfs to be
@@ -27,7 +27,7 @@ url --url="http://archive.kernel.org/fedora-secondary/development/18/arm/os/"
 bootloader --location=none
 zerombr
 clearpart --all
-part /boot --size 200 --fstype ext3 --asprimary --label=boot
+part /boot --size 200 --fstype ext2 --asprimary --label=boot
 part swap --size 500 --asprimary --label=swap
 part / --size 2000 --fstype ext4 --label=rootfs
 
@@ -38,8 +38,7 @@ part / --size 2000 --fstype ext4 --label=rootfs
 @standard
 
 # apparently none of the groups sets the clock.
-ntp
-ntpdate
+chrony
 
 # and ifconfig would be nice.
 net-tools
@@ -85,20 +84,13 @@ sed -e 's/mmc/usb/g' boot.cmd.mmc > boot.cmd.usb
 
 cp -p boot.scr.mmc boot.scr
 
-wget "http://dmarlin.fedorapeople.org/fedora-arm/kirkwood/README-kirkwood.txt"
 
 popd
 
 
-# datestamp this release
-date +F18-%Y%m%d-beta > /etc/RELEASE
-
 # force resize of the rootfs
 touch /.rootfs-repartition
 
-# force SELinux relabel of the rootfs
-#touch /.autorelabel
-
 # try Brendan's tip for workaround.
 setfiles -v -F -e /proc -e /sys -e /dev \
   /etc/selinux/targeted/contexts/files/file_contexts /
diff --git a/F18-panda-xfce-sfp.ks b/F18-panda-xfce-sfp.ks
new file mode 100644
index 0000000..0d1bd49
--- /dev/null
+++ b/F18-panda-xfce-sfp.ks
@@ -0,0 +1,236 @@
+# Build an XFCE Fedora ARM (OMAP) PandaBoard Soft-FP image using livemedia-creator
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc US/Eastern
+auth --useshadow --enablemd5
+selinux --enforcing
+firstboot --enable
+firewall --enabled --service=mdns,ssh
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
+
+# Set a default root password for Fedora
+rootpw --plaintext fedora
+
+# Repositories
+# apparently we must use 'url' for the install repo for livemedia-creator
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/arm/os/"
+
+#
+# Define how large you want your rootfs to be
+#
+# NOTE: /boot and swap MUST use --asprimary to ensure '/' is 
+#       the last partition in order for rootfs-resize to work.
+#
+bootloader --location=none
+zerombr
+clearpart --all
+part /boot/uboot --size 200 --fstype vfat --label=uboot
+part swap --size 500 --label=swap
+part / --size 2200 --fstype ext4 --label=rootfs
+
+#
+# Add all the packages after the base packages
+#
+%packages --nobase
+@standard
+
+# vvvvvvvvvvvvvvvvvvvvvvv
+@base-x
+@fonts
+
+@xfce-desktop
+@xfce-apps
+@xfce-extra-plugins
+@xfce-media
+
+# lm_sensors cause warnings on ARM systems
+#-lm_sensors
+-xfce4-sensors-plugin
+
+# apparently, xfce-desktop does not include gdm or a theme (icons)
+gdm
+xfce4-icon-theme
+
+# First, no office
+-libreoffice-*
+-planner
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.6.0-openjdk
+
+# save some space
+-autofs
+-acpid
+
+# Remove default unwanted hardware firmware and support we don't want
+-foomatic*
+-ghostscript*
+-ivtv-firmware
+# These are listed somewhere other than hardware support!
+-irda-utils
+-fprintd*
+
+-hplip
+-hpijs
+
+# Dictionaries are big
+-aspell-*
+-hunspell-*
+-man-pages*
+-words
+
+# scanning takes quite a bit of space :/
+-xsane
+-xsane-gimp
+-sane-backends
+
+# qlogic firmwares
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+-ql2400-firmware
+
+#-xfburn  appears twice in the menu, but the same behavior in PA
+
+# ^^^^^^^^^^^^^^^^^^^^^^^
+
+# apparently none of the groups sets the clock.
+chrony
+
+# and ifconfig would be nice.
+net-tools
+
+# we'll want to resize the rootfs on first boot
+rootfs-resize
+
+# get the uboot tools
+uboot-tools
+# get MLO and uboot.bin 
+uboot-panda
+
+
+%end
+
+
+# more configuration
+%post --erroronfail
+
+# vvvvvvvvvvvvvvvvvvvvvvv
+# xfce configuration
+
+# create /etc/sysconfig/desktop (needed for installation)
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+mkdir -p /root/.config/xfce4
+
+cat > /root/.config/xfce4/helpers.rc << FOE
+MailReader=sylpheed-claws
+FileManager=Thunar
+FOE
+
+# disable screensaver locking (#674410)
+cat >> /root/.xscreensaver << FOE
+mode:           off
+lock:           False
+dpmsEnabled:    False
+FOE
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# deactivate xfce4-panel first-run dialog (#693569)
+mkdir -p /root/.config/xfce4/xfconf/xfce-perchannel-xml
+cp /etc/xdg/xfce4/panel/default.xml /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+
+# make sure the default target is graphical
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
+ln -sf /lib/systemd/system/graphical.target /lib/systemd/system/default.target
+
+# firstboot does not run for us, so force it
+/bin/systemctl enable firstboot-graphical.service
+
+# force xorg to use framebuffer until we get omapdrm working well
+cat > /etc/X11/xorg.conf.d/arm-fbdev.conf << EOF
+Section "Device"
+    Identifier             "Device0"
+    Driver                 "fbdev"	# Choose the driver used for this monitor
+EndSection
+EOF
+
+# ^^^^^^^^^^^^^^^^^^^^^^^
+
+
+# set up the U-Boot config for Panda
+cat << EOF >> /etc/sysconfig/uboot
+UBOOT_DEVICE=mmcblk0p1
+UBOOT_DIR=/boot/uboot
+EOF
+
+
+# Set up the bootloader bits on the U-Boot partition
+pushd /boot
+
+# MLO _must_ be the first thing copied to the partition
+cp -p /usr/share/uboot-panda/MLO /boot/uboot/.
+
+sleep 3
+sync
+
+# try to make damned sure that MLO is written first!
+sleep 3
+sync; sync; sync;
+
+# now copy the bootloader
+cp -p /usr/share/uboot-panda/u-boot.* /boot/uboot/.
+
+# and move the U-Boot kernel and initrd images
+mv boot.cmd uImage* uInitrd* uEnv* /boot/uboot/.
+
+
+# Install U-Boot boot script and environment
+pushd uboot
+
+# get the root device from fstab, typically UUID=<string>
+ROOTDEV=`grep -w / /etc/fstab | cut -d ' ' -f1`
+KERNEL_ADDR=0x80300000
+INITRD_ADDR=0x81600000
+
+# setup uEnv.txt
+cat <<EOL > uEnv.txt
+mmcargs=setenv bootargs console=\${console} vram=\${vram} root=$ROOTDEV ro rootwait quiet rhgb
+mmcload=fatload mmc 0:1 $INITRD_ADDR uInitrd; fatload mmc 0:1 $KERNEL_ADDR uImage; 
+loaduimage=run mmcload; run mmcargs; bootm $KERNEL_ADDR $INITRD_ADDR
+EOL
+
+# and boot.scr
+cat <<EOL > boot.cmd
+setenv bootargs console=\${console} vram=\${vram} root=$ROOTDEV ro rootwait quiet rhgb
+fatload mmc 0:1 $INITRD_ADDR uInitrd
+fatload mmc 0:1 $KERNEL_ADDR uImage
+bootm $KERNEL_ADDR $INITRD_ADDR
+EOL
+
+/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Panda F18" -d boot.cmd boot.scr
+
+popd
+
+popd
+
+
+# force resize of the rootfs
+touch /.rootfs-repartition
+
+# try Brendan's tip for workaround.
+setfiles -v -F -e /proc -e /sys -e /dev \
+  /etc/selinux/targeted/contexts/files/file_contexts /
+
+
+%end
+
diff --git a/F18-panda-xfce.ks b/F18-panda-xfce.ks
index 67e0e59..12f483b 100644
--- a/F18-panda-xfce.ks
+++ b/F18-panda-xfce.ks
@@ -7,15 +7,15 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firstboot --enable
 firewall --enabled --service=mdns,ssh
-network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=panda-f18-v7hl
-services --enabled=NetworkManager,sshd,ntpd --disabled=network
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
 
 # Set a default root password for Fedora
 rootpw --plaintext fedora
 
 # Repositories
 # apparently we must use 'url' for the install repo for livemedia-creator
-url --url="http://archive.kernel.org/fedora-secondary/development/18/armhfp/os/"
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/armhfp/os/"
 
 #
 # Define how large you want your rootfs to be
@@ -98,8 +98,7 @@ xfce4-icon-theme
 # ^^^^^^^^^^^^^^^^^^^^^^^
 
 # apparently none of the groups sets the clock.
-ntp
-ntpdate
+chrony
 
 # and ifconfig would be nice.
 net-tools
@@ -158,21 +157,13 @@ ln -sf /lib/systemd/system/graphical.target /lib/systemd/system/default.target
 /bin/systemctl enable firstboot-graphical.service
 
 # force xorg to use framebuffer until we get omapdrm working well
-cat > /etc/X11/xorg.conf << EOF
+cat > /etc/X11/xorg.conf.d/arm-fbdev.conf << EOF
 Section "Device"
     Identifier             "Device0"
     Driver                 "fbdev"	# Choose the driver used for this monitor
 EndSection
 EOF
 
-# include an xorg.config to use the OMAP DRM driver, if desired
-cat > /etc/X11/xorg.conf.omapdrm << EOF
-Section "Device"
-    Identifier "Device0"
-    Driver "omap"
-EndSection
-EOF
-
 # ^^^^^^^^^^^^^^^^^^^^^^^
 
 
@@ -233,15 +224,9 @@ popd
 popd
 
 
-# datestamp this release
-date +F18-%Y%m%d-beta > /etc/RELEASE
-
 # force resize of the rootfs
 touch /.rootfs-repartition
 
-# force SELinux relabel of the rootfs
-#touch /.autorelabel
-
 # try Brendan's tip for workaround.
 setfiles -v -F -e /proc -e /sys -e /dev \
   /etc/selinux/targeted/contexts/files/file_contexts /
diff --git a/F18-trimslice-sfp.ks b/F18-trimslice-sfp.ks
new file mode 100644
index 0000000..cffb3a3
--- /dev/null
+++ b/F18-trimslice-sfp.ks
@@ -0,0 +1,98 @@
+# Build a minimal Fedora ARM (Tegra) Trim Slice image using livemedia-creator
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc US/Eastern
+auth --useshadow --enablemd5
+selinux --enforcing
+firewall --enabled --service=mdns,ssh
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain 
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
+
+skipx
+
+# Set a default root password for Fedora
+rootpw --plaintext fedora
+
+# Repositories
+# apparently we must use 'url' for the install repo for livemedia-creator
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/arm/os/"
+
+#
+# Define how large you want your rootfs to be
+#
+# NOTE: /boot and swap MUST use --asprimary to ensure '/' is 
+#       the last partition in order for rootfs-resize to work.
+#
+bootloader --location=none
+zerombr
+clearpart --all
+part /boot --size 200 --fstype ext3 --label=boot
+part swap --size 500 --asprimary --label=swap
+part / --size 2000 --fstype ext4 --label=rootfs
+
+#
+# Add all the packages after the base packages
+#
+%packages --nobase
+@standard
+
+# apparently none of the groups sets the clock.
+chrony
+
+# and ifconfig would be nice.
+net-tools
+
+# we'll want to resize the rootfs on first boot
+rootfs-resize
+
+# get the uboot tools
+uboot-tools
+
+%end
+
+
+# more configuration
+%post --erroronfail
+
+
+# Install U-Boot boot.scr
+pushd /boot
+
+# get the root device from fstab, typically UUID=<string>
+ROOTDEV=`grep -w / /etc/fstab | cut -d ' ' -f1`
+
+# setup boot.scr files
+# NOTE: 
+# If the .dtb file does not exist, an error will be displayed,
+#   but the script will continue.
+# If running the old (original) version of U-Boot, 
+#   the third address to bootm will be ignored.
+cat <<EOL > boot.cmd.mmc
+setenv bootargs console=\${console} root=$ROOTDEV ro rootwait
+ext2load mmc 0:1 4880000 uInitrd
+ext2load mmc 0:1 4080000 uImage
+ext2load mmc 0:1 5880000 dtbs/tegra20-trimslice.dtb
+bootm 4080000 4880000 5880000
+EOL
+
+sed -e 's/mmc/usb/g' boot.cmd.mmc > boot.cmd.usb
+
+/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Trim Slice F18" -d boot.cmd.mmc boot.scr.mmc
+/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Trim Slice F18" -d boot.cmd.usb boot.scr.usb
+
+cp -p boot.scr.mmc boot.scr
+
+popd
+
+
+# force resize of the rootfs
+touch /.rootfs-repartition
+
+# try Brendan's tip for workaround.
+setfiles -v -F -e /proc -e /sys -e /dev \
+  /etc/selinux/targeted/contexts/files/file_contexts /
+
+
+%end
+
diff --git a/F18-trimslice.ks b/F18-trimslice.ks
index 06c1487..9043a73 100644
--- a/F18-trimslice.ks
+++ b/F18-trimslice.ks
@@ -6,11 +6,9 @@ timezone --utc US/Eastern
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
-network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=trimslice-f18-v7hl
-services --enabled=NetworkManager,sshd,ntpd --disabled=network
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain 
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
 
-# Only use this with Anaconda for serial console installs, not with livemedia-creator.
-#cmdline
 skipx
 
 # Set a default root password for Fedora
@@ -18,7 +16,7 @@ rootpw --plaintext fedora
 
 # Repositories
 # apparently we must use 'url' for the install repo for livemedia-creator
-url --url="http://archive.kernel.org/fedora-secondary/development/18/armhfp/os/"
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/armhfp/os/"
 
 #
 # Define how large you want your rootfs to be
@@ -40,8 +38,7 @@ part / --size 2000 --fstype ext4 --label=rootfs
 @standard
 
 # apparently none of the groups sets the clock.
-ntp
-ntpdate
+chrony
 
 # and ifconfig would be nice.
 net-tools
@@ -65,12 +62,18 @@ pushd /boot
 # get the root device from fstab, typically UUID=<string>
 ROOTDEV=`grep -w / /etc/fstab | cut -d ' ' -f1`
 
-# setup boot.scr
+# setup boot.scr files
+# NOTE: 
+# If the .dtb file does not exist, an error will be displayed,
+#   but the script will continue.
+# If running the old (original) version of U-Boot, 
+#   the third address to bootm will be ignored.
 cat <<EOL > boot.cmd.mmc
-setenv bootargs mem=384M@0M mem=512M@512M nvmem=128M@384M vmalloc=248M video=tegrafb console=ttyS0,115200n8 root=$ROOTDEV ro rootwait
+setenv bootargs console=\${console} root=$ROOTDEV ro rootwait
 ext2load mmc 0:1 4880000 uInitrd
 ext2load mmc 0:1 4080000 uImage
-bootm 4080000 4880000
+ext2load mmc 0:1 5880000 dtbs/tegra20-trimslice.dtb
+bootm 4080000 4880000 5880000
 EOL
 
 sed -e 's/mmc/usb/g' boot.cmd.mmc > boot.cmd.usb
@@ -83,15 +86,9 @@ cp -p boot.scr.mmc boot.scr
 popd
 
 
-# datestamp this release
-date +F18-%Y%m%d-beta > /etc/RELEASE
-
 # force resize of the rootfs
 touch /.rootfs-repartition
 
-# force SELinux relabel of the rootfs
-#touch /.autorelabel
-
 # try Brendan's tip for workaround.
 setfiles -v -F -e /proc -e /sys -e /dev \
   /etc/selinux/targeted/contexts/files/file_contexts /
diff --git a/F18-vexpress-xfce-sfp.ks b/F18-vexpress-xfce-sfp.ks
new file mode 100644
index 0000000..be77433
--- /dev/null
+++ b/F18-vexpress-xfce-sfp.ks
@@ -0,0 +1,184 @@
+# Build an XFCE Fedora ARM (VExpress) Soft-FP image using livemedia-creator
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc US/Eastern
+auth --useshadow --enablemd5
+selinux --enforcing
+firstboot --enable
+firewall --enabled --service=mdns,ssh
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
+
+# Set a default root password for Fedora
+rootpw --plaintext fedora
+
+# Repositories
+# apparently we must use 'url' for the install repo for livemedia-creator
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/arm/os/"
+
+#
+# Define how large you want your rootfs to be
+#
+# NOTE: /boot and swap MUST use --asprimary to ensure '/' is 
+#       the last partition in order for rootfs-resize to work.
+#
+bootloader --location=none
+zerombr
+clearpart --all
+part /boot --size 200 --fstype ext3 --label=boot
+part swap --size 500 --asprimary --label=swap
+part / --size 2200 --fstype ext4 --label=rootfs
+
+#
+# Add all the packages after the base packages
+#
+%packages --nobase
+@standard
+
+# get the base kernel
+kernel
+
+# vvvvvvvvvvvvvvvvvvvvvvv
+@base-x
+@fonts
+
+@xfce-desktop
+@xfce-apps
+@xfce-extra-plugins
+@xfce-media
+
+# lm_sensors cause warnings on ARM systems
+#-lm_sensors
+-xfce4-sensors-plugin
+
+# apparently, xfce-desktop does not include gdm or a theme (icons)
+gdm
+xfce4-icon-theme
+
+# First, no office
+-libreoffice-*
+-planner
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.6.0-openjdk
+
+# save some space
+-autofs
+-acpid
+
+# Remove default unwanted hardware firmware and support we don't want
+-foomatic*
+-ghostscript*
+-ivtv-firmware
+# These are listed somewhere other than hardware support!
+-irda-utils
+-fprintd*
+
+-hplip
+-hpijs
+
+# Dictionaries are big
+-aspell-*
+-hunspell-*
+-man-pages*
+-words
+
+# scanning takes quite a bit of space :/
+-xsane
+-xsane-gimp
+-sane-backends
+
+# qlogic firmwares
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+-ql2400-firmware
+
+#-xfburn  appears twice in the menu, but the same behavior in PA
+
+# ^^^^^^^^^^^^^^^^^^^^^^^
+
+# apparently none of the groups sets the clock.
+chrony
+
+# and ifconfig would be nice.
+net-tools
+
+# get the uboot tools
+uboot-tools
+
+%end
+
+
+# more configuration
+%post --erroronfail
+
+# remove the extraneous kernel
+yum -y remove kernel-kirkwood
+
+
+# vvvvvvvvvvvvvvvvvvvvvvv
+# xfce configuration
+
+# create /etc/sysconfig/desktop (needed for installation)
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+mkdir -p /root/.config/xfce4
+
+cat > /root/.config/xfce4/helpers.rc << FOE
+MailReader=sylpheed-claws
+FileManager=Thunar
+FOE
+
+# disable screensaver locking (#674410)
+cat >> /root/.xscreensaver << FOE
+mode:           off
+lock:           False
+dpmsEnabled:    False
+FOE
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# deactivate xfce4-panel first-run dialog (#693569)
+mkdir -p /root/.config/xfce4/xfconf/xfce-perchannel-xml
+cp /etc/xdg/xfce4/panel/default.xml /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+
+# make sure the default target is graphical
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
+ln -sf /lib/systemd/system/graphical.target /lib/systemd/system/default.target
+
+# firstboot does not run for us, so force it
+/bin/systemctl enable firstboot-graphical.service
+
+# ^^^^^^^^^^^^^^^^^^^^^^^
+
+
+# try Brendan's tip for workaround.
+setfiles -v -F -e /proc -e /sys -e /dev \
+  /etc/selinux/targeted/contexts/files/file_contexts /
+
+
+%end
+
+
+# get the scripts to run qemu
+%post --nochroot
+
+pushd /mnt/sysimage/boot
+
+wget "http://dmarlin.fedorapeople.org/fedora-arm/vexpress/boot-vexpress"
+
+chmod +x /mnt/sysimage/boot/boot-vexpress*
+
+popd
+
+
+%end
+
diff --git a/F18-vexpress-xfce.ks b/F18-vexpress-xfce.ks
index 3a69b7c..21dc110 100644
--- a/F18-vexpress-xfce.ks
+++ b/F18-vexpress-xfce.ks
@@ -1,4 +1,4 @@
-# Build a Fedora ARM (VExpress) XFCE image using livemedia-creator
+# Build an XFCE Fedora ARM (VExpress) image using livemedia-creator
 
 lang en_US.UTF-8
 keyboard us
@@ -7,15 +7,15 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firstboot --enable
 firewall --enabled --service=mdns,ssh
-network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=vexpress-f18-v7hl
-services --enabled=NetworkManager,sshd,ntpd --disabled=network
+network --bootproto=dhcp --device=eth0 --onboot=on --activate --hostname=localhost.localdomain
+services --enabled=NetworkManager,sshd,chronyd --disabled=network
 
 # Set a default root password for Fedora
 rootpw --plaintext fedora
 
 # Repositories
 # apparently we must use 'url' for the install repo for livemedia-creator
-url --url="http://archive.kernel.org/fedora-secondary/development/18/armhfp/os/"
+url --url="http://dl.fedoraproject.org/pub/fedora-secondary/releases/18/Everything/armhfp/os/"
 
 #
 # Define how large you want your rootfs to be
@@ -98,8 +98,7 @@ xfce4-icon-theme
 # ^^^^^^^^^^^^^^^^^^^^^^^
 
 # apparently none of the groups sets the clock.
-ntp
-ntpdate
+chrony
 
 # and ifconfig would be nice.
 net-tools
@@ -154,12 +153,6 @@ ln -sf /lib/systemd/system/graphical.target /lib/systemd/system/default.target
 # ^^^^^^^^^^^^^^^^^^^^^^^
 
 
-# datestamp this release
-date +F18-%Y%m%d-beta > /etc/RELEASE
-
-# force SELinux relabel of the rootfs
-#touch /.autorelabel
-
 # try Brendan's tip for workaround.
 setfiles -v -F -e /proc -e /sys -e /dev \
   /etc/selinux/targeted/contexts/files/file_contexts /
@@ -174,7 +167,6 @@ setfiles -v -F -e /proc -e /sys -e /dev \
 pushd /mnt/sysimage/boot
 
 wget "http://dmarlin.fedorapeople.org/fedora-arm/vexpress/boot-vexpress"
-wget "http://dmarlin.fedorapeople.org/fedora-arm/vexpress/boot-vexpress+x"
 
 chmod +x /mnt/sysimage/boot/boot-vexpress*