imgcreate/kickstart.py
by Jeremy Katz
imgcreate/kickstart.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3ce0f0e74cf4be22bb900c5cc50995a96fef54f3
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Sep 8 11:38:15 2008 -0400
Old version had both attrs for instLangs; so look at the broken version first
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 384660e..278ac72 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -527,10 +527,10 @@ def exclude_docs(ks):
return ks.handler.packages.excludeDocs
def inst_langs(ks):
- if hasattr(ks.handler.packages, "instLangs"):
- return ks.handler.packages.instLangs
- elif hasattr(ks.handler.packages, "instLange"):
+ if hasattr(ks.handler.packages, "instLange"):
return ks.handler.packages.instLange
+ elif hasattr(ks.handler.packages, "instLangs"):
+ return ks.handler.packages.instLangs
return ""
def get_post_scripts(ks):
15 years, 7 months
imgcreate/kickstart.py
by Jeremy Katz
imgcreate/kickstart.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6902c4456f5a151a217588feea690697e23ba6ff
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Sun Sep 7 20:43:31 2008 -0400
Also work with the typo'd version
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index f130400..384660e 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -529,6 +529,8 @@ def exclude_docs(ks):
def inst_langs(ks):
if hasattr(ks.handler.packages, "instLangs"):
return ks.handler.packages.instLangs
+ elif hasattr(ks.handler.packages, "instLange"):
+ return ks.handler.packages.instLange
return ""
def get_post_scripts(ks):
15 years, 7 months
F9-x86_64: setarch i686 not working anymore?
by Sebastian Vahl
Hi.
Is a "setarch i686 livecd-creator ..." to create a i686 based live image on a
x86_64 host not working anymore?
> # setarch i686 livecd-creator -c
> /usr/share/livecd-tools/livecd-fedora-base-desktop.ks Using label
> 'fedora-base-desktop-200809060049' and name
> 'livecd-fedora-base-desktop-200809060049' mke2fs 1.41.0 (10-Jul-2008)
> Filesystem label=fedora-base-desk
> OS type: Linux
> Block size=4096 (log=2)
> Fragment size=4096 (log=2)
> 262144 inodes, 1048576 blocks
> 10485 blocks (1.00%) reserved for the super user
> First data block=0
> Maximum filesystem blocks=1073741824
> 32 block groups
> 32768 blocks per group, 32768 fragments per group
> 8192 inodes per group
> Superblock backups stored on blocks:
> 32768, 98304, 163840, 229376, 294912, 819200, 884736
>
> Writing inode tables: done
> Creating journal (32768 blocks): done
> Writing superblocks and filesystem accounting information: done
>
> This filesystem will be automatically checked every 28 mounts or
> 180 days, whichever comes first. Use tune2fs -c or -i to override.
> tune2fs 1.41.0 (10-Jul-2008)
> Setting maximal mount count to -1
> Setting interval between checks to 0 seconds
> filespec_eval: hash table stats: 12 elements, 12/65536 buckets used,
> longest chain length 1 Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/r
>epodata/repomd.xml ...OK Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/r
>epodata/primary.sqlite.bz2 ...OK Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/r
>epodata/comps-rawhide.xml.gz ...OK No such package *debuginfo to remove
> Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/P
>ackages/basesystem-8.1-1.noarch.rpm ...OK Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/P
>ackages/nodoka-filesystem-0.3.90-2.fc10.noarch.rpm ...OK Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/P
>ackages/rootfiles-8.1-1.1.1.noarch.rpm ...OK Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/P
>ackages/xorg-x11-filesystem-7.3-2.fc10.noarch.rpm ...OK Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/P
>ackages/rt73usb-firmware-1.8-4.noarch.rpm ...OK Retrieving
> http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/development/x86_64/os/P
>ackages/python-slip-gtk-0.1.12-1.fc10.noarch.rpm ...OK
livecd-tools-017.1-1.fc9.x86_64
yum-3.2.19-1.fc9.noarch
Sebastian
15 years, 7 months
2 commits - imgcreate/creator.py imgcreate/kickstart.py
by Jeremy Katz
imgcreate/creator.py | 3 +++
imgcreate/kickstart.py | 19 +++++++++++++++++++
2 files changed, 22 insertions(+)
New commits:
commit 9d05379c53f718699080bdce60a4457b13dd5870
Author: Bryan Kearney <bkearney(a)redhat.com>
Date: Thu Sep 4 16:47:07 2008 -0400
Record rpm macro information
Record used rpm macros into the /etc/rpm/macros.imgcreate so
they persist with the image
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index f8ecdfd..519735e 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -720,6 +720,7 @@ class ImageCreator(object):
kickstart.ServicesConfig(self._instroot).apply(ksh.services)
kickstart.XConfig(self._instroot).apply(ksh.xconfig)
kickstart.NetworkConfig(self._instroot).apply(ksh.network)
+ kickstart.RPMMacroConfig(self._instroot).apply(self.ks)
self._create_bootconfig()
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 8444682..7072d51 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -234,6 +234,22 @@ class XConfig(KickstartConfig):
f.write(buf)
f.close()
+class RPMMacroConfig(KickstartConfig):
+ """A class to apply the specified rpm macros to the filesystem"""
+ def apply(self, ks):
+ if not ks:
+ return
+ f = open(self.path("/etc/rpm/macros.imgcreate"), "w+")
+ if exclude_docs(ks):
+ f.write("%_exludedocs 1\n")
+ if not selinux_enabled(ks):
+ f.write("%__file_context_path %{nil}\n")
+ if inst_langs(ks) != None:
+ f.write("%_install_langs ")
+ f.write(inst_langs(ks))
+ f.write("\n")
+ f.close()
+
class NetworkConfig(KickstartConfig):
"""A class to apply a kickstart network configuration to a system."""
def write_ifcfg(self, network):
commit 39f6ab31a40e9fe9c0f07f5963d00b7f0fc27fa6
Author: Bryan Kearney <bkearney(a)redhat.com>
Date: Thu Sep 4 15:08:57 2008 -0400
Added logic for the --instLangs %packages option to be used
This patch adds support for the --instLangs option being passed in on the
%packages line
Note that currently, pykickstart sets the option to be instLange not
instLangs. This patch uses the bad option name.
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index d9fa711..f8ecdfd 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -641,6 +641,8 @@ class ImageCreator(object):
rpm.addMacro("_excludedocs", "1")
if not kickstart.selinux_enabled(self.ks):
rpm.addMacro("__file_context_path", "%{nil}")
+ if kickstart.inst_langs(self.ks) != None:
+ rpm.addMacro("_install_langs", kickstart.inst_langs(self.ks))
try:
self.__select_packages(ayum)
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 11eac7c..8444682 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -510,6 +510,9 @@ def ignore_missing(ks):
def exclude_docs(ks):
return ks.handler.packages.excludeDocs
+def inst_langs(ks):
+ return ks.handler.packages.instLange
+
def get_post_scripts(ks):
scripts = []
for s in ks.handler.scripts:
15 years, 7 months
imgcreate/kickstart.py
by Jeremy Katz
imgcreate/kickstart.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 3b638f774797d476793f692371492818b6f9bff7
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Fri Sep 5 12:04:50 2008 -0400
The typo has been fixed; make it so that we handle things nicely
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 7072d51..f130400 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -527,7 +527,9 @@ def exclude_docs(ks):
return ks.handler.packages.excludeDocs
def inst_langs(ks):
- return ks.handler.packages.instLange
+ if hasattr(ks.handler.packages, "instLangs"):
+ return ks.handler.packages.instLangs
+ return ""
def get_post_scripts(ks):
scripts = []
15 years, 7 months
support for instLangs
by Bryan Kearney
This patch adds support for the --instaLangs option to be passed in on the header line. There are 2 issues with it:
1) Currently, pykickstart sets the option to be instLange not instLangs. This patch uses the bad option name.
2) I dont believe that the rpm macros (either _install_langs or _excludedocs) are persisted to the image. Therefore at updat, the space savings is lost. Can I suppose this should be another patch?
-- bk
15 years, 7 months
[PATCH] Record rpm macro information into the /etc/rpm/macros.imagecreate directory so they persist with the image
by Bryan Kearney
---
imgcreate/creator.py | 1 +
imgcreate/kickstart.py | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index b32a657..0a2453b 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -720,6 +720,7 @@ class ImageCreator(object):
kickstart.ServicesConfig(self._instroot).apply(ksh.services)
kickstart.XConfig(self._instroot).apply(ksh.xconfig)
kickstart.NetworkConfig(self._instroot).apply(ksh.network)
+ kickstart.RPMMacroConfig(self._instroot).apply(self.ks)
self._create_bootconfig()
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index b34f733..7c59e47 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -233,7 +233,23 @@ class XConfig(KickstartConfig):
f.seek(0)
f.write(buf)
f.close()
-
+
+class RPMMacroConfig(KickstartConfig):
+ """A class to apply the specified rpm macros to the filesystem"""
+ def apply(self, ks):
+ if not ks:
+ return
+ f = open(self.path("/etc/rpm/macros.imagecreate"), "w+")
+ if exclude_docs(ks):
+ f.write("%_exludedocs 1\n")
+ if not selinux_enabled(ks):
+ f.write("%__file_context_path %{nil}\n")
+ if inst_langs(ks) != None:
+ f.write("%_install_langs ")
+ f.write(inst_langs(ks))
+ f.write("\n")
+ f.close()
+
class NetworkConfig(KickstartConfig):
"""A class to apply a kickstart network configuration to a system."""
def write_ifcfg(self, network):
--
1.5.5.1
15 years, 7 months
problem with build using current git.
by Jim Gettys
I grabbed the git version of the tools, and successfully made a build.
But the second and subsequent tries all fail with the following stack
trace:
[root@penguin
build]# ./livecd/tools/livecd-creator /home/build/fedora-xo/olpc-gnome.ks --fslabel=OLPC-livecd
Traceback (most recent call last):
File "./livecd/tools/livecd-creator", line 136, in <module>
sys.exit(main())
File "./livecd/tools/livecd-creator", line 81, in main
options = parse_options(sys.argv[1:])
File "./livecd/tools/livecd-creator", line 57, in parse_options
imgcreate.setup_logging(parser)
AttributeError: 'module' object has no attribute 'setup_logging'
Any clue?
Thanks,
- Jim
--
Jim Gettys <jg(a)laptop.org>
One Laptop Per Child
15 years, 7 months
Problem with ps/2 mouse
by Mike Martin
Hi I am trying to create a custom iso image and I am hitting a problem
with ps2 mouse support ie: when I boot from the lise iso (on pen drive
if it makes a difference)
There is no mouse - on googling this seems a common problem with users
and ps2 mouse -but no mention on how to prevent the issue.
I have tried
selinux on and off
using desktop-base unchanged
and various other permutations but no joy
any ideas
15 years, 7 months
Periodically remastered LiveCDs?
by Mike Perry
Hey guys,
I was wondering if there are any plans or existing unofficial torrents
that provide remastered "stable" LiveCD images with all the recent
updates applied? For example, I've tried out the FC9 LiveCD and my
wireless card would not work until I installed the iso to a USB and
upgraded my wpa_supplicant and NetworkManager. From googling around,
this seemed like a common problem with the early FC9 installs.
In general, I've noticed the initial release of many distributions is
quite buggy, but that things vastly improve after a couple of months
of updates. Is there any reason why remastered updates aren't provided
officially? Having a more stable LiveCD will definitely give people a
much more favorable opinion of Fedora.
Anyways, great work on the LiveCD effort in general. I was really
impressed with how easy it was to get the USB stick installed in a
non-destructive fashion, even when it contained the very .iso it
installed from. Cool stuff!
--
Mike Perry
Mad Computer Scientist
fscked.org evil labs
15 years, 7 months