[Fedora-livecd-list] 2 commits - config/livecd-fedora-desktop.ks imgcreate/creator.py

[Jeremy Katz]

 config/livecd-fedora-desktop.ks |    7 ++++++-
 imgcreate/creator.py            |   21 +++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit c294c085b1490bd7b797d8e70d3d0596e13e44bf
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Mar 4 09:12:48 2008 -0500

    Fix up for changes in the gdm config file so that we get autologin again

diff --git a/config/livecd-fedora-desktop.ks b/config/livecd-fedora-desktop.ks
index 51219f4..a0d24bc 100644
--- a/config/livecd-fedora-desktop.ks
+++ b/config/livecd-fedora-desktop.ks
@@ -146,7 +146,12 @@ cat >> /etc/rc.d/init.d/fedora-live << EOF
 # disable screensaver locking
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
 # set up timed auto-login for after 60 seconds
-sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
+cat >> /etc/gdm/custom.conf << FOE
+[daemon]
+TimedLoginEnable=true
+TimedLogin=fedora
+TimedLoginDelay=60
+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


commit e6138051b542aecef423c32f812bc44580bda932
Author: Warren Togami <wtogami at redhat.com>
Date:   Thu Feb 28 12:17:22 2008 -0500

    Create a minimal /dev instead of bind mounting the host's /dev

diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 11fce2d..1028e32 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -427,14 +427,14 @@ class ImageCreator(object):
 
         self._mount_instroot(base_on)
 
-        for d in ("/etc", "/boot", "/var/log", "/var/cache/yum"):
+        for d in ("/dev/pts", "/etc", "/boot", "/var/log", "/var/cache/yum"):
             makedirs(self._instroot + d)
 
         cachesrc = cachedir or (self.__builddir + "/yum-cache")
         makedirs(cachesrc)
 
         # bind mount system directories into _instroot
-        for (f, dest) in [("/sys", None), ("/proc", None), ("/dev", None),
+        for (f, dest) in [("/sys", None), ("/proc", None),
                           ("/dev/pts", None),
                           (cachesrc, "/var/cache/yum")]:
             self.__bindmounts.append(BindChrootMount(f, self._instroot, dest))
@@ -443,6 +443,23 @@ class ImageCreator(object):
         if kickstart.selinux_enabled(self.ks):
             self.__bindmounts.append(BindChrootMount("/selinux", self._instroot, None))
 
+        # Create minimum /dev
+        origumask = os.umask(0000)
+        devices = [('null',   1, 3, 0666),
+                   ('urandom',1, 9, 0666),
+                   ('random', 1, 8, 0666),
+                   ('full',   1, 7, 0666),
+                   ('ptmx',   5, 2, 0666),
+                   ('tty',    5, 0, 0666),
+                   ('zero',   1, 5, 0666)]
+        for (node, major, minor, perm) in devices:
+            os.mknod(self._instroot + "/dev/" + node, perm | stat.S_IFCHR, os.makedev(major,minor))
+        os.symlink('/proc/self/fd',   self._instroot + "/dev/fd")
+        os.symlink('/proc/self/fd/0', self._instroot + "/dev/stdin")
+        os.symlink('/proc/self/fd/1', self._instroot + "/dev/stdout")
+        os.symlink('/proc/self/fd/2', self._instroot + "/dev/stderr")
+        os.umask(origumask)
+
         self._do_bindmounts()
 
         os.symlink("../proc/mounts", self._instroot + "/etc/mtab")