[Fedora-livecd-list] 6 commits - config/livecd-fedora-base-desktop.ks config/livecd-fedora-desktop.ks imgcreate/kickstart.py imgcreate/yuminst.py
Jeremy Katz
katzj at fedoraproject.org
Thu Apr 10 04:15:03 UTC 2008
config/livecd-fedora-base-desktop.ks | 11 +++++++++--
config/livecd-fedora-desktop.ks | 1 +
imgcreate/kickstart.py | 25 ++++++++-----------------
imgcreate/yuminst.py | 6 ++++--
4 files changed, 22 insertions(+), 21 deletions(-)
New commits:
commit 0e85e65b0e3f45d17650c5d2e87768dcf5d4f7dd
Author: Jeremy Katz <katzj at redhat.com>
Date: Tue Apr 8 15:26:11 2008 -0400
Don't check for updates with PackageKit during live boots
diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 72bd4cf..b3c418d 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -136,6 +136,11 @@ chkconfig --level 345 firstboot off 2>/dev/null
# don't start yum-updatesd for livecd boots
chkconfig --level 345 yum-updatesd off 2>/dev/null
+# don't do packagekit checking by default
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_updates never >/dev/null
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_refresh_cache never >/dev/null
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_available false >/dev/null
+
# don't start cron/at as they tend to spawn things which are
# disk intensive that are painful on a live image
chkconfig --level 345 crond off 2>/dev/null
commit 3b3b7824763f14230fa45fbad65e50e469b5dda8
Author: Jeremy Katz <katzj at redhat.com>
Date: Fri Apr 4 11:08:16 2008 -0400
Revert "Handle the fact that upstart doesn't use inittab"
This reverts commit 7c1246ff21f5be35ef2ac470bd62378f079cb39e. Upstart
is now looking at inittab (again)
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index ebee1b4..30156d8 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -208,23 +208,14 @@ class ServicesConfig(KickstartConfig):
class XConfig(KickstartConfig):
"""A class to apply a kickstart X configuration to a system."""
def apply(self, ksxconfig):
- if os.path.exists(self.path("/etc/inittab")) and ksxconfig.startX:
- f = open(self.path("/etc/inittab"), "rw+")
- buf = f.read()
- buf = buf.replace("id:3:initdefault", "id:5:initdefault")
- f.seek(0)
- f.write(buf)
- f.close()
-
- # sigh. with upstart, we no longer use inittab
- if os.path.exists(self.path("/etc/sysconfig/init")) and not ksxconfig.startX:
- f = open(self.path("/etc/sysconfig/init"), "rw+")
- buf = f.read()
- buf = buf.replace("GRAPHICAL=yes", "GRAPHICAL=no")
- f.seek(0)
- f.write(buf)
- f.close()
-
+ if not ksxconfig.startX:
+ return
+ f = open(self.path("/etc/inittab"), "rw+")
+ buf = f.read()
+ buf = buf.replace("id:3:initdefault", "id:5:initdefault")
+ f.seek(0)
+ f.write(buf)
+ f.close()
class NetworkConfig(KickstartConfig):
"""A class to apply a kickstart network configuration to a system."""
commit bcbe540da5be8866a6f0b82f8758473fc43a79de
Author: Jeremy Katz <katzj at redhat.com>
Date: Thu Apr 3 14:09:50 2008 -0400
Switch to turning off firstboot via chkconfig to avoid launching s-c-display
diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 2d3c8c0..72bd4cf 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -131,7 +131,7 @@ useradd -c "Fedora Live" fedora
passwd -d fedora > /dev/null
# turn off firstboot for livecd boots
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+chkconfig --level 345 firstboot off 2>/dev/null
# don't start yum-updatesd for livecd boots
chkconfig --level 345 yum-updatesd off 2>/dev/null
commit 54f5283bda966b12f54c0ea58bdbd4f1af67082e
Author: Jeremy Katz <katzj at redhat.com>
Date: Wed Apr 2 09:37:17 2008 -0400
Set perms on fedora user's homedir so their .face is visible
diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 3c775dd..2d3c8c0 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -122,7 +122,7 @@ if ! strstr "\`cat /proc/cmdline\`" noswap -a [ -n "\$swaps" ] ; then
fi
# configure X, allowing user to override xdriver
-if [ -n "$xdriver" ]; then
+if [ -n "\$xdriver" ]; then
exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
fi
diff --git a/config/livecd-fedora-desktop.ks b/config/livecd-fedora-desktop.ks
index 106bf52..edd6097 100644
--- a/config/livecd-fedora-desktop.ks
+++ b/config/livecd-fedora-desktop.ks
@@ -158,6 +158,7 @@ FOE
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
chown fedora:fedora /home/fedora/.face
+ chmod 711 /home/fedora
# TODO: would be nice to get e-d-s to pick this one up too... but how?
fi
commit f3f26d37c9eda1b0deef9655a14b540713fd18bd
Author: Jeremy Katz <katzj at redhat.com>
Date: Fri Mar 28 14:39:38 2008 -0400
Raise errors on dep problems
diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py
index a8dd6cd..23804bc 100644
--- a/imgcreate/yuminst.py
+++ b/imgcreate/yuminst.py
@@ -152,7 +152,7 @@ class LiveCDYum(yum.YumBase):
(res, resmsg) = self.buildTransaction()
except yum.Errors.RepoError, e:
raise CreatorError("Unable to download from repo : %s" %(e,))
- if res != 2 and False:
+ if res != 2:
raise CreatorError("Failed to build transaction : %s" % str.join("\n", resmsg))
dlpkgs = map(lambda x: x.po, filter(lambda txmbr: txmbr.ts_state in ("i", "u"), self.tsInfo.getMembers()))
@@ -161,7 +161,9 @@ class LiveCDYum(yum.YumBase):
self.initActionTs()
self.populateTs(keepold=0)
- self.ts.check()
+ deps = self.ts.check()
+ if len(deps) != 0:
+ raise CreatorError("Dependency check failed!")
rc = self.ts.order()
if rc != 0:
raise CreatorError("ordering packages for installation failed!")
commit a5885bd50c65356be4092c2ab8e8c99afba854ef
Author: Jeremy Katz <katzj at redhat.com>
Date: Fri Mar 28 14:39:20 2008 -0400
Only run system-config-display if the user asks for a specific driver
diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 092d621..3c775dd 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -122,7 +122,9 @@ if ! strstr "\`cat /proc/cmdline\`" noswap -a [ -n "\$swaps" ] ; then
fi
# configure X, allowing user to override xdriver
-exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
+if [ -n "$xdriver" ]; then
+ exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
+fi
# add fedora user with no passwd
useradd -c "Fedora Live" fedora
More information about the Fedora-livecd-list
mailing list