mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[iso] remove Ubuntu's splash screen for persistent drives
* This is accomplished by removing the 'maybe-ubiquity' option * UEFI only
This commit is contained in:
		
							parent
							
								
									e554d2b4e0
								
							
						
					
					
						commit
						68d42d4153
					
				
					 3 changed files with 10 additions and 6 deletions
				
			
		|  | @ -319,6 +319,10 @@ static void fix_config(const char* psz_fullpath, const char* psz_path, const cha | ||||||
| 				// 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; | 				modified = TRUE; | ||||||
|  | 				// Also remove Ubuntu's "maybe-ubiquity" to avoid splash screen (GRUB only)
 | ||||||
|  | 				if ((props->is_grub_cfg) && 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
 | ||||||
|  |  | ||||||
|  | @ -1100,7 +1100,7 @@ char* replace_in_token_data(const char* filename, const char* token, const char* | ||||||
| 
 | 
 | ||||||
| 	if ((filename == NULL) || (token == NULL) || (src == NULL) || (rep == NULL)) | 	if ((filename == NULL) || (token == NULL) || (src == NULL) || (rep == NULL)) | ||||||
| 		return NULL; | 		return NULL; | ||||||
| 	if ((filename[0] == 0) || (token[0] == 0) || (src[0] == 0) || (rep[0] == 0)) | 	if ((filename[0] == 0) || (token[0] == 0) || (src[0] == 0)) | ||||||
| 		return NULL; | 		return NULL; | ||||||
| 	if (strcmp(src, rep) == 0)	// No need for processing is source is same as replacement
 | 	if (strcmp(src, rep) == 0)	// No need for processing is source is same as replacement
 | ||||||
| 		return NULL; | 		return NULL; | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							|  | @ -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.11.1672" | CAPTION "Rufus 3.11.1673" | ||||||
| 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 | ||||||
|  | @ -395,8 +395,8 @@ END | ||||||
| // | // | ||||||
| 
 | 
 | ||||||
| VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||||
|  FILEVERSION 3,11,1672,0 |  FILEVERSION 3,11,1673,0 | ||||||
|  PRODUCTVERSION 3,11,1672,0 |  PRODUCTVERSION 3,11,1673,0 | ||||||
|  FILEFLAGSMASK 0x3fL |  FILEFLAGSMASK 0x3fL | ||||||
| #ifdef _DEBUG | #ifdef _DEBUG | ||||||
|  FILEFLAGS 0x1L |  FILEFLAGS 0x1L | ||||||
|  | @ -414,13 +414,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.11.1672" |             VALUE "FileVersion", "3.11.1673" | ||||||
|             VALUE "InternalName", "Rufus" |             VALUE "InternalName", "Rufus" | ||||||
|             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" |             VALUE "LegalCopyright", "© 2011-2020 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.11.exe" |             VALUE "OriginalFilename", "rufus-3.11.exe" | ||||||
|             VALUE "ProductName", "Rufus" |             VALUE "ProductName", "Rufus" | ||||||
|             VALUE "ProductVersion", "3.11.1672" |             VALUE "ProductVersion", "3.11.1673" | ||||||
|         END |         END | ||||||
|     END |     END | ||||||
|     BLOCK "VarFileInfo" |     BLOCK "VarFileInfo" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue