Keep user multipath configuration upon upgrade

LICENSE

@@ -284,28 +284,3 @@ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
-
-========================================================================
-
-cpiofile.py is licensed under the terms of the MIT license:
-
-Permission  is  hereby granted,  free  of charge,  to  any person
-obtaining a  copy of  this software  and associated documentation
-files  (the  "Software"),  to   deal  in  the  Software   without
-restriction,  including  without limitation  the  rights to  use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies  of  the  Software,  and to  permit  persons  to  whom the
-Software  is  furnished  to  do  so,  subject  to  the  following
-conditions:
-
-The above copyright  notice and this  permission notice shall  be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS  IS", WITHOUT WARRANTY OF ANY  KIND,
-EXPRESS OR IMPLIED, INCLUDING  BUT NOT LIMITED TO  THE WARRANTIES
-OF  MERCHANTABILITY,  FITNESS   FOR  A  PARTICULAR   PURPOSE  AND
-NONINFRINGEMENT.  IN  NO  EVENT SHALL  THE  AUTHORS  OR COPYRIGHT
-HOLDERS  BE LIABLE  FOR ANY  CLAIM, DAMAGES  OR OTHER  LIABILITY,
-WHETHER  IN AN  ACTION OF  CONTRACT, TORT  OR OTHERWISE,  ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -0,0 +1,97 @@
+# destinations
+DESTDIR =
+INSTALLER_DIR = /opt/xensource/installer
+EFI_DIR = /EFI/xenserver
+
+# root of a tree with sm.rpm unpacked
+SM_ROOTDIR =
+# multipath.conf to be taken as a base
+XS_MPATH_CONF = $(SM_ROOTDIR)/etc/multipath.xenserver/multipath.conf
+
+INSTALL = install
+
+install:
+	$(INSTALL) -d $(DESTDIR)/usr/bin
+	$(INSTALL) -m755 support.sh $(DESTDIR)/usr/bin
+	$(INSTALL) -d $(DESTDIR)$(INSTALLER_DIR)/tui/installer/
+	$(INSTALL) -m755 \
+	        init \
+	    $(DESTDIR)$(INSTALLER_DIR)/
+	$(INSTALL) -m644 \
+	        keymaps \
+	        timezones \
+	        answerfile.py \
+	        backend.py \
+	        common_criteria_firewall_rules \
+	        constants.py \
+	        disktools.py \
+	        diskutil.py \
+	        driver.py \
+	        fcoeutil.py \
+	        generalui.py \
+	        hardware.py \
+	        init_constants.py \
+	        install.py \
+	        netinterface.py \
+	        netutil.py \
+	        ppexpect.py \
+	        product.py \
+	        report.py \
+	        repository.py \
+	        restore.py \
+	        scripts.py \
+	        shrinklvm.py \
+	        snackutil.py \
+	        uicontroller.py \
+	        upgrade.py \
+	        util.py \
+	        xelogging.py \
+	    $(DESTDIR)$(INSTALLER_DIR)/
+	$(INSTALL) -m644 \
+	        tui/__init__.py \
+	        tui/init.py \
+	        tui/fcoe.py \
+	        tui/network.py \
+	        tui/progress.py \
+	        tui/repo.py \
+	    $(DESTDIR)$(INSTALLER_DIR)/tui/
+	$(INSTALL) -m644 \
+	        tui/installer/__init__.py \
+	        tui/installer/screens.py \
+	    $(DESTDIR)$(INSTALLER_DIR)/tui/installer/
+
+ # Startup files
+	$(INSTALL) -d \
+	    $(DESTDIR)/etc/init.d \
+	    $(DESTDIR)/etc/modprobe.d \
+	    $(DESTDIR)/etc/modules-load.d \
+	    $(DESTDIR)/etc/depmod.d \
+	    $(DESTDIR)/etc/dracut.conf.d \
+	    $(DESTDIR)/etc/systemd/system/systemd-udevd.d
+
+	$(INSTALL) -m755 startup/interface-rename-sideway startup/early-blacklist $(DESTDIR)/etc/init.d/
+	$(INSTALL) -m644 startup/functions $(DESTDIR)/etc/init.d/installer-functions
+	$(INSTALL) -m644 startup/early-blacklist.conf startup/bnx2x.conf $(DESTDIR)/etc/modprobe.d/
+	$(INSTALL) -m644 startup/blacklist $(DESTDIR)/etc/modprobe.d/installer-blacklist.conf
+	$(INSTALL) -m644 startup/modprobe.mlx4 $(DESTDIR)/etc/modprobe.d/mlx4.conf
+	$(INSTALL) -m644 startup/iscsi-modules $(DESTDIR)/etc/modules-load.d/iscsi.conf
+	$(INSTALL) -m644 startup/depmod.conf $(DESTDIR)/etc/depmod.d/
+	$(INSTALL) -m755 startup/preinit startup/S05ramdisk $(DESTDIR)/$(INSTALLER_DIR)/
+	$(INSTALL) -m644 startup/systemd-udevd_depmod.conf $(DESTDIR)/etc/systemd/system/systemd-udevd.d/installer.conf
+
+ # Generate a multipath configuration from sm's copy, removing
+ # the blacklist and blacklist_exception sections.
+	sed 's/\(^[[:space:]]*find_multipaths[[:space:]]*\)yes/\1no/' \
+	    < $(XS_MPATH_CONF) \
+	    > $(DESTDIR)/etc/multipath.conf.disabled
+
+ # bootloader files
+	$(INSTALL) -D -m644 bootloader/grub.cfg $(DESTDIR)$(EFI_DIR)/grub.cfg
+	$(INSTALL) -D -m644 bootloader/grub.cfg $(DESTDIR)$(EFI_DIR)/grub-usb.cfg
+
+	patch < bootloader/grub-usb.patch $(DESTDIR)$(EFI_DIR)/grub-usb.cfg
+
+	$(INSTALL) -D -m644 bootloader/isolinux.cfg $(DESTDIR)/boot/isolinux/isolinux.cfg
+
+	printf "echo Skipping initrd creation in the installer\nexit 0\n" \
+	    > $(DESTDIR)/etc/dracut.conf.d/installer.conf

