generic/fedora-19-i386-cloud.ks | 12 +++++++++++- generic/fedora-19-i386-minimal.ks | 11 ++++++++++- generic/fedora-19-i386.ks | 11 ++++++++++- generic/fedora-19-x86_64-cloud.ks | 11 ++++++++++- generic/fedora-19-x86_64-minimal.ks | 11 ++++++++++- generic/fedora-19-x86_64.ks | 11 ++++++++++- 6 files changed, 61 insertions(+), 6 deletions(-)
New commits: commit afa50b2333d49f31cc27635457c75dff2f27ab21 Author: Matthew Miller mattdm@mattdm.org Date: Sat May 11 17:11:58 2013 -0400
put back the minimal fstab
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks index c6f4c95..d94a791 100644 --- a/generic/fedora-19-i386-cloud.ks +++ b/generic/fedora-19-i386-cloud.ks @@ -74,6 +74,12 @@ rsync
%post --erroronfail
+echo -n "Writing fstab" +cat <<EOF > /etc/fstab +LABEL=_/ / ext4 defaults 1 1 +EOF +echo . + # Kickstart specifies timeout in seconds; syslinux uses 10ths. # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks index fd896cb..727448b 100644 --- a/generic/fedora-19-i386-minimal.ks +++ b/generic/fedora-19-i386-minimal.ks @@ -78,6 +78,12 @@ iptables-services
%post --erroronfail
+echo -n "Writing fstab" +cat <<EOF > /etc/fstab +LABEL=_/ / ext4 defaults 1 1 +EOF +echo . + # Kickstart specifies timeout in seconds; syslinux uses 10ths. # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks index 37fd203..9b6fbb3 100644 --- a/generic/fedora-19-i386.ks +++ b/generic/fedora-19-i386.ks @@ -67,6 +67,12 @@ rsync
%post --erroronfail
+echo -n "Writing fstab" +cat <<EOF > /etc/fstab +LABEL=_/ / ext4 defaults 1 1 +EOF +echo . + # Kickstart specifies timeout in seconds; syslinux uses 10ths. # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks index 32e44fd..ba02166 100644 --- a/generic/fedora-19-x86_64-cloud.ks +++ b/generic/fedora-19-x86_64-cloud.ks @@ -74,6 +74,12 @@ rsync
%post --erroronfail
+echo -n "Writing fstab" +cat <<EOF > /etc/fstab +LABEL=_/ / ext4 defaults 1 1 +EOF +echo . + # Kickstart specifies timeout in seconds; syslinux uses 10ths. # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks index 5115ef8..fb1efc2 100644 --- a/generic/fedora-19-x86_64-minimal.ks +++ b/generic/fedora-19-x86_64-minimal.ks @@ -79,6 +79,12 @@ iptables-services
%post --erroronfail
+echo -n "Writing fstab" +cat <<EOF > /etc/fstab +LABEL=_/ / ext4 defaults 1 1 +EOF +echo . + # Kickstart specifies timeout in seconds; syslinux uses 10ths. # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks index 8c7066f..a0c2811 100644 --- a/generic/fedora-19-x86_64.ks +++ b/generic/fedora-19-x86_64.ks @@ -68,6 +68,12 @@ rsync
%post --erroronfail
+echo -n "Writing fstab" +cat <<EOF > /etc/fstab +LABEL=_/ / ext4 defaults 1 1 +EOF +echo . + # Kickstart specifies timeout in seconds; syslinux uses 10ths. # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
commit 77dd7f1cbdaf9dd52739f654a4e9f9dd798f80fd Author: Matthew Miller mattdm@mattdm.org Date: Sat May 11 17:02:13 2013 -0400
extlinux!
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks index d94e7d2..c6f4c95 100644 --- a/generic/fedora-19-i386-cloud.ks +++ b/generic/fedora-19-i386-cloud.ks @@ -19,7 +19,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh
-bootloader --timeout=1 --location=mbr --driveorder=sda +bootloader --timeout=1 --extlinux
network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final @@ -78,6 +78,10 @@ rsync # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+echo "Fixing hardcoded device names from appliance-creator" +sed -i 's//dev/.da1/LABEL=_//' /boot/extlinux/extlinux.conf + + # setup systemd to boot to the right runlevel echo -n "Setting default runlevel to multiuser text mode" rm -f /etc/systemd/system/default.target diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks index 9f48827..fd896cb 100644 --- a/generic/fedora-19-i386-minimal.ks +++ b/generic/fedora-19-i386-minimal.ks @@ -20,7 +20,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh
-bootloader --timeout=1 --location=mbr --driveorder=sda +bootloader --timeout=1 --extlinux
network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables @@ -82,6 +82,9 @@ iptables-services # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+echo "Fixing hardcoded device names from appliance-creator" +sed -i 's//dev/.da1/LABEL=_//' /boot/extlinux/extlinux.conf + # setup systemd to boot to the right runlevel echo -n "Setting default runlevel to multiuser text mode" rm -f /etc/systemd/system/default.target diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks index 05e9c47..37fd203 100644 --- a/generic/fedora-19-i386.ks +++ b/generic/fedora-19-i386.ks @@ -14,7 +14,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh
-bootloader --timeout=1 --location=mbr --driveorder=sda +bootloader --timeout=1 --extlinux
network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables @@ -71,6 +71,9 @@ rsync # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+echo "Fixing hardcoded device names from appliance-creator" +sed -i 's//dev/.da1/LABEL=_//' /boot/extlinux/extlinux.conf + # setup systemd to boot to the right runlevel echo -n "Setting default runlevel to multiuser text mode" rm -f /etc/systemd/system/default.target diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks index f86ccbe..32e44fd 100644 --- a/generic/fedora-19-x86_64-cloud.ks +++ b/generic/fedora-19-x86_64-cloud.ks @@ -19,7 +19,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh
-bootloader --timeout=1 --location=mbr --driveorder=sda +bootloader --timeout=1 --extlinux
network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final @@ -78,6 +78,9 @@ rsync # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+echo "Fixing hardcoded device names from appliance-creator" +sed -i 's//dev/.da1/LABEL=_//' /boot/extlinux/extlinux.conf + # setup systemd to boot to the right runlevel echo -n "Setting default runlevel to multiuser text mode" rm -f /etc/systemd/system/default.target diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks index 0e83a06..5115ef8 100644 --- a/generic/fedora-19-x86_64-minimal.ks +++ b/generic/fedora-19-x86_64-minimal.ks @@ -20,7 +20,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh
-bootloader --timeout=1 --location=mbr --driveorder=sda +bootloader --timeout=1 --extlinux
network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables @@ -83,6 +83,9 @@ iptables-services # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+echo "Fixing hardcoded device names from appliance-creator" +sed -i 's//dev/.da1/LABEL=_//' /boot/extlinux/extlinux.conf + # setup systemd to boot to the right runlevel echo -n "Setting default runlevel to multiuser text mode" rm -f /etc/systemd/system/default.target diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks index aa50063..8c7066f 100644 --- a/generic/fedora-19-x86_64.ks +++ b/generic/fedora-19-x86_64.ks @@ -14,7 +14,7 @@ selinux --enforcing # matching these rules is generated below. firewall --service=ssh
-bootloader --timeout=1 --location=mbr --driveorder=sda +bootloader --timeout=1 --extlinux
network --bootproto=dhcp --device=eth0 --onboot=on services --enabled=network,sshd,rsyslog,iptables @@ -72,6 +72,9 @@ rsync # 0 means wait forever, so instead we'll go with 1. sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+echo "Fixing hardcoded device names from appliance-creator" +sed -i 's//dev/.da1/LABEL=_//' /boot/extlinux/extlinux.conf + # setup systemd to boot to the right runlevel echo -n "Setting default runlevel to multiuser text mode" rm -f /etc/systemd/system/default.target