---
pyanaconda/ui/gui/spokes/source.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 6fa7e8e..65d6b28 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -490,9 +490,10 @@ class SourceSpoke(NormalSpoke):
elif self._nfs_active():
url = self._urlEntry.get_text().strip()
- # If the user didn't fill in the URL entry, just return as if
- # they selected nothing.
- if url == "":
+ # If the user didn't fill in the URL entry, or it does not contain
+ # a ':' (so, no host/directory split), just return as if they
+ # selected nothing.
+ if url == "" or not ':' in url:
return
self.data.method.method = "nfs"
@@ -641,7 +642,7 @@ class SourceSpoke(NormalSpoke):
selector.path = cdrom.path
selector.set_chosen(chosen)
self._autodetectMediaBox.pack_start(selector, False, False, 0)
-
+
gtk_action_1()
added = True
--
1.7.11.2
Show replies by date
---
dracut/anaconda-lib.sh | 4 ++--
pyanaconda/packaging/yumpayload.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh
index af6690d..b09a7cc 100755
--- a/dracut/anaconda-lib.sh
+++ b/dracut/anaconda-lib.sh
@@ -54,7 +54,7 @@ anaconda_live_root_dir() {
img=$(find_runtime $mnt/$path)
if [ -n "$img" ]; then
info "anaconda: found $img"
- [ "$mnt" = "$repodir" ] || { mount --rprivate /; mount --move
$mnt $isodir; }
+ [ "$mnt" = "$repodir" ] || { mount --make-rprivate /; mount
--move $mnt $isodir; }
anaconda_auto_updates $repodir/$path/images
else
if [ "${path%.iso}" != "$path" ]; then
@@ -65,7 +65,7 @@ anaconda_live_root_dir() {
fi
[ -n "$iso" ] || { warn "no suitable images"; return 1; }
info "anaconda: found $iso"
- mount --rprivate /
+ mount --make-rprivate /
mount --move $mnt $isodir
iso=${isodir}/${iso#$mnt}
mount -o loop,ro $iso $repodir
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 73455d4..6a22bb6 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -571,7 +571,7 @@ reposdir=%s
# move the mount to ISO_DIR
# work around inability to move shared filesystems
iutil.execWithRedirect("mount",
- ["--rprivate", "/"],
+ ["--make-rprivate", "/"],
stderr="/dev/tty5",
stdout="/dev/tty5")
iutil.execWithRedirect("mount",
["--move", INSTALL_TREE, ISO_DIR],
--
1.7.11.2
---
pyanaconda/bootloader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index c0c12df..e29d134 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1666,7 +1666,7 @@ class YabootSILOBase(BootLoader):
continue
args = Arguments()
- if self.password or self.encrypted_password:
+ if self.password:
args.add("rd.shell=0")
if image.initrd:
initrd_line = "\tinitrd=%s/%s\n" % (self.boot_prefix,
--
1.7.11.2
---
pyanaconda/ui/gui/spokes/source.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 65d6b28..3685fcd 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -481,7 +481,7 @@ class SourceSpoke(NormalSpoke):
self.data.method.url = "ftp://" + self.data.method.url
elif self._protocolComboBox.get_active() == 1 and not
self.data.method.url.startswith("http://"):
self.data.method.url = "http://" + self.data.method.url
- elif self._protocolComboBox.get_active() == 1 and not
self.data.method.url.startswith("https://"):
+ elif self._protocolComboBox.get_active() == 2 and not
self.data.method.url.startswith("https://"):
self.data.method.url = "https://" + self.data.method.url
if (old_source.method == "url" and
--
1.7.11.2
Otherwise, we end up obliterating the leading protocol, and this spoke expects
a protocol on a URL.
---
pyanaconda/ui/gui/spokes/source.py | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 3685fcd..ff5e863 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -470,23 +470,22 @@ class SourceSpoke(NormalSpoke):
if url == "":
return
- self.data.method.method = "url"
- self.data.method.url = url
-
# Make sure the URL starts with the protocol. yum will want that
# to know how to fetch, and the refresh method needs that to know
# which element of the combo to default to should this spoke be
# revisited.
- if self._ftp_active() and not
self.data.method.url.startswith("ftp://"):
- self.data.method.url = "ftp://" + self.data.method.url
- elif self._protocolComboBox.get_active() == 1 and not
self.data.method.url.startswith("http://"):
- self.data.method.url = "http://" + self.data.method.url
- elif self._protocolComboBox.get_active() == 2 and not
self.data.method.url.startswith("https://"):
- self.data.method.url = "https://" + self.data.method.url
-
- if (old_source.method == "url" and
- old_source.url == self.data.method.url):
+ if self._ftp_active() and not url.startswith("ftp://"):
+ url = "ftp://" + url
+ elif self._protocolComboBox.get_active() == 1 and not
url.startswith("http://"):
+ url = "http://" + url
+ elif self._protocolComboBox.get_active() == 2 and not
url.startswith("https://"):
+ url = "https://" + url
+
+ if old_source.method == "url" and old_source.url == url:
return
+
+ self.data.method.method = "url"
+ self.data.method.url = url
elif self._nfs_active():
url = self._urlEntry.get_text().strip()
--
1.7.11.2
These all look good
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)