imgcreate/creator.py imgcreate/kickstart.py
by Brian C. Lane
imgcreate/creator.py | 3 ++-
imgcreate/kickstart.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit c363cdbbe68a905a02e8a5a5fe385a82ce91f1f2
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Fri Jun 21 17:50:08 2013 -0700
Add repo --noverifyssl support (#907707)
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 64cd188..42faf6f 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -627,7 +627,7 @@ class ImageCreator(object):
ayum.setup(yum_conf, self._instroot, cacheonly=self.cacheonly)
for repo in kickstart.get_repos(self.ks, repo_urls):
- (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo
+ (name, baseurl, mirrorlist, proxy, inc, exc, cost, sslverify) = repo
yr = ayum.addRepository(name, baseurl, mirrorlist)
if inc:
@@ -638,6 +638,7 @@ class ImageCreator(object):
yr.proxy = proxy
if cost is not None:
yr.cost = cost
+ yr.sslverify = sslverify
ayum.setup(yum_conf, self._instroot)
if kickstart.exclude_docs(self.ks):
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 20f2df6..1059801 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -543,6 +543,7 @@ def get_repos(ks, repo_urls = {}):
baseurl = repo.baseurl
mirrorlist = repo.mirrorlist
proxy = repo.proxy
+ sslverify = not repo.noverifyssl
if repo.name in repo_urls:
baseurl = repo_urls[repo.name]
@@ -550,7 +551,7 @@ def get_repos(ks, repo_urls = {}):
if repos.has_key(repo.name):
logging.warn("Overriding already specified repo %s" %(repo.name,))
- repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost)
+ repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost, sslverify)
return repos.values()
10 years, 5 months
TypeError: sequence item 0: expected string, tuple found
by James Heather
Anyone hit this before while using livecd-creator?
James
-------------
....
Retrieving http://mirror.bytemark.co.uk/fedora/linux/updates/testing/19/x86_64/youtu... ...OK
Retrieving http://mirror.bytemark.co.uk/fedora/linux/updates/testing/19/x86_64/yum-3... ...OK
Unmounting directory /var/tmp/imgcreate-dfmmBm/install_root
Losetup remove /dev/loop0
Traceback (most recent call last):
File "/usr/bin/livecd-creator", line 237, in <module>
sys.exit(main())
File "/usr/bin/livecd-creator", line 218, in main
creator.install()
File "/usr/lib/python2.7/site-packages/imgcreate/creator.py", line 655, in install
ayum.runInstall()
File "/usr/lib/python2.7/site-packages/imgcreate/yuminst.py", line 220, in runInstall
raise CreatorError("Dependency check failed : %s" % "\n".join(deps))
TypeError: sequence item 0: expected string, tuple found
[root@zoe james]#
10 years, 5 months
Changes to 'refs/tags/livecd-tools-19.5'
by Brian C. Lane
Tag 'livecd-tools-19.5' created by Brian C. Lane <bcl(a)redhat.com> at 2013-06-17 19:34 +0000
Tag as livecd-tools-19.5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (GNU/Linux)
iQEVAwUAUb9kyxF+jBaO/jp/AQLXUgf9FSRtSupAj7yO7L3H8uSU/lSNKpJuSUch
9ho1eNiffe/dLEl5wvZftM/ibsLMQi/6U2P2FogFyyjwhzz9EelS28jqHGd+97On
ToKwUmFsx9ZRGeBHNVyJZ1qJe8HFqTNIHWYF01Ypqolh1wUM+eEed/MjEJO3W63s
yY6FouFUa4oxR/ijdjSwqYsrGzY4zi/gZLKPy6LVVNXI4RP9M7dTiBjnWBTZ3peZ
Hq6g9nLPWPKMWPMpGzSlPRPWNiiIjyyj3ugx2Pg2WVt3mnOPm2wrnI0JVBUlDo+E
h6ZAp2ZZLck9E9bQVKmKQYOfLC9E6Z4vcpOaf6zff1UPhQMFRz0hYA==
=8l2V
-----END PGP SIGNATURE-----
Changes since livecd-tools-19.4:
Brian C. Lane (3):
litd: Add --updates option
Write vconsole.conf directly
Version 19.5
---
Makefile | 2 +-
docs/livecd-iso-to-disk.pod | 6 +++++-
imgcreate/kickstart.py | 19 +++++++++++++++----
tools/livecd-iso-to-disk.sh | 15 +++++++++++++++
4 files changed, 36 insertions(+), 6 deletions(-)
---
10 years, 5 months
Makefile
by Brian C. Lane
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 68b56df25da001d0357fbd49db0145428ff3a1d2
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon Jun 17 12:34:16 2013 -0700
Version 19.5
diff --git a/Makefile b/Makefile
index 233e4d6..215a69a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 19.4
+VERSION = 19.5
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
10 years, 5 months
imgcreate/kickstart.py
by Brian C. Lane
imgcreate/kickstart.py | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit f674482986d701ddc21120fa8f9b0249095cdeec
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon Jun 17 10:29:11 2013 -0700
Write vconsole.conf directly
System Config Kickstart has been updated to use localed. This causes
problems when livecd-creator is used inside a mock (as it is with koji)
so we need a simpler way to setup the keyboard.
This writes the keyboard value directly to vconsole.conf without any
attempt to parse or verify it. If it is not included it defaults to us.
It also sets the font to latarcyrheb-sun16 which is the same thing that
Anaconda does.
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 1d01ba5..20f2df6 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -138,10 +138,21 @@ class LanguageConfig(KickstartConfig):
class KeyboardConfig(KickstartConfig):
"""A class to apply a kickstart keyboard configuration to a system."""
def apply(self, kskeyboard):
- k = keyboard.Keyboard()
- if kskeyboard.keyboard:
- k.set(kskeyboard.keyboard)
- k.write(self.instroot)
+ vcconf_file = self.path("/etc/vconsole.conf")
+ DEFAULT_VC_FONT = "latarcyrheb-sun16"
+
+ if not kskeyboard.keyboard:
+ kskeyboard.keyboard = "us"
+
+ try:
+ with open(vcconf_file, "w") as f:
+ f.write('KEYMAP="%s"\n' % kskeyboard.keyboard)
+
+ # systemd now defaults to a font that cannot display non-ascii
+ # characters, so we have to tell it to use a better one
+ f.write('FONT="%s"\n' % DEFAULT_VC_FONT)
+ except IOError as e:
+ logging.error("Cannot write vconsole configuration file: %s" % e)
class TimezoneConfig(KickstartConfig):
"""A class to apply a kickstart timezone configuration to a system."""
10 years, 5 months
Building F19 image
by James Heather
Anyone else getting weirdness when using livecd-creator to build an F19
image?
I've attached a file containing some of my terminal output. Two
different things that really shouldn't be happening:
(1) coreutils is not being installed early enough. It's 1214th to get
installed here (line 2139). But loads of other installations are going
wrong because rm, mkdir and touch are missing (line 67 is where it
starts to go wrong).
(2) cups-pdf stopped and asked me for a password! See line 3821. The
password it was asking for was my password on the host machine. I can
only imagine that something that was supposed to be happening inside a
chroot jail got run outside, and that it tried to install the virtual
printer on the host machine. So lpadmin failed (next line) because user
james doesn't have the rights to install a printer.
It's still building, but the coreutils problem means it's almost
certainly going to be an unusable image.
The host is F19 too, by the way, running
livecd-tools-19.4-1.fc19.x86_64.
James
10 years, 6 months
docs/livecd-iso-to-disk.pod tools/livecd-iso-to-disk.sh
by Brian C. Lane
docs/livecd-iso-to-disk.pod | 6 +++++-
tools/livecd-iso-to-disk.sh | 15 +++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit e0e2955812165a0eb993593aedce1f9186937e6f
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Fri Jun 7 12:14:15 2013 -0700
litd: Add --updates option
Pass --updates updates.img to livecd-iso-to-disk to setup an Anaconda
updates image on the device. It copies the file over to /updates.img and
adds inst.updates= to the kernel cmdline
diff --git a/docs/livecd-iso-to-disk.pod b/docs/livecd-iso-to-disk.pod
index 7ef0c14..8f9ed61 100644
--- a/docs/livecd-iso-to-disk.pod
+++ b/docs/livecd-iso-to-disk.pod
@@ -6,7 +6,7 @@ livecd-iso-to-disk - installs bootable Live images onto USB/SD storage devices.
=head1 SYNOPSIS
-B<livecd-iso-to-disk> [--help] [--noverify] [--format] [--reset-mbr] [--efi] [--skipcopy] [--force] [--xo] [--xo-no-home] [--timeout <time>] [--totaltimeout <time>] [--extra-kernel-args <args>] [--multi] [--livedir <dir>] [--compress] [--skipcompress] [--swap-size-mb <size>] [--overlay-size-mb <size>] [--home-size-mb <size>] [--delete-home] [--crypted-home] [--unencrypted-home] <source> <target device>
+B<livecd-iso-to-disk> [--help] [--noverify] [--format] [--reset-mbr] [--efi] [--skipcopy] [--force] [--xo] [--xo-no-home] [--timeout <time>] [--totaltimeout <time>] [--extra-kernel-args <args>] [--multi] [--livedir <dir>] [--compress] [--skipcompress] [--swap-size-mb <size>] [--overlay-size-mb <size>] [--home-size-mb <size>] [--delete-home] [--crypted-home] [--unencrypted-home] [--updates updates.img] <source> <target device>
Simplest
@@ -135,6 +135,10 @@ Specifies the default option to encrypt a new persistent home directory if --hom
Prevents the default option to encrypt a new persistent home directory.
+=item --updates updates.img
+
+Setup inst.updates to point to an updates image on the device. Anaconda uses this for testing updates to an iso without needing to make a new iso.
+
=back
=head1 CONTRIBUTORS
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 23612ea..c4fb4db 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -35,6 +35,7 @@ shortusage() {
[--compress] [--skipcompress] [--swap-size-mb <size>]
[--overlay-size-mb <size>] [--home-size-mb <size>]
[--delete-home] [--crypted-home] [--unencrypted-home]
+ [--updates updates.img]
<source> <target device>
(Enter livecd-iso-to-disk --help on the command line for more information.)"
@@ -244,6 +245,10 @@ usage() {
--unencrypted-home
Prevents the default option to encrypt a new persistent home directory.
+ --updates updates.img
+ Setup inst.updates to point to an updates image on the device. Anaconda
+ uses this for testing updates to an iso without needing to make a new iso.
+
CONTRIBUTORS
livecd-iso-to-disk: David Zeuthen, Jeremy Katz, Douglas McClendon,
@@ -702,6 +707,7 @@ imgtype=
packages=
LIVEOS=LiveOS
HOMEFILE="home.img"
+updates=
if [[ "$*" =~ "--help" ]]; then
usage
@@ -790,6 +796,10 @@ while [ $# -gt 2 ]; do
--delete-home)
keephome=""
;;
+ --updates)
+ updates=$2
+ shift
+ ;;
*)
echo "invalid arg -- $1"
shortusage
@@ -1186,6 +1196,11 @@ if [ "$srctype" = "live" ]; then
fi
fi
+# Setup the updates.img
+if [ -n "$updates" ]; then
+ copyFile "$updates" "$TGTMNT/updates.img"
+ kernelargs+=" inst.updates=hd:$TGTLABEL:/updates.img"
+fi
echo "Updating boot config file"
# adjust label and fstype
10 years, 6 months
some questions on making a LiveCD
by Ranjan Maitra
Hi,
I am trying to put together a LiveCD using the SLiM login manager on
Fedora 18. I have two questions:
1. How do I get slim to start up in the LiveCD boot. I have been
using the fedora-livecd-lxde.ks as a template. Before Fedora 17, I used
to put the following in my kickstart file:
# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/pekwm
DISPLAYMANAGER=/usr/sbin/slim-dynwm
EOF
I noticed that slim has moved from sbin/ to bin/ so I made the change,
but I can not get this to start up when booting from a LiveCD. How do I
get this to start up? I tried including systemctl enable slim but I
still can not get it to display the Login Manager. (I do get the text
prompt.) How do I fix this?
2. I have a few rpms of my own i would like to include in the
LiveCD. How can this be done? Are there examples somewhere that I could
look at?
Many thanks,
Ranjan
--
Important Notice: This mailbox is ignored: e-mails are set to be
deleted on receipt. For those needing to send personal or professional
e-mail, please use appropriate addresses.
____________________________________________________________
GET FREE 5GB EMAIL - Check out spam free email with many cool features!
Visit http://www.inbox.com/email to find out more!
10 years, 6 months
Changes to 'refs/tags/livecd-tools-13.4.4'
by Brian C. Lane
Tag 'livecd-tools-13.4.4' created by Brian C. Lane <bcl(a)redhat.com> at 2013-05-23 14:21 +0000
Tag as livecd-tools-13.4.4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (GNU/Linux)
iQEVAwUAUZ4l2BF+jBaO/jp/AQItSQgAmro2Ws5f6kwX5CKGwebZ0l8X40LZE2SJ
ON/T00UdQIAP3llbL/fBFgRwqn00w8iK381epL2PiNHJVftziScxNR25OQ6R2ozQ
OjopCn22nEqQb9wGqKXH45EdoFzfeaDjY4dHUU17y3Z0Mw+OiQJQdAbxBm3c5tNk
Ts8Q67WlZKCNALOE+wLjoj9d7EGqSp+ETGnTK3BPfC/nZDCZOB8W89rXcHCvRUpU
F9QAvyRQV4i7XuKpM9n9RpyKjRMhxDXnueN6v07zGs1iLs/vkAz42txwYu9Ru2cp
s77/30N2kxYSQkQi2CwBdKZrTZvXdJvyz+ODHTpRM+v0U8HwVw64qQ==
=dFk/
-----END PGP SIGNATURE-----
Changes since livecd-tools-13.4.3:
Brian C. Lane (1):
Version 13.4.4
Tomas Hoger (1):
Avoid setting empty root password (#962493)
---
Makefile | 2 +-
imgcreate/kickstart.py | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
---
10 years, 6 months
Changes to 'refs/tags/livecd-tools-19.4'
by Brian C. Lane
Tag 'livecd-tools-19.4' created by Brian C. Lane <bcl(a)redhat.com> at 2013-06-01 00:52 +0000
Tag as livecd-tools-19.4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (GNU/Linux)
iQEVAwUAUalFtxF+jBaO/jp/AQLF9wgAmBOsJnnXUEYhEvVLSUbjd/SXStXLK/eA
aGKsJdOaNINepDQafdqiCaU8rCtieI19hHvK8ur/WGPyQ49g1oQ5vA660pIUwtDe
Rl6EIBcaAAPeaMKFT68zDFfx6XJkLQaWNNhwMR7ICNa/0JPKjSTx6tHCWuye7CNX
4r7ke3LARmy5Myr7EI3yeWwwX5XiVJnEZ/coqHCMZft+pDYuCK1frV7bXlgXIkOb
VjInGIOqLrNicGgOk+gS5vCLoYJ3G9SHKxstR5761gETqknFBSa2VtzPN0V8QA/L
ZeSWykas1qSmMutiekhqCfTjiAoC4VYdtiPLqoRzDK0hWxPm34FMzA==
=7EmY
-----END PGP SIGNATURE-----
Changes since livecd-tools-19.3:
Brian C. Lane (3):
Fix default.target symlink (#968272)
Replace bash string parsing with awk (#962039)
Version 19.4
---
Makefile | 2 +-
imgcreate/kickstart.py | 2 +-
tools/livecd-iso-to-disk.sh | 11 +++++------
3 files changed, 7 insertions(+), 8 deletions(-)
---
10 years, 6 months