[pykickstart PATCH] ostreesetup: New command
by Colin Walters
[ Rebased onto master, fixed up for comments from anaconda-devel thread:
https://www.redhat.com/archives/anaconda-devel-list/2014-March/msg00028.html
]
This tells the installer to handle an OSTree repository.
---
pykickstart/commands/__init__.py | 3 +-
pykickstart/commands/ostreesetup.py | 75
+++++++++++++++++++++++++++++++++++++
pykickstart/handlers/control.py | 2 +
tests/commands/ostreesetup.py | 38 +++++++++++++++++++
4 files changed, 117 insertions(+), 1 deletion(-)
create mode 100644 pykickstart/commands/ostreesetup.py
create mode 100644 tests/commands/ostreesetup.py
10 years, 1 month
[blivet:master 0/3] Improvements to pylintcodediff
by Anne Mulhern
It is more informative and cautious as well as pylint error free.
mulhern (3):
Exit if the specified log file does not exist.
Don't run test if the git branch is dirty
Fix all pylint errors in pylintcodediff
scripts/pylintcodediff | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
--
1.8.3.1
10 years, 1 month
[PATCH] Update makebumpver for the newer python-bugzilla on rawhide.
by Chris Lumens
---
scripts/makebumpver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/makebumpver b/scripts/makebumpver
index 381d339..8367da4 100755
--- a/scripts/makebumpver
+++ b/scripts/makebumpver
@@ -142,7 +142,7 @@ class MakeBumpVer:
if not self.password:
self.password = getpass.getpass()
- bzclass = bugzilla.getBugzillaClassForURL(self.bzurl)
+ bzclass = bugzilla.getBugzillaClassForURL(self.bzurl, True)
self.bz = bzclass(url=self.bzurl)
print
--
1.8.3.1
10 years, 1 month
[PATCH rhel7-branch] network: don't crash on virtual devices turned off (#1080640)
by Radek Vykydal
Resolves: rhbz#1080640
---
pyanaconda/network.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index f54c9ec..63f2ef7 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -545,6 +545,9 @@ def add_connection_for_ksdata(networkdata, devname):
def ksdata_from_ifcfg(devname, uuid=None):
+ if devname not in nm.nm_devices():
+ return None
+
if nm.nm_device_is_slave(devname):
return None
if nm.nm_device_type_is_wifi(devname):
--
1.7.11.7
10 years, 1 month
[rhel7/master] Add a list of cmdline args that append instead of replace (#1073130)
by Brian C. Lane
The change for gathering up multiple modprobe.blacklist entries has
caused some other problems with the expectation that entries will be
overwritten instead of appended. This returns to the overwrite behavior,
except for cmdline args listed in constants.CMDLINE_APPEND
Related: rhbz#1073130
---
pyanaconda/constants.py | 3 +++
pyanaconda/flags.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py
index 8de29a9..266eb53 100644
--- a/pyanaconda/constants.py
+++ b/pyanaconda/constants.py
@@ -151,3 +151,6 @@ FIRSTBOOT_ENVIRON = "firstboot"
# Tainted hardware
UNSUPPORTED_HW = 1 << 28
+
+# cmdline arguments that append instead of overwrite
+CMDLINE_APPEND = ["modprobe.blacklist"]
diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
index cbba624..fc4a331 100644
--- a/pyanaconda/flags.py
+++ b/pyanaconda/flags.py
@@ -166,8 +166,8 @@ class BootArgs(OrderedDict):
key = i
val = None
- # Duplicate args create a space separated string
- if self.get(key, None):
+ # Some duplicate args create a space separated string
+ if key in CMDLINE_APPEND and self.get(key, None):
if val:
self[key] = self[key] + " " + val
else:
--
1.8.5.3
10 years, 1 month
[PATCH] support ppc64le in anaconda
by Mark Hamzy
Add support for the ppc64le architecture in anaconda.
---
anaconda.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index bb0db85..d316da4 100755
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -1,4 +1,4 @@
-%define livearches %{ix86} x86_64 ppc ppc64
+%define livearches %{ix86} x86_64 ppc ppc64 ppc64le
Summary: Graphical system installer
Name: anaconda
--
1.9.0
10 years, 1 month
[blivet:master 0/7] Fairly straightforward pylint inspired fixes
by Anne Mulhern
A bunch of fairly simple pylint inspired fixes and one tiny bug fix.
It is possible that some of the unused variables shouldn't be unused, but
they really do seem to be.
David Shea (3):
Rearranged some iffy exception checking
Get rid of old exception unpacking syntax
Be specific when catching exceptions
mulhern (4):
Use the disk's name in log message
Don't get return values from communicate() if they are ignored
Remove a lot of unused variables extracted from udev info
Remove appendiceal assignments
blivet/__init__.py | 3 +--
blivet/devicefactory.py | 8 ++------
blivet/devices.py | 2 +-
blivet/devicetree.py | 22 ++--------------------
blivet/partitioning.py | 8 ++------
tests/devicelibs_test/baseclass.py | 6 +++---
tests/devicelibs_test/btrfs_test.py | 2 +-
tests/size_test.py | 1 -
8 files changed, 12 insertions(+), 40 deletions(-)
--
1.8.3.1
10 years, 1 month
[PATCH] support ppc64le in lorax
by Mark Hamzy
Add support for the ppc64le architecture in lorax.
---
share/ppc64le.tmpl | 82 ++++++++++++++++++++++++++++++++++++++++++++++
share/runtime-install.tmpl | 2 +-
src/pylorax/__init__.py | 2 +-
src/pylorax/treebuilder.py | 1 +
4 files changed, 85 insertions(+), 2 deletions(-)
create mode 100644 share/ppc64le.tmpl
diff --git a/share/ppc64le.tmpl b/share/ppc64le.tmpl
new file mode 100644
index 0000000..b63f8b3
--- /dev/null
+++ b/share/ppc64le.tmpl
@@ -0,0 +1,82 @@
+<%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product, isolabel"/>
+<%
+configdir="tmp/config_files/ppc"
+BOOTDIR="ppc"
+GRUBDIR="boot/grub"
+LIVEDIR="LiveOS"
+
+## NOTE: yaboot freaks out and stops parsing its config if it sees a '\',
+## so we can't use the udev escape sequences in the root arg.
+## Instead we'll just replace any non-ASCII characters in the isolabel
+## with '_', which means we won't need any udev escapes.
+isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel)
+
+## Anaconda finds the CDROM device automatically
+rootarg = ""
+%>
+
+mkdir ${LIVEDIR}
+install ${runtime_img} ${LIVEDIR}/squashfs.img
+treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
+
+## install the bootloaders
+## ppc/chrp: for normal PPC systems.
+## uses /ppc/bootinfo.txt in the iso root
+## uses /boot/grub/grub.cfg in the iso root
+mkdir ${BOOTDIR}
+## boot stuff for normal (CHRP/PREP) PPC systems
+install ${configdir}/bootinfo.txt ${BOOTDIR}
+
+mkdir ${GRUBDIR}/powerpc-ieee1275
+## "()" means the current device to grub2
+runcmd grub2-mkimage --format=powerpc-ieee1275 --directory=/usr/lib/grub/powerpc-ieee1275 --prefix="()/"${GRUBDIR} \
+--output=${outroot}/${GRUBDIR}/powerpc-ieee1275/core.elf iso9660 ext2 ofnet net tftp http
+install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275
+install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275
+
+install ${configdir}/grub.cfg.in ${GRUBDIR}/grub.cfg
+replace @PRODUCT@ '${product.name}' ${GRUBDIR}/grub.cfg
+replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg
+replace @ROOT@ "${rootarg}" ${GRUBDIR}/grub.cfg
+
+## copy mapping and magic files needed for isos
+install ${configdir}/mapping ${BOOTDIR}
+install ${configdir}/magic ${BOOTDIR}
+
+## Install kernel and bootloader config (in separate places for each arch)
+%for kernel in kernels:
+ <%
+ bits = 64
+ ## separate dirs/images for each arch
+ KERNELDIR=BOOTDIR+"/ppc%s" % bits
+ %>
+ ## install kernel
+ mkdir ${KERNELDIR}
+ installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz
+ installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+
+ %if doupgrade:
+ ## upgrade image
+ installupgradeinitrd images-${kernel.arch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
+ %endif
+
+ treeinfo images-${kernel.arch} zimage
+%endfor
+
+## make boot.iso, which gets renamed to Fedora-xx-xxxxx-netinst.iso
+mkdir images/
+runcmd mkisofs -v -U -J -R -T \
+ -o ${outroot}/images/boot.iso \
+ -part -hfs -r -l -sysid PPC \
+ -A "${product.name} ${product.version}" -V '${isolabel}' \
+ -volset "${product.version}" -volset-size 1 -volset-seqno 1 \
+ -hfs-volid ${product.version} \
+ -chrp-boot -map ${inroot}/${configdir}/mapping \
+ -no-desktop -allow-multidot -graft-points \
+ ${BOOTDIR}=${outroot}/${BOOTDIR} \
+ ${GRUBDIR}=${outroot}/${GRUBDIR} \
+ ${LIVEDIR}=${outroot}/${LIVEDIR}
+
+%for kernel in kernels:
+ treeinfo images-${kernel.arch} boot.iso images/boot.iso
+%endfor
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index e4c0336..0cc367d 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -37,7 +37,7 @@ installpkg grubby
%if basearch in ("i386", "x86_64"):
installpkg grub2 grub2-tools biosdevname memtest86+ syslinux
%endif
-%if basearch in ("ppc", "ppc64"):
+%if basearch in ("ppc", "ppc64", "ppc64le"):
installpkg grub2 grub2-tools fbset hfsutils kernel-bootwrapper ppc64-utils
%endif
%if basearch == "s390x":
diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index 380a30d..f702949 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -54,7 +54,7 @@ REMOVE_PPC64_DRIVERS = "floppy scsi_debug nouveau radeon cirrus mgag200"
REMOVE_PPC64_MODULES = "drm plymouth"
class ArchData(DataHolder):
- lib64_arches = ("x86_64", "ppc64", "s390x", "ia64", "aarch64")
+ lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64")
bcj_arch = dict(i386="x86", x86_64="x86",
ppc="powerpc", ppc64="powerpc",
arm="arm", armhfp="arm")
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index d0fac4b..dc8bb48 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -35,6 +35,7 @@ templatemap = {
'x86_64': 'x86.tmpl',
'ppc': 'ppc.tmpl',
'ppc64': 'ppc.tmpl',
+ 'ppc64le': 'ppc64le.tmpl',
's390': 's390.tmpl',
's390x': 's390.tmpl',
'aarch64': 'aarch64.tmpl',
--
1.9.0
10 years, 1 month
[PATCH] safe_dbus: Don't export DBus connection addresses as variables
by Colin Walters
Had this patch sitting around, tested briefly by making an updates.img
for the rawhide boot.iso.
This required a previous commit to do a workaround to prevent pylint
from attempting to spawn a bus while processing imports. This patch
fixes it in a cleaner way by not defining variables at all for them.
For the system bus, add a helper to get a complete connection as an
API.
For the session one, since we only use it in one place, so let's just
internalize it.
---
pyanaconda/keyboard.py | 10 +++-------
pyanaconda/safe_dbus.py | 25 ++++++++++++-------------
2 files changed, 15 insertions(+), 20 deletions(-)
10 years, 1 month
[master] Rename functions in the safe_dbus module
by Vratislav Podzimek
Altough the patch may seem a bit confusing, it just renames and moves functions
in the safe_dbus module together with importing it in a different way in other
modules. It applies to Colin Walter's patch for getting dbus connections.
Vratislav Podzimek (1):
Make safe_dbus module's functions less 'safe'
anaconda | 6 +--
pyanaconda/keyboard.py | 25 ++++++------
pyanaconda/safe_dbus.py | 98 +++++++++++++++++++++++------------------------
pyanaconda/screensaver.py | 10 ++---
4 files changed, 69 insertions(+), 70 deletions(-)
--
1.8.5.3
10 years, 1 month