answerfile.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # SPDX-License-Identifier: GPL-2.0-only
 
 """answerfile - parse installation answerfiles"""
@@ -113,7 +111,7 @@ def buildURL(stype, path):
             script = buildURL(stype, getText(node))
             scripts.add_script(stage, script)
 
-        # depreciated formats
+        # deprecated formats
         nodes = getElementsByTagName(self.top_node, ['post-install-script'])
         if len(nodes) == 1:
             stype = getStrAttribute(nodes[0], ['type'], mandatory=False).lower()
@@ -181,7 +179,7 @@ def parseRestore(self):
             disk = normalize_disk(getText(nodes[0]))
             disk = disktools.getMpathMasterOrDisk(disk)
             logger.log("Filtering backup list for disk %s" % disk)
-            backups = filter(lambda x: x.root_disk == disk, backups)
+            backups = [x for x in backups if x.root_disk == disk]
             logger.log("Backup list filtered: %s" % ", ".join(str(b) for b in backups))
 
         if len(backups) > 1:
@@ -222,6 +220,11 @@ def parseCommon(self):
             if bl not in ['' , 'grub2']:
                 raise AnswerfileException("Unsupported bootloader '%s'" % bl)
 
+        results['target-platform'] = ''
+        nodes = getElementsByTagName(self.top_node, ['target-platform'])
+        if len(nodes) > 0:
+            results['target-platform'] = getText(nodes[0])
+
         return results
 
     def parseExistingInstallation(self):
@@ -236,13 +239,13 @@ def parseExistingInstallation(self):
         results['primary-disk'] = disk
 
         installations = product.findXenSourceProducts()
-        installations = filter(lambda x: x.primary_disk == disk or diskutil.idFromPartition(x.primary_disk) == disk, installations)
+        installations = [x for x in installations if x.primary_disk == disk or diskutil.idFromPartition(x.primary_disk) == disk]
         if len(installations) == 0:
             raise AnswerfileException("Could not locate the installation specified to be reinstalled.")
         elif len(installations) > 1:
             # FIXME non-multipath case?
             logger.log("Warning: multiple paths detected - recommend use of --device_mapper_multipath=yes")
-            logger.log("Warning: selecting 1st path from %s" % str(map(lambda x: x.primary_disk, installations)))
+            logger.log("Warning: selecting 1st path from %s" % str([x.primary_disk for x in installations]))
         results['installation-to-overwrite'] = installations[0]
         return results
 
@@ -322,9 +325,33 @@ def parseDisks(self):
         results['sr-on-primary'] = results['primary-disk'] in guest_disks
         results['guest-disks'] = list(guest_disks)
 
-        results['sr-type'] = getMapAttribute(self.top_node, ['sr-type', 'srtype'],
-                                             [('lvm', SR_TYPE_LVM),
-                                              ('ext', SR_TYPE_EXT)], default='lvm')
+        sr_type_mapping = []
+        for sr_type in SR_TYPE_LVM, SR_TYPE_EXT, SR_TYPE_LARGE_BLOCK:
+            if sr_type:
+                sr_type_mapping.append((sr_type, sr_type))
+
+        large_block_disks = [
+            disk
+            for disk in guest_disks
+            if diskutil.isLargeBlockDisk(disk)
+        ]
+
+        if SR_TYPE_LARGE_BLOCK and len(large_block_disks) > 0:
+            default_sr_type = SR_TYPE_LARGE_BLOCK
+        else:
+            default_sr_type = SR_TYPE_LVM
+
+        sr_type = getMapAttribute(self.top_node,
+                                  ['sr-type', 'srtype'],
+                                  sr_type_mapping,
+                                  default=default_sr_type)
+
+        if SR_TYPE_LARGE_BLOCK and sr_type != SR_TYPE_LARGE_BLOCK and len(large_block_disks) > 0:
+            raise AnswerfileException("%s not compatible with SR type %s"
+                                      % (", ".join(large_block_disks), sr_type))
+
+        results['sr-type'] = sr_type
+
         return results
 
     def parseFCoEInterface(self):
@@ -342,7 +369,7 @@ def parseFCoEInterface(self):
             else:
                 if_hwaddr = getStrAttribute(interface, ['hwaddr'])
                 if if_hwaddr:
-                    matching_list = filter(lambda x: x.hwaddr == if_hwaddr.lower(), nethw.values())
+                    matching_list = [x for x in list(nethw.values()) if x.hwaddr == if_hwaddr.lower()]
                     if len(matching_list) == 1:
                         if_name = matching_list[0].name
             if not if_name and not if_hwaddr:
@@ -364,7 +391,7 @@ def parseInterface(self):
         else:
             if_hwaddr = getStrAttribute(node, ['hwaddr'])
             if if_hwaddr:
-                matching_list = filter(lambda x: x.hwaddr == if_hwaddr.lower(), nethw.values())
+                matching_list = [x for x in list(nethw.values()) if x.hwaddr == if_hwaddr.lower()]
                 if len(matching_list) == 1:
                     if_name = matching_list[0].name
         if not if_name and not if_hwaddr:
@@ -416,7 +443,7 @@ def parseRootPassword(self):
     def parseNSConfig(self):
         results = {}
         nodes = getElementsByTagName(self.top_node, ['name-server', 'nameserver'])
-        results['manual-nameservers'] = (len(nodes) > 0, map(lambda x: getText(x), nodes))
+        results['manual-nameservers'] = (len(nodes) > 0, [getText(x) for x in nodes])
         nodes = getElementsByTagName(self.top_node, ['hostname'])
         if len(nodes) > 0:
             results['manual-hostname'] = (True, getText(nodes[0]))