Changes to 'f10-branch'
by Jeremy Katz
New branch 'f10-branch' available with the following commits:
commit b10873be21ee4c64633db3134791b7676d637d0a
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Apr 2 16:57:13 2009 -0400
[BACKPORT] Use our syslinux's menu com32 modules (#492370)
com32 modules in syslinux don't seem to have a consistent API, so
let's workaround it by copying in the menu files from our syslinux
when doing livecd-iso-to-disk. This is kind of kludgey, really :/
commit 3eb1a55398ec447d3e7c6ce5555f39320437f47d
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Mar 2 20:39:36 2009 -0500
Support syslinux having moved to /usr/share
commit f158bdc7e3c107ff081afe3ac077ea6f0222a411
Author: Felix Schwarz <felix.schwarz(a)oss.schwarz.eu>
Date: Sat Feb 7 12:01:30 2009 +0100
Patch for unicode error messages
when I tried to build a custom live cd I noticed some problems in the error
reporting when there were unicode error messages (e.g. some dependency was
missing).
Example:
...
> anaconda-11.4.1.63-1.i386 von updates hat Abhängigkeitsauflöse-Probleme
> --> Fehlende Abhängigkeit: booty wird benötigt von Paket anaconda-11.4.1.63-1.i386 (updates)
> Traceback (most recent call last):
> File "./tools/livecd-creator", line 140, in <module>
> sys.exit(main())
> File "./tools/livecd-creator", line 132, in main
> logging.error("Error creating Live CD : %s" % e)
> UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 42: ordinal not in range(128)
My patch ensures that unicode error messages can be printed correctly every
time. To get 100% unicode support, one should go through all log calls and
ensure that all strings are unicode so that localized error messages are
always shown correctly.
With my patch, there should be no unicode exceptions anymore, even when the
error message may be printed as 'Fehlende Abh\xe4ngigkeit' instead of
'Fehlende Abhängigkeit' (notice the '\xe4' in the first string).
commit 52975f7527af30ddcbcb4b51add6bc82b8a44873
Author: Alan Pevec <apevec(a)redhat.com>
Date: Sun Dec 7 22:08:01 2008 +0100
fix device command version check
F8_Device is a FC3_Device subclass, so isinstance was always true
Signed-off-by: Alan Pevec <apevec(a)redhat.com>
commit 48ff59689082cc6217b1cf4fd01bdca242f2fc61
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Nov 24 09:50:58 2008 -0500
Shell escaping
commit 83373b045a24e223b1f56fa3dc509603fafe522e
Author: Bryan Kearney <bkearney(a)redhat.com>
Date: Wed Nov 19 12:50:35 2008 -0500
Fix macro name for excludedocs
commit e44f9af68ba48117d64da1895f42c79d1d42f1a6
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Sun Nov 16 19:55:14 2008 -0500
Fix up --base-on (#471656)
15 years
imgcreate/creator.py tools/image-creator tools/livecd-creator
by Jeremy Katz
imgcreate/creator.py | 3 +++
tools/image-creator | 5 +++++
tools/livecd-creator | 6 ++++++
3 files changed, 14 insertions(+)
New commits:
commit 456c1682e5352a1b2277195d5c261d530a014d30
Author: Martin Langhoff <martin(a)laptop.org>
Date: Mon Apr 20 18:50:03 2009 +0200
creator: "-d" opt and matching setdebug() method that gets rpm in debug mode
Useful to diagnose problems with %post scripts during the build. This patch
adds the method to the ImageCreator class, and the corresponding options to
image-creator and livecd-creator
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 823afc5..a7c79c7 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -760,6 +760,9 @@ class ImageCreator(object):
shutil.move(os.path.join(self._outdir, f),
os.path.join(destdir, f))
+ def setdebug(self):
+ rpm.setVerbosity(rpm.RPMLOG_DEBUG)
+
def create(self):
"""Install, configure and package an image.
diff --git a/tools/image-creator b/tools/image-creator
index 6f2604c..51b2558 100755
--- a/tools/image-creator
+++ b/tools/image-creator
@@ -30,6 +30,8 @@ def parse_options(args):
parser.add_option("-n", "--name", type="string", dest="name",
help="Image name and filesystem label")
+ parser.add_option("-d", "--debug", action="store_true", dest="debug",
+ help="Enable debug mode")
imgcreate.setup_logging(parser)
@@ -61,6 +63,9 @@ def main():
creator = imgcreate.LoopImageCreator(ks, name)
+ if options.debug:
+ creator.setdebug()
+
try:
creator.create()
except imgcreate.CreatorError, e:
diff --git a/tools/livecd-creator b/tools/livecd-creator
index 39f7478..c534900 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -60,6 +60,9 @@ def parse_options(args):
# Start a shell in the chroot for post-configuration.
parser.add_option("-l", "--shell", action="store_true", dest="give_shell",
help=optparse.SUPPRESS_HELP)
+ parser.add_option("-d", "--debug", action="store_true", dest="debug",
+ help="Enable debugging during the build")
+
# Don't compress the image.
parser.add_option("-s", "--skip-compression", action="store_true", dest="skip_compression",
help=optparse.SUPPRESS_HELP)
@@ -118,6 +121,9 @@ def main():
if options.cachedir:
options.cachedir = os.path.abspath(options.cachedir)
+ if options.debug:
+ creator.setdebug()
+
try:
creator.mount(options.base_on, options.cachedir)
creator.install()
15 years
imgcreate/creator.py tools/image-creator tools/livecd-creator
by Jeremy Katz
imgcreate/creator.py | 3 ---
tools/image-creator | 5 -----
tools/livecd-creator | 6 ------
3 files changed, 14 deletions(-)
New commits:
commit 26b39090403d75ef11cb43b52d5a29202a6ad533
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Tue Apr 21 10:09:16 2009 -0400
Revert "creator: "-d" opt and matching setdebug() method that gets rpm in debug mode"
This reverts commit 456c1682e5352a1b2277195d5c261d530a014d30 as the option conflicts
with other existing options
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index a7c79c7..823afc5 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -760,9 +760,6 @@ class ImageCreator(object):
shutil.move(os.path.join(self._outdir, f),
os.path.join(destdir, f))
- def setdebug(self):
- rpm.setVerbosity(rpm.RPMLOG_DEBUG)
-
def create(self):
"""Install, configure and package an image.
diff --git a/tools/image-creator b/tools/image-creator
index 51b2558..6f2604c 100755
--- a/tools/image-creator
+++ b/tools/image-creator
@@ -30,8 +30,6 @@ def parse_options(args):
parser.add_option("-n", "--name", type="string", dest="name",
help="Image name and filesystem label")
- parser.add_option("-d", "--debug", action="store_true", dest="debug",
- help="Enable debug mode")
imgcreate.setup_logging(parser)
@@ -63,9 +61,6 @@ def main():
creator = imgcreate.LoopImageCreator(ks, name)
- if options.debug:
- creator.setdebug()
-
try:
creator.create()
except imgcreate.CreatorError, e:
diff --git a/tools/livecd-creator b/tools/livecd-creator
index c534900..39f7478 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -60,9 +60,6 @@ def parse_options(args):
# Start a shell in the chroot for post-configuration.
parser.add_option("-l", "--shell", action="store_true", dest="give_shell",
help=optparse.SUPPRESS_HELP)
- parser.add_option("-d", "--debug", action="store_true", dest="debug",
- help="Enable debugging during the build")
-
# Don't compress the image.
parser.add_option("-s", "--skip-compression", action="store_true", dest="skip_compression",
help=optparse.SUPPRESS_HELP)
@@ -121,9 +118,6 @@ def main():
if options.cachedir:
options.cachedir = os.path.abspath(options.cachedir)
- if options.debug:
- creator.setdebug()
-
try:
creator.mount(options.base_on, options.cachedir)
creator.install()
15 years
tools/livecd-iso-to-pxeboot.sh
by Jeremy Katz
tools/livecd-iso-to-pxeboot.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1acd7f772f1d6b4dfeb84e0aed5ee41bcd7fb908
Author: Marc Herbert <Marc.Herbert(a)gmail.com>
Date: Mon Apr 20 12:56:41 2009 +0100
cpio "-L" to dereference any symbolic link to the actual ISO
This is safe because the cpio archive contains only the ISO image.
(Such a symbolic link is helpful to track the date-based,
constantly changing ISO name).
diff --git a/tools/livecd-iso-to-pxeboot.sh b/tools/livecd-iso-to-pxeboot.sh
index 22810d9..45a1ffe 100755
--- a/tools/livecd-iso-to-pxeboot.sh
+++ b/tools/livecd-iso-to-pxeboot.sh
@@ -87,7 +87,7 @@ fi
# filesystem.
ISOBASENAME=`basename "$ISO"`
ISODIRNAME=`dirname "$ISO"`
-( cd "$ISODIRNAME" && echo "$ISOBASENAME" | cpio -H newc --quiet -o ) |
+( cd "$ISODIRNAME" && echo "$ISOBASENAME" | cpio -H newc --quiet -L -o ) |
gzip -9 |
cat $CDMNT/isolinux/initrd0.img - > tftpboot/initrd0.img
15 years
[PATCH] cpio "-L" to dereference any symbolic link to the actual ISO
by Marc Herbert
This is safe because the cpio archive contains only the ISO image.
(Such a symbolic link is helpful to track the date-based,
constantly changing ISO name).
---
tools/livecd-iso-to-pxeboot.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/livecd-iso-to-pxeboot.sh b/tools/livecd-iso-to-pxeboot.sh
index 22810d9..45a1ffe 100755
--- a/tools/livecd-iso-to-pxeboot.sh
+++ b/tools/livecd-iso-to-pxeboot.sh
@@ -87,7 +87,7 @@ fi
# filesystem.
ISOBASENAME=`basename "$ISO"`
ISODIRNAME=`dirname "$ISO"`
-( cd "$ISODIRNAME" && echo "$ISOBASENAME" | cpio -H newc --quiet -o ) |
+( cd "$ISODIRNAME" && echo "$ISOBASENAME" | cpio -H newc --quiet -L -o ) |
gzip -9 |
cat $CDMNT/isolinux/initrd0.img - > tftpboot/initrd0.img
--
1.6.0.6
15 years
Very basic question.
by Mick M.
Hi;
I have been reading this list for a while.
Is there a how-to or webpage for this group?
I see people writing patches, but not how or where to apply them.
What goes where? where did it come from?
I am running F10 KDE.
What file do I download, to where?
Then how do you run patch? (the man page is confusing)
I can program in C (dos 6 days).
I just need to know how to get started.
Thanks
Mick M.
15 years
brasero-nautilus on live rawhide
by Williamson Grant
Hi,
any one else seeing issues logging in to livecd when brasero-nautilus
is installed.
I am seeing a crash when gnome session starts. I see this on both
i386 & x86_64 live media.
Packages :-
livecd-tools-022-1.fc11.i586.rpm
brasero-libs-2.26.0-1.fc11.i586.rpm
brasero-nautilus-2.26.0-1.fc11.i586.rpm
This is on Fedora 11 rawhide,.
Other things observed
when I install from cd to disk, I no longer see the issue.
removing brasero-nautilus solves the problem.
Bug Report :-
Distribution: Fedora release 10.92 (Rawhide)
Gnome Release: 2.26.1 2009-04-13 (Red Hat, Inc)
BugBuddy Version: 2.26.0
System: Linux 2.6.29.1-70.fc11.i586 #1 SMP Mon Apr 13 14:00:43 EDT
2009 i686
X Vendor: The X.Org Foundation
X Vendor Release: 10600000
Selinux: No
Accessibility: Disabled
GTK+ Theme: Nodoka
Icon Theme: Fedora
GTK+ Modules: canberra-gtk-module, pk-gtk-module, gnomebreakpad
Memory status: size: 0 vsize: 0 resident: 0 share: 0 rss: 0 rss_rlim: 0
CPU usage: start_time: 0 rtime: 0 utime: 0 stime: 0 cutime:0 cstime: 0
timeout: 0 it_real_value: 0 frequency: 0
----------- .xsession-errors ---------------------
06e9a000-06e9b000 rw-p 00021000 fd:00 278142 /usr/lib/libbrasero-
media.so.0.1.1
08048000-08207000 r-xp 00000000 fd:00 274490 /usr/bin/nautilus
08207000-0820d000 rw-p 001be000 fd:00 274490 /usr/bin/nautilus
08371000-08493000 rw-p 08371000 00:00 0 [heap]
b6500000-b6521000 rw-p b6500000 00:00 0
b6521000-b6600000 ---p b6521000 00:00 0
b66ff000-b6700000 ---p b66ff000 00:00 0
b6700000-b7100000 rw-p b6700000 00:00 0
b7100000-b7121000 rw-p b7100000 00:00 0
b7121000-b7200000 ---p b7121000 00:00 0
b7218000-b7219000 ---p b7218000 00:00 0
b7219000-b7d1a000 rw-p b7219000 00:00 0
b7d1a000-b7f1a000 r--p 00000000 fd:00 6750 /usr/lib/locale/
locale-archive
b7f1a000-b7f29000 rw-p b7f1a000 00:00 0
bf922000-bf937000 rw-p bffeb000 00:00 0 [stack]
--------------------------------------------------
15 years
Changes to 'refs/tags/livecd-tools-023'
by Jeremy Katz
Tag 'livecd-tools-023' created by Jeremy Katz <katzj(a)redhat.com> at 2009-04-14 17:49 +0000
livecd-tools-023
Changes since livecd-tools-020-52:
---
0 files changed
---
15 years
Makefile
by Jeremy Katz
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7df3ad48c9c47ac9f0a10d998feb4333d17442c3
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Tue Apr 14 13:49:17 2009 -0400
Bump version
diff --git a/Makefile b/Makefile
index 360ebe6..c597ffc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 022
+VERSION = 023
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
15 years
imgcreate/creator.py
by Jeremy Katz
imgcreate/creator.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit fd252dc757a086b104decb2c1bd88345450efcf5
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Apr 13 15:44:56 2009 -0400
Fix traceback with selinux disabled (#495269)
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 498f7e6..823afc5 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -433,6 +433,8 @@ class ImageCreator(object):
def __getbooleans(self):
booleans = []
+ if not kickstart.selinux_enabled(self.ks):
+ return booleans
for i in selinux.security_get_boolean_names()[1]:
on = selinux.security_get_boolean_active(i)
booleans.append(("/booleans/%s" % i, "%d %d" % (on, on)))
15 years
