Makefile.am | 2 +-
fedora-live-base.ks | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 14be4958bb3ab3c0ab4b234b78718837f32f0116
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 11 21:32:38 2009 -0500
Pass "--kickstart=" when running liveinst with a kickstart (#543722)
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 7df819f..9f2b5ff 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -12,7 +12,7 @@ keyboard us
timezone US/Eastern
auth --useshadow --enablemd5
selinux --enforcing
-firewall --enabled --service=mdns
+firewall --enabled
xconfig --startxonboot
part / --size 3072 --fstype ext4
services --enabled=NetworkManager --disabled=network,sshd
@@ -296,7 +296,7 @@ touch /.liveimg-late-configured
for o in \`cat /proc/cmdline\` ; do
case \$o in
ks=*)
- ks="\${o#ks=}"
+ ks="--kickstart=\${o#ks=}"
;;
xdriver=*)
xdriver="--set-driver=\${o#xdriver=}"
commit 895bb853c7968dbf84bd6d69ee80e15282c45fdb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 11 21:32:19 2009 -0500
git-log command no longer exists, should be "git log"
diff --git a/Makefile.am b/Makefile.am
index f74dd10..81c2e75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ clean:
rm -f aclocal.m4 configure
ChangeLog:
- (GIT_DIR=.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ (GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
rpm: ChangeLog dist
@(rpmbuild -ta ${PACKAGE}-$(PACKAGE_VERSION).tar.gz)