[master/f21] livemedia-creator: Add nfs support for no-virt mode (#1121255)
by Brian C. Lane
---
src/sbin/livemedia-creator | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
index 7134992..1472f21 100755
--- a/src/sbin/livemedia-creator
+++ b/src/sbin/livemedia-creator
@@ -836,7 +836,18 @@ def make_image(opts, ks):
try:
if opts.no_virt:
- novirt_install(opts, disk_img, disk_size, ks.handler.method.url)
+ method = ks.handler.method
+ if method.method == "url":
+ repo_url = method.url
+ elif method.method == "nfs":
+ if method.opts:
+ repo_url = "nfs:%s:%s:%s" % (method.opts, method.server, method.dir)
+ else:
+ repo_url = "nfs:%s:%s" % (method.server, method.dir)
+ else:
+ raise InstallError("Unsupported installation method: %s" % method.method)
+
+ novirt_install(opts, disk_img, disk_size, repo_url)
else:
install_log = os.path.abspath(os.path.dirname(opts.logfile))+"/virt-install.log"
log.info("install_log = %s", install_log)
@@ -1115,8 +1126,8 @@ def main():
# Make the disk or filesystem image
if not opts.disk_image and not opts.fs_image:
errors = []
- if ks.handler.method.method != "url" and opts.no_virt:
- errors.append("Only url install method is currently supported. Please "
+ if opts.no_virt and ks.handler.method.method not in ("url", "nfs"):
+ errors.append("Only url and nfs install methods are currently supported. Please "
"fix your kickstart file." )
if ks.handler.displaymode.displayMode is not None:
--
1.9.3
9 years, 8 months
[blivet][rhel7/f21/master] bugs 1109244 and 1120964
by David Lehman
Patch 1 should go on all three branches. When we commit the flag changes
parted removes the partition device nodes and then recreates them. This
is sometimes problematic if we don't wait for that and try to proceed with
creating the filesystem.
Patches 3, 4 and 5 should go on master and f21, if not all three branches.
It is still waiting on test feedback, but I figured I'd get it out in the
open sooner rather than later. It was reported with an NTFS filesystem,
but it seems like it would be possible to hit on other types as well.
Patch 4 is just a clean-up for master.
David Lehman (5):
Let udev settle between writing partition flags and formatting.
(#1109244)
Remove unused fallback code from DiskLabel.
Change signature of DiskLabel.addPartition to be more useful.
Account for partition alignment in PartitionDevice min/max size.
(#1120964)
Align end sector in the appropriate direction for resize. (#1120964)
blivet/deviceaction.py | 1 +
blivet/devices/partition.py | 55 +++++++++++++++++++++++++----
blivet/formats/disklabel.py | 85 ++++++++++++---------------------------------
tests/devices_test.py | 75 +++++++++++++++++++++++++++++++++++++++
tests/storagetestcase.py | 1 +
5 files changed, 148 insertions(+), 69 deletions(-)
--
1.9.3
9 years, 8 months
[blivet: f21/master] Don't append btrfs mount options to None (#1150872)
by David Shea
---
blivet/devices/btrfs.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
index f3e5970..e2931e3 100644
--- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py
@@ -473,7 +473,10 @@ class BTRFSSubVolumeDevice(BTRFSDevice, RaidDevice):
return
# propagate mount options specified for members via kickstart
- opts = "%s,subvol=%s" % (self.volume.format.mountopts, self.name)
+ opts = "subvol=%s" % self.name
+ if self.volume.format.mountopts:
+ opts = "%s,%s" % (self.volume.format.mountopts, opts)
+
self.format.mountopts = opts
@property
--
2.1.0
9 years, 8 months
[initial-setup][master/f21-branch][PATCH] Make help work in Initial Setup
by Martin Kolman
A master/F21 version of the rhel7-branch make-help-work patch. The only significant
difference is in the name of the placeholders and in renaming the post-install class
to be more in line with the new install class names in master/f21-branch Anaconda.
Martin Kolman (1):
Fix Initial Setup to correctly support the Anaconda built-in Help
(#1072033)
initial_setup/__main__.py | 3 ++-
initial_setup/gui/hubs/initial_setup_hub.py | 1 +
initial_setup/post_installclass.py | 27 +++++++++++++++++++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 initial_setup/post_installclass.py
--
1.9.3
9 years, 8 months
[blivet:master/f21-branch 0/2] #1150147 patches
by Anne Mulhern
mulhern (2):
Abstract ContainerDevice member format check into a method (#1150147)
Update tests to bring into line w/ previous commit (#1150147)
blivet/devices.py | 24 ++++++++++++++++++++++--
tests/devices_test.py | 10 ++++------
2 files changed, 26 insertions(+), 8 deletions(-)
--
1.9.3
9 years, 8 months
[f21/master 0/2] keyboard layout search fixes.
by David Shea
The first fixes a crash if you type, say, "č" in the keyboard layout search box
in a live environment. The second is because I thought it was kinda weird that
typing "č" matched "Arabic" and everything else that contained an unadorned c.
David Shea (2):
Convert strings to unicode in have_word_match (#1146581)
Don't strip accents from the user-inputted keyboard string
pyanaconda/iutil.py | 6 ++++++
pyanaconda/ui/gui/spokes/keyboard.py | 4 ++--
tests/pyanaconda_tests/iutil_test.py | 4 ++++
3 files changed, 12 insertions(+), 2 deletions(-)
--
2.1.0
9 years, 8 months
[PATCH] Include /usr/bin/bugzilla in the installation environment.
by Chris Lumens
Seems like this would be pretty handy for uploading attachments to bugs.
---
share/runtime-cleanup.tmpl | 1 -
1 file changed, 1 deletion(-)
diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index b2b05ac..9f1e08a 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -293,7 +293,6 @@ removefrom procps /usr/bin/vmstat /usr/bin/w /usr/bin/watch
removefrom psmisc /usr/share/locale/*
removefrom pygtk2 /usr/bin/* /usr/${libdir}/pygtk/*
removefrom pykickstart /usr/bin/* /usr/share/locale/*
-removefrom python-bugzilla /usr/bin/*
removefrom python-ethtool /usr/sbin/*
removefrom python-meh /usr/share/locale/*
removefrom readline /usr/${libdir}/*
--
1.9.3
9 years, 8 months
[PATCH] Include the new blivet.devices submodule in the built package.
by Chris Lumens
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index e40c867..f8810f2 100644
--- a/setup.py
+++ b/setup.py
@@ -36,4 +36,4 @@ setup(name='blivet', version='0.66',
author='David Lehman', author_email='dlehman(a)redhat.com',
url='http://fedoraproject.org/wiki/blivet',
data_files=data_files,
- packages=['blivet', 'blivet.devicelibs', 'blivet.formats'])
+ packages=['blivet', 'blivet.devices', 'blivet.devicelibs', 'blivet.formats'])
--
1.9.3
9 years, 8 months
[PATCH] Add a test case for if all anaconda's Requires exist.
by Chris Lumens
BuildRequires should be taken care of by the other test cases. This one
handles all the other stuff we need at runtime.
---
tests/Makefile.am | 4 ++-
tests/install/run_install_test.sh | 74 +++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+), 1 deletion(-)
create mode 100755 tests/install/run_install_test.sh
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 086a263..47fb05d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -51,6 +51,7 @@ dist_check_SCRIPTS = $(srcdir)/glade/*/*.py \
gettext/style_guide.py \
storage/run_storage_tests.py \
ostree/run_ostree_tests.sh \
+ install/run_install_test.sh \
$(srcdir)/gui/*.ks \
$(srcdir)/gui/*.sh \
$(srcdir)/gui/inside/*.py \
@@ -67,7 +68,8 @@ TESTS = nosetests.sh \
storage/run_storage_tests.py \
gui/run_gui_tests.sh \
glade/run_glade_tests.sh \
- ostree/run_ostree_tests.sh
+ ostree/run_ostree_tests.sh \
+ install/run_install_test.sh
clean-local:
-rm -rf pylint/.pylint.d
diff --git a/tests/install/run_install_test.sh b/tests/install/run_install_test.sh
new file mode 100755
index 0000000..a79ad92
--- /dev/null
+++ b/tests/install/run_install_test.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+#
+# Copyright (C) 2014 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details. You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens(a)redhat.com>
+
+# Have to be root to run this test, as yum is stupid.
+if [ ${EUID} != 0 ]; then
+ exit 77
+fi
+
+tmpdir=$(mktemp -d)
+
+# The anaconda repo can come from one of two different places:
+# (1) $TEST_ANACONDA_REPO, if this script is being called from "make check"
+# (2) The command line, if this script is being called directly.
+if [[ "${TEST_ANACONDA_REPO}" != "" ]]; then
+ REPO=${TEST_ANACONDA_REPO}
+elif [[ $# != 0 ]]; then
+ REPO=$1
+ shift
+else
+ echo "usage: $0 <anaconda repo>"
+ exit 1
+fi
+
+status=0
+
+cat <<EOF > ${tmpdir}/yum.conf
+[anaconda]
+name=anaconda \$releasever - \$basearch
+baseurl=${REPO}
+enabled=1
+
+[anaconda-rawhide]
+name=Fedora - Rawhide - Developmental packages for the next Fedora release
+failovermethod=priority
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=\$basearch
+enabled=1
+gpgcheck=0
+EOF
+
+yum install -y -c ${tmpdir}/yum.conf --installroot=${tmpdir} --releasever=rawhide \
+ --disablerepo=\* --enablerepo=anaconda --enablerepo=anaconda-rawhide \
+ anaconda
+status=$?
+
+# yum's return value is not especially helpful (it can return 0 even on error)
+# but just in case it told us it failed, exit out here.
+if [ $? != 0 ]; then
+ rm -r ${tmpdir}
+ exit $status
+fi
+
+# Did anaconda actually get installed? At least rpm will set $?=1 if not.
+rpm --root=${tmpdir} -q anaconda
+status=$?
+
+rm -r ${tmpdir}
+exit $status
--
1.9.3
9 years, 8 months