Merge remote-tracking branch 'upstream/master' into jammy

Dell/recovery_common.py

@@ -184,6 +184,8 @@ def check_recovery_dhc():
 
 def check_vendor():
     """Checks to make sure that the app is running on Dell HW"""
+    if check_vendor_bypass():
+        return True
     path = '/sys/class/dmi/id/'
     variables = ['bios_vendor', 'sys_vendor']
     valid = [b'dell', b'alienware', b'wyse', b'qemu', b'intel', b'amd']
@@ -221,6 +223,16 @@ def check_rebrand():
                     break
     return False
 
+def check_vendor_bypass():
+    """Bypass the check if bypass_vendor_check file exists in the root of the
+    installation media"""
+    for top in [ISO_MOUNT, CDROM_MOUNT]:
+        if not os.path.isdir(top):
+            continue
+        if os.path.exists(os.path.join(top, "bypass_vendor_check")):
+            return True
+    return False
+
 def check_version(package='dell-recovery'):
     """Queries the package management system for the current tool version"""
     try:

casper/seeds/ubuntu.seed

@@ -66,6 +66,9 @@
 
 ### Partitioning
 
+#Set recovery partition size
+ ubiquity dell-recovery/recovery_size string 8192
+
 # We are doing a recovery from a hard drive, don't unmount partitions
  d-i ubiquity/partman-skip-unmount boolean true
  d-i partman/filter_mounted boolean false

debian/dell-recovery.templates

@@ -140,7 +140,7 @@ _Description: Save recovery media to an external USB flash drive
 
 Template: ubiquity/text/usb_warning_label
 Type: text
-_Description: Note: This requires a USB flash drive with approximately 2GB free.
+_Description: Note: This requires a USB flash drive with approximately 8GB free.
 
 Template: ubiquity/text/save_to_dvd
 Type: text

debian/po/bg.po

@@ -168,9 +168,9 @@ msgstr "Запазване на носителя за възстановяван
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"Бележка: Това изисква USB флаш диск с приблизително 2 GB свободно "
+"Бележка: Това изисква USB флаш диск с приблизително 8 GB свободно "
 "пространство."
 
 #. Type: text

debian/po/cs.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/da.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/de.po

@@ -174,9 +174,9 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"HINWEIS: Ein USB-Flash-Laufwerk mit ungefähr 2GB freiem Speicher wird "
+"HINWEIS: Ein USB-Flash-Laufwerk mit ungefähr 8GB freiem Speicher wird "
 "benötigt."
 
 #. Type: text

debian/po/es.po

@@ -168,8 +168,8 @@ msgstr "Guardar el disco de recuperación en una memoria flash USB externa"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
-msgstr "Nota: Requiere un disco flash USB con aproximadamente 2GB libre."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
+msgstr "Nota: Requiere un disco flash USB con aproximadamente 8GB libre."
 
 #. Type: text
 #. Description

debian/po/et.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/fi.po

@@ -169,8 +169,8 @@ msgstr "Tallenna palautusmedia ulkoiselle USB-muistivälineelle"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
-msgstr "Huom: Tämä vaatii USB-muistitikun, jolla on noin 2GB vapaata tilaa."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
+msgstr "Huom: Tämä vaatii USB-muistitikun, jolla on noin 8GB vapaata tilaa."
 
 #. Type: text
 #. Description

debian/po/fr.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/ga.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/gl.po

@@ -166,9 +166,9 @@ msgstr "Gardar o soporte de recuperación nunha unidade flash USB externa"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"Nota: Isto require unha unidade flash USB con aproximadamente 2GB libres."
+"Nota: Isto require unha unidade flash USB con aproximadamente 8GB libres."
 
 #. Type: text
 #. Description

debian/po/hr.po

@@ -163,8 +163,8 @@ msgstr "Spremi medij oporavka na vanjsku USB memoriju"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
-msgstr "Napomena: ovo zahtijeva USB memoriju s oko 2 GB slobodnog prostora."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
+msgstr "Napomena: ovo zahtijeva USB memoriju s oko 8 GB slobodnog prostora."
 
 #. Type: text
 #. Description

debian/po/hu.po

@@ -165,9 +165,9 @@ msgstr "A helyreállító adathordozó mentése külső USB flash kulcsra."
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"Megjegyzés: Ehhez egy USB-kulcsra lesz szükség, körülbelül 2 GB szabad "
+"Megjegyzés: Ehhez egy USB-kulcsra lesz szükség, körülbelül 8 GB szabad "
 "hellyel."
 
 #. Type: text

debian/po/is.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/it.po

