testing/createhdds
11
0
Fork 0
mirror of https://github.com/rocky-linux/createhdds.git synced 2024-12-22 18:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Few misc updates for old things

Browse Source 
Archive now has up to F27, we're not testing ppc64 any more, and
the old workaround is no longer needed.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-02-01 10:50:59 +00:00
parent e5bd541fe1
commit 9523510d43
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
createhdds.py
View File

@ -269,13 +269,6 @@ class VirtInstallImage(object):
# from F26 onwards, i686 is in fedora-secondary # from F26 onwards, i686 is in fedora-secondary
fedoradir = 'fedora-secondary' fedoradir = 'fedora-secondary'
variant = self.variant
# For F26, the installer images in the Workstation tree seem to be
# the OStree installer (they're much bigger than they should be),
# so use Everything instead of Workstation for F26
if int(self.release) == 26 and variant == "Workstation":
variant = "Everything"
try: try:
# this is almost complex enough to need fedfind but not # this is almost complex enough to need fedfind but not
# quite, I think. also fedfind can't find the 'transient' # quite, I think. also fedfind can't find the 'transient'
@ -287,7 +280,7 @@ class VirtInstallImage(object):
loctmp = "https://dl.fedoraproject.org/pub/{0}/development/{1}/{2}/{3}/os/" loctmp = "https://dl.fedoraproject.org/pub/{0}/development/{1}/{2}/{3}/os/"
else: else:
# sigh i hate life # sigh i hate life
if int(self.release) < 27: if int(self.release) < 28:
loctmp = "https://archives.fedoraproject.org/pub/archive/{0}/releases/{1}/{2}/{3}/os/" loctmp = "https://archives.fedoraproject.org/pub/archive/{0}/releases/{1}/{2}/{3}/os/"
else: else:
loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/" loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/"
@ -301,7 +294,7 @@ class VirtInstallImage(object):
args.extend(("--graphics", "none", "--extra-args", "console=ttyS0")) args.extend(("--graphics", "none", "--extra-args", "console=ttyS0"))
else: else:
args.extend(("--graphics", "vnc", "--noautoconsole")) args.extend(("--graphics", "vnc", "--noautoconsole"))
if arch in ['ppc64','ppc64le'] and (str(self.release).lower() == 'rawhide' or int(self.release) > 27): if arch == 'ppc64le' and (str(self.release).lower() == 'rawhide' or int(self.release) > 27):
logger.info("disable plymouth as bypass bug#1571860") logger.info("disable plymouth as bypass bug#1571860")
args.extend(("--extra-args", "plymouth.enable=0")) args.extend(("--extra-args", "plymouth.enable=0"))
# this is a hacky workaround for a weird bug on Fedora's prod # this is a hacky workaround for a weird bug on Fedora's prod