[PATCH] add code so that initramfs created for rescue kernel
by Gene Czarcinski
This update addresses the problem described in rhbz#1170589.
While a initramfs file is created for the rescue kernel when a
kickstart liveimg for a squashfs.img install, it is not created if
the install uses a tarball of the system instead of the squashfs.img.
The added code creates the initramfs f le for the rescue kernel.
---
pyanaconda/packaging/livepayload.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
index f8051ff..b35521e 100644
--- a/pyanaconda/packaging/livepayload.py
+++ b/pyanaconda/packaging/livepayload.py
@@ -442,6 +442,12 @@ class LiveImageKSPayload(LiveImagePayload):
self.pct = 100
threadMgr.wait(THREAD_LIVE_PROGRESS)
+ # Live needs to create the rescue image before bootloader is written
+ for kernel in self.kernelVersionList:
+ log.info("Generating rescue image for %s", kernel)
+ iutil.execInSysroot("new-kernel-pkg",
+ ["--rpmposttrans", kernel])
+
def postInstall(self):
""" Unmount and remove image
--
1.9.3
9 years, 5 months
[rhel7/master] Make sure post script directory exists (#1080396)
by Brian C. Lane
In some cases the full path for the post script may not exist (eg.
liveimg without a /tmp) so make sure it is there before writing the
script to it.
Related: rhbz#1080396
---
pyanaconda/kickstart.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 4122c02..ec21881 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -95,6 +95,9 @@ class AnacondaKSScript(KSScript):
else:
scriptRoot = "/"
+ if not os.path.exists(scriptRoot + "/tmp"):
+ os.makedirs(scriptRoot + "/tmp")
+
(fd, path) = tempfile.mkstemp("", "ks-script-", scriptRoot + "/tmp")
os.write(fd, self.script)
--
1.9.3
9 years, 5 months
[initial-setup 0/4] pylinting initial-setup patches (v2)
by Anne Mulhern
With two additional patches initial-setup is now pylint clean.
mulhern (4):
Add pylint testing infrastructure.
Fix easy pylint errors.
Marks string for translation when module is loaded.
Add AnacondaKSHandler no-member error to pylint-false-positives.
.gitignore | 1 +
initial_setup/__main__.py | 12 +-
initial_setup/gui/gui.py | 6 +-
initial_setup/tui/hubs/initial_setup_hub.py | 4 +-
initial_setup/tui/tui.py | 4 -
tests/lib/testlib.sh | 37 ++++
tests/pylint/intl.py | 63 +++++++
tests/pylint/pointless-override.py | 252 ++++++++++++++++++++++++++++
tests/pylint/pylint-false-positives | 1 +
tests/pylint/pylint-one.sh | 33 ++++
tests/pylint/runpylint.sh | 125 ++++++++++++++
tests/testenv.sh | 13 ++
12 files changed, 534 insertions(+), 17 deletions(-)
create mode 100644 tests/lib/testlib.sh
create mode 100644 tests/pylint/intl.py
create mode 100644 tests/pylint/pointless-override.py
create mode 100644 tests/pylint/pylint-false-positives
create mode 100755 tests/pylint/pylint-one.sh
create mode 100755 tests/pylint/runpylint.sh
create mode 100644 tests/testenv.sh
--
1.9.3
9 years, 5 months
[initial-setup 0/2] pylinting initial-setup patches
by Anne Mulhern
Leaving the harder pylint errors for somebody who's more familiar w/
initial-setup (and pylint behaviors wrt. pykickstart).
************* Module initial_setup/tui/hubs/initial_setup_hub.py
initial_setup/tui/hubs/initial_setup_hub.py:19: [W9902(found-_-in-module-class), InitialSetupMainHub] Found _ call at module/class level
initial_setup/tui/hubs/initial_setup_hub.py:21: [W9902(found-_-in-module-class), InitialSetupMainHub] Found _ call at module/class level
************* Module initial_setup/__main__.py
initial_setup/__main__.py:142: [E1101(no-member), ] Instance of 'AnacondaKSHandler' has no 'keyboard' member
initial_setup/__main__.py:142: [E1101(no-member), ] Instance of 'AnacondaKSHandler' has no 'lang' member
initial_setup/__main__.py:142: [E1101(no-member), ] Instance of 'AnacondaKSHandler' has no 'timezone' member
initial_setup/__main__.py:159: [E1101(no-member), ] Instance of 'AnacondaKSHandler' has no 'group' member
initial_setup/__main__.py:159: [E1101(no-member), ] Instance of 'AnacondaKSHandler' has no 'user' member
initial_setup/__main__.py:159: [E1101(no-member), ] Instance of 'AnacondaKSHandler' has no 'rootpw' member
mulhern (2):
Add pylint testing infrastructure.
Fix easy pylint errors.
.gitignore | 1 +
initial_setup/__main__.py | 12 +-
initial_setup/gui/gui.py | 6 +-
initial_setup/tui/tui.py | 4 -
tests/lib/testlib.sh | 37 ++++++
tests/pylint/intl.py | 63 +++++++++
tests/pylint/pointless-override.py | 252 ++++++++++++++++++++++++++++++++++++
tests/pylint/pylint-false-positives | 0
tests/pylint/pylint-one.sh | 33 +++++
tests/pylint/runpylint.sh | 125 ++++++++++++++++++
tests/testenv.sh | 13 ++
11 files changed, 531 insertions(+), 15 deletions(-)
create mode 100644 tests/lib/testlib.sh
create mode 100644 tests/pylint/intl.py
create mode 100644 tests/pylint/pointless-override.py
create mode 100644 tests/pylint/pylint-false-positives
create mode 100755 tests/pylint/pylint-one.sh
create mode 100755 tests/pylint/runpylint.sh
create mode 100644 tests/testenv.sh
--
1.9.3
9 years, 5 months
[rhel7-branch] Beware of inherited file descriptors in child processes
by Vratislav Podzimek
PATCH 2/2 may be useful for master as well.
Vratislav Podzimek (2):
Close file descriptors when running ntpdate (#1083978)
Close file descriptors when forking child processes
pyanaconda/iutil.py | 3 ++-
pyanaconda/ntp.py | 13 ++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
--
1.9.3
9 years, 5 months
RFC: [PATCH] Add --includepkg argument
by Colin Walters
Sending this patch for discussion.
Recently, Fedora has been trying to do a 3 product split. As part of
that, lorax was changed to do "installpkg lorax-product-*" via
provides.
I think that approach is awkward; a much simpler approach is to simply
specify the product package as input to lorax on the command line, via
external rel-eng scripts.
This patch therefore adds --includepkg (and we should probably add an
option to remove the implicit lorax-product-* glob).
---
src/pylorax/__init__.py | 2 ++
src/pylorax/treebuilder.py | 5 +++++
src/sbin/lorax | 4 ++++
3 files changed, 11 insertions(+)
9 years, 5 months
[f21-branch][master][PATCH 1/2] Revert "Make Python's default encoding detection work on Live installations (#1169019)"
by Adam Williamson
This reverts commit 9a63391c08cdcb5efdc3f9c9b56138fe85e06589.
It was a bad way to try and fix the crashes. It stopped
translations from being correctly displayed. A better fix is
coming.
---
data/liveinst/liveinst | 6 ------
1 file changed, 6 deletions(-)
diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst
index 0a68596..9d47a19 100755
--- a/data/liveinst/liveinst
+++ b/data/liveinst/liveinst
@@ -173,12 +173,6 @@ if [ ! -z "$UPDATES" ]; then
export PATH=/tmp/updates:$PATH
fi
-if [ -z $LC_ALL ]; then
- # LC_ALL not set, set it to $LANG to make Python's default encoding
- # detection work
- export LC_ALL=$LANG
-fi
-
if [ -x /usr/bin/udisks ]; then
/usr/bin/udisks --inhibit -- $ANACONDA $*
else
--
2.1.0
9 years, 5 months
[master/rhel7/f21] Start vncconfig for cutNpaste
by Mark Hamzy
Another reason to start vncconfig in a vnc session is to support cut & paste.
---
pyanaconda/vnc.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
index a7e2072..a9ba148 100644
--- a/pyanaconda/vnc.py
+++ b/pyanaconda/vnc.py
@@ -177,6 +177,21 @@ class VncServer:
maxTries), maxTries)
return False
+ def startVncConfig(self):
+ """Attempt to start vncconfig"""
+
+ self.log.info(_("Attempting to start vncconfig"))
+
+ vncconfigcommand = [self.root+"/usr/bin/vncconfig", "-display", ":%s"%self.display]
+
+ try:
+ vncconfigp = subprocess.Popen(vncconfigcommand, stdout=self.openlogfile(), stderr=subprocess.STDOUT)
+
+ return True
+ except OSError:
+ self.log.info(_("Could not start vncconfig: %s", e))
+ return False
+
def VNCListen(self):
"""Put the server in listening mode.
@@ -247,6 +262,7 @@ class VncServer:
sys.exit(1)
# Lets try to configure the vnc server to whatever the user specified
+ connected = False
if self.vncconnecthost != "":
connected = self.connectToView()
if not connected:
@@ -256,6 +272,9 @@ class VncServer:
os.environ["DISPLAY"]=":%s" % self.display
+ if not connected:
+ self.startVncConfig()
+
def changeVNCPasswdWindow(self):
""" Change the password to a sane parameter.
--
2.1.0
9 years, 5 months
[f21-branch][blivet] Beware of partitions' order when adding partitions
by Vratislav Podzimek
The two blivet patches fix bug when cancelling actions in reversed order causes
partitions getting wrong numbers resulting in various issues. The pyparted patch
is required to make this all work.
Vratislav Podzimek (2):
Return device's children sorted by name
Update partitions' numbers and names when adding new partition
blivet/devicetree.py | 11 ++++++++++-
blivet/formats/disklabel.py | 26 ++++++++++++++++++++++++--
python-blivet.spec | 2 +-
3 files changed, 35 insertions(+), 4 deletions(-)
--
1.9.3
9 years, 5 months
[anaconda][rhel7-branch][PATCH] Make sure help content files are not part of the core sub-package (#1072033)
by Martin Kolman
And we no longer need the placeholders in the Anaconda repo when
the help content sub-package is now always available.
Related: rhbz#1072033
Signed-off-by: Martin Kolman <mkolman(a)redhat.com>
---
anaconda.spec.in | 2 +-
data/help/en-US/FedoraPlaceholder.html | 5 -----
data/help/en-US/FedoraPlaceholderWithLinks.html | 13 -------------
data/help/en-US/Makefile.am | 3 ---
data/help/en-US/RHEL7Placeholder.html | 5 -----
data/help/en-US/RHEL7PlaceholderWithLinks.html | 11 -----------
6 files changed, 1 insertion(+), 38 deletions(-)
delete mode 100644 data/help/en-US/FedoraPlaceholder.html
delete mode 100644 data/help/en-US/FedoraPlaceholderWithLinks.html
delete mode 100644 data/help/en-US/RHEL7Placeholder.html
delete mode 100644 data/help/en-US/RHEL7PlaceholderWithLinks.html
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 2f5dff0..2293662 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -275,7 +275,7 @@ update-desktop-database &> /dev/null || :
%{_sbindir}/anaconda
%{_sbindir}/handle-sshpw
%{_datadir}/anaconda
-%{_datadir}/anaconda/help/*
+%exclude %{_datadir}/anaconda/help/*
%exclude %{_datadir}/anaconda/tzmapdata
%{_prefix}/libexec/anaconda
%{_libdir}/python*/site-packages/pyanaconda/*
diff --git a/data/help/en-US/FedoraPlaceholder.html b/data/help/en-US/FedoraPlaceholder.html
deleted file mode 100644
index 4d1781a..0000000
--- a/data/help/en-US/FedoraPlaceholder.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead.</p>
-</body>
diff --git a/data/help/en-US/FedoraPlaceholderWithLinks.html b/data/help/en-US/FedoraPlaceholderWithLinks.html
deleted file mode 100644
index 5fe0485..0000000
--- a/data/help/en-US/FedoraPlaceholderWithLinks.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead:</p>
-<p>
-<ul>
- <li><a href="http://docs.fedoraproject.org/en-US/Fedora/20/html/Installation_Guide/">Fedora Installation Guide</a></li>
- <li><a href="https://fedoraproject.org/wiki/Anaconda">Anaconda Wiki</a></li>
- <li><a href="http://fedoraproject.org/wiki/Anaconda_Boot_Options">Anaconda Boot Options</a></li>
- <li><a href="http://fedoraproject.org/wiki/Anaconda/Kickstart">Anaconda Kickstart</a></li>
-</ul>
-</p>
-</body>
diff --git a/data/help/en-US/Makefile.am b/data/help/en-US/Makefile.am
index b7aa1bc..3d869fb 100644
--- a/data/help/en-US/Makefile.am
+++ b/data/help/en-US/Makefile.am
@@ -17,7 +17,4 @@
#
# Author: Martin Kolman <mkolman(a)redhat.com>
-enplaceholderdir = $(datadir)/anaconda/help/en-US
-dist_enplaceholder_DATA = FedoraPlaceholder.html FedoraPlaceholderWithLinks.html RHEL7Placeholder.html RHEL7PlaceholderWithLinks.html
-
MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/help/en-US/RHEL7Placeholder.html b/data/help/en-US/RHEL7Placeholder.html
deleted file mode 100644
index 9f3c446..0000000
--- a/data/help/en-US/RHEL7Placeholder.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check out the Red Hat Enterprise Linux 7 Installation Guide or other online help resources instead.</p>
-</body>
diff --git a/data/help/en-US/RHEL7PlaceholderWithLinks.html b/data/help/en-US/RHEL7PlaceholderWithLinks.html
deleted file mode 100644
index c2da61b..0000000
--- a/data/help/en-US/RHEL7PlaceholderWithLinks.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check the Red Hat Enterprise Linux 7 Installation Guide or Red Hat Customer Portal resources instead:</p>
-<p>
-<ul>
- <li><a href="https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/...">Red Hat Enterprise Linux 7 Installation Guide</a></li>
- <li><a href="https://access.redhat.com">Red Hat Customer Portal</a></li>
-</ul>
-</p>
-</body>
--
1.9.3
9 years, 5 months