@@ -170,8 +170,8 @@ msgstr "Salvare il supporto di ripristino in una unità flash USB esterna"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
-msgstr "Nota: richiede un'unità flash USB con almeno 2GB di spazio libero."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
+msgstr "Nota: richiede un'unità flash USB con almeno 8GB di spazio libero."
 
 #. Type: text
 #. Description

debian/po/lt.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/lv.po

@@ -165,9 +165,9 @@ msgstr "Saglabāt atkopšanas mēdiju ārējā USB zibatmiņas diskā"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"Piezīme: nepieciešams USB zibatmiņas dzinis ar apmēram 2GB brīvas vietas."
+"Piezīme: nepieciešams USB zibatmiņas dzinis ar apmēram 8GB brīvas vietas."
 
 #. Type: text
 #. Description

debian/po/ms.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/nb.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/nl.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/pl.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/pt.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/pt_BR.po

@@ -172,9 +172,9 @@ msgstr "Salvar mídia de recuperação na unidade flash USB"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"Nota: Isto requer uma unidade flash USB com aproximadamente 2 GB de espaço "
+"Nota: Isto requer uma unidade flash USB com aproximadamente 8 GB de espaço "
 "livre."
 
 #. Type: text

debian/po/ru.po

@@ -169,7 +169,7 @@ msgstr "Сохранить диск восстановления на USB-нак
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 "Примечание: Необходимо использовать USB-флеш с доступным объёмом не менее 2 "
 "ГБ."

debian/po/sk.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/sq.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/sv.po

@@ -169,9 +169,9 @@ msgstr "Spara återställningsmedia till en extern USB-lagringsenhet"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"Observera: Detta kräver en USB-lagringsenhet med ungefär 2 GB ledigt utrymme."
+"Observera: Detta kräver en USB-lagringsenhet med ungefär 8 GB ledigt utrymme."
 
 #. Type: text
 #. Description

debian/po/templates.pot

@@ -156,7 +156,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

debian/po/tr.po

@@ -167,9 +167,9 @@ msgstr "Yedekleme ortamını harici USB flash belleğe kaydet"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"Not: Bu işlem tahmini olarak 2 GB boş alanı bulunan USB flash bellek "
+"Not: Bu işlem tahmini olarak 8 GB boş alanı bulunan USB flash bellek "
 "gerektirir."
 
 #. Type: text

debian/po/uk.po

@@ -171,7 +171,7 @@ msgstr "Зберегти носій для відновлення на зовн
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 "Зауваження: на флеш-диску USB має бути приблизно 2 ГБ вільного простору."
 

debian/po/zh_CN.po

@@ -157,7 +157,7 @@ msgstr "保存恢复盘到外接的 USB 闪存盘"
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr "注意： 需要大约 2G 空间的 USB 驱动盘。"
 
 #. Type: text

debian/po/zh_TW.po

@@ -157,7 +157,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../dell-recovery.templates:40001
-msgid "Note: This requires a USB flash drive with approximately 2GB free."
+msgid "Note: This requires a USB flash drive with approximately 8GB free."
 msgstr ""
 
 #. Type: text

gtk/recovery_media_creator.ui

@@ -310,7 +310,7 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="xpad">25</property>
-                <property name="label" translatable="yes">This requires a USB flash drive with approximately 2GB free.</property>
+                <property name="label" translatable="yes">This requires a USB flash drive with approximately 8GB free.</property>
                 <property name="wrap">True</property>
                 <property name="width_chars">45</property>
               </object>

po/bg.po

@@ -299,8 +299,8 @@ msgid "USB Flash Drive"
 msgstr "USB флаш памет"
 
 #: ../gtk/recovery_media_creator.ui.h:8
-msgid "This requires a USB flash drive with approximately 2GB free."
-msgstr "Това изисква USB флаш диск с приблизително 2GB свободно пространство."
+msgid "This requires a USB flash drive with approximately 8GB free."
+msgstr "Това изисква USB флаш диск с приблизително 8GB свободно пространство."
 
 #: ../gtk/recovery_media_creator.ui.h:9
 msgid "No media, create image"
@@ -522,9 +522,9 @@ msgstr "Запазване на носителя за възстановяван
 
 #: ../ubiquity/stepRecoveryMedia.ui.h:6
 msgid ""
-"<b>Note:</b> This requires a USB flash drive with approximately 2GB free."
+"<b>Note:</b> This requires a USB flash drive with approximately 8GB free."
 msgstr ""
-"<b>Бележка:</b> Това изисква USB флаш с приблизително 2GB свободно "
+"<b>Бележка:</b> Това изисква USB флаш с приблизително 8GB свободно "
 "пространство."
 
 #: ../ubiquity/stepRecoveryMedia.ui.h:7