Add 'koji-f20' rule.

Remove Fedora 18 and Fedora 17 rules.

diff --git a/Makefile.am b/Makefile.am
index ced1c9b..d18b0b8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,18 +66,10 @@ local-boot:
        ./boot-a-fedora-appliance --local
 
 # To build an RPM in Koji.
-koji-f18:
+koji-f20:
        rpmbuild -bs \
          --define "_srcrpmdir $$(pwd)" \
          --define "_sourcedir $$(pwd)" \
-         --define "dist .fc18" a-fedora-appliance.spec
-       koji build --scratch f18 \
-         $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc18.src.rpm
-
-koji-f17:
-       rpmbuild -bs \
-         --define "_srcrpmdir $$(pwd)" \
-         --define "_sourcedir $$(pwd)" \
-         --define "dist .fc17" a-fedora-appliance.spec
-       koji build --scratch f17 \
-         $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc17.src.rpm
+         --define "dist .fc20" a-fedora-appliance.spec
+       koji build --scratch f20 \
+         $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc20.src.rpm

diff --git a/README b/README
index ff72fe6..42a51c6 100644 (file)
--- a/README
+++ b/README
@@ -52,6 +52,4 @@ Do:
   make
   make dist
 
-  make koji-f18
-or:
-  make koji-f17
+  make koji-f20

diff --git a/firstboot b/firstboot
index 3ba3523..4be95f2 100755 (executable)
--- a/firstboot
+++ b/firstboot
@@ -92,7 +92,7 @@ EOF
 # systemd-units
 target="/lib/systemd/system/runlevel2.target"
 ln -sf "$target" /etc/systemd/system/default.target
-/bin/systemctl enable getty@.service
+/bin/systemctl enable getty@tty1.service
 
 # openssh-server
 /bin/systemctl enable sshd.service