nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[iso] fix persistence support for Ubuntu 23.04

Browse source 
* Closes #2231
This commit is contained in:
Pete Batard 2023-04-22 12:46:45 +01:00
parent fffd4d1160
commit 41ebb9d9ca
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/iso.c
View file

@ -322,7 +322,7 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
// Apply various workarounds to Linux config files // Apply various workarounds to Linux config files
static void fix_config(const char* psz_fullpath, const char* psz_path, const char* psz_basename, EXTRACT_PROPS* props) static void fix_config(const char* psz_fullpath, const char* psz_path, const char* psz_basename, EXTRACT_PROPS* props)
{ {
BOOL modified = FALSE; BOOL modified;
size_t nul_pos; size_t nul_pos;
char *iso_label = NULL, *usb_label = NULL, *src, *dst; char *iso_label = NULL, *usb_label = NULL, *src, *dst;
@ -338,19 +338,23 @@ static void fix_config(const char* psz_fullpath, const char* psz_path, const cha
if (replace_in_token_data(src, props->is_grub_cfg ? "linux" : "append", if (replace_in_token_data(src, props->is_grub_cfg ? "linux" : "append",
"file=/cdrom/preseed", "persistent file=/cdrom/preseed", TRUE) != NULL) { "file=/cdrom/preseed", "persistent file=/cdrom/preseed", TRUE) != NULL) {
// Ubuntu & derivatives are assumed to use 'file=/cdrom/preseed/...' // Ubuntu & derivatives are assumed to use 'file=/cdrom/preseed/...'
// or 'layerfs-path=minimal.standard.live.squashfs' (see below)
// somewhere in their kernel options and use 'persistent' as keyword. // somewhere in their kernel options and use 'persistent' as keyword.
uprintf(" Added 'persistent' kernel option"); uprintf(" Added 'persistent' kernel option");
modified = TRUE;
// Also remove Ubuntu's "maybe-ubiquity" to avoid splash screen (GRUB only) // Also remove Ubuntu's "maybe-ubiquity" to avoid splash screen (GRUB only)
if ((props->is_grub_cfg) && replace_in_token_data(src, "linux", if ((props->is_grub_cfg) && replace_in_token_data(src, "linux",
"maybe-ubiquity", "", TRUE)) "maybe-ubiquity", "", TRUE))
uprintf(" Removed 'maybe-ubiquity' kernel option"); uprintf(" Removed 'maybe-ubiquity' kernel option");
} else if (replace_in_token_data(src, "linux", "layerfs-path=minimal.standard.live.squashfs",
"persistent layerfs-path=minimal.standard.live.squashfs", TRUE) != NULL) {
uprintf(" Added 'persistent' kernel option");
if (replace_in_token_data(src, "linux", "maybe-ubiquity", "", TRUE))
uprintf(" Removed 'maybe-ubiquity' kernel option");
} else if (replace_in_token_data(src, props->is_grub_cfg ? "linux" : "append", } else if (replace_in_token_data(src, props->is_grub_cfg ? "linux" : "append",
"boot=live", "boot=live persistence", TRUE) != NULL) { "boot=live", "boot=live persistence", TRUE) != NULL) {
// Debian & derivatives are assumed to use 'boot=live' in // Debian & derivatives are assumed to use 'boot=live' in
// their kernel options and use 'persistence' as keyword. // their kernel options and use 'persistence' as keyword.
uprintf(" Added 'persistence' kernel option"); uprintf(" Added 'persistence' kernel option");
modified = TRUE;
} }
// Other distros can go to hell. Seriously, just check all partitions for // Other distros can go to hell. Seriously, just check all partitions for
// an ext volume with the right label and use persistence *THEN*. I mean, // an ext volume with the right label and use persistence *THEN*. I mean,
@ -375,6 +379,7 @@ static void fix_config(const char* psz_fullpath, const char* psz_path, const cha
iso_label = replace_char(img_report.label, ' ', "\\x20"); iso_label = replace_char(img_report.label, ' ', "\\x20");
usb_label = replace_char(img_report.usb_label, ' ', "\\x20"); usb_label = replace_char(img_report.usb_label, ' ', "\\x20");
if ((iso_label != NULL) && (usb_label != NULL)) { if ((iso_label != NULL) && (usb_label != NULL)) {
modified = FALSE;
for (int i = 0; i < ARRAYSIZE(cfg_token); i++) { for (int i = 0; i < ARRAYSIZE(cfg_token); i++) {
if (replace_in_token_data(src, cfg_token[i], iso_label, usb_label, TRUE) != NULL) if (replace_in_token_data(src, cfg_token[i], iso_label, usb_label, TRUE) != NULL)
modified = TRUE; modified = TRUE;

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.23.2026" CAPTION "Rufus 3.23.2027"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -392,8 +392,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,23,2026,0 FILEVERSION 3,23,2027,0
PRODUCTVERSION 3,23,2026,0 PRODUCTVERSION 3,23,2027,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -411,13 +411,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.23.2026" VALUE "FileVersion", "3.23.2027"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.23.exe" VALUE "OriginalFilename", "rufus-3.23.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.23.2026" VALUE "ProductVersion", "3.23.2027"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"