diff --git a/.bin/Scripts/functions/data.py b/.bin/Scripts/functions/data.py index 26f61645..9557ebdb 100644 --- a/.bin/Scripts/functions/data.py +++ b/.bin/Scripts/functions/data.py @@ -250,7 +250,9 @@ def get_mounted_volumes(): mounted_volumes.extend(item.get('children', [])) return {item['source']: item for item in mounted_volumes} -def mount_volumes(all_devices=True, device_path=None, read_write=False): +def mount_volumes( + all_devices=True, device_path=None, + read_write=False, core_storage=True): """Mount all detected filesystems.""" report = {} cmd = [ @@ -261,7 +263,8 @@ def mount_volumes(all_devices=True, device_path=None, read_write=False): cmd.append(device_path) # Check for Apple CoreStorage volumes first - find_core_storage_volumes(device_path) + if core_storage: + find_core_storage_volumes(device_path) # Get list of block devices result = run_program(cmd) @@ -369,12 +372,9 @@ def mount_network_share(server, read_write=False): username = server['User'] password = server['Pass'] if psutil.WINDOWS: - cmd = r'net use \\{ip}\{share} /user:{username} {password}'.format( - ip = server['IP'], - share = server['Share'], - username = username, - password = password) - cmd = cmd.split(' ') + cmd = [ + 'net', 'use', r'\\{IP}\{Share}'.format(**server), + '/user:{}'.format(username), password] warning = r'Failed to mount \\{Name}\{Share}, {IP} unreachable.'.format( **server) error = r'Failed to mount \\{Name}\{Share} ({IP})'.format(**server) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index 93b73bdb..39789149 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -22,23 +22,23 @@ ost_db = { # STATIC VARIABLES ATTRIBUTES = { 'NVMe': { - 'critical_warning': {'Error': 1}, - 'media_errors': {'Error': 1}, - 'power_on_hours': {'Warning': 12000, 'Error': 18000, 'Ignore': True}, + 'critical_warning': {'Error': 1}, + 'media_errors': {'Error': 1}, + 'power_on_hours': {'Warning': 12000, 'Error': 18000, 'Ignore': True}, 'unsafe_shutdowns': {'Warning': 1}, }, 'SMART': { - 5: {'Error': 1}, - 9: {'Warning': 12000, 'Error': 18000, 'Ignore': True}, - 10: {'Warning': 1}, - 184: {'Error': 1}, - 187: {'Warning': 1}, - 188: {'Warning': 1}, - 196: {'Warning': 1, 'Error': 10, 'Ignore': True}, - 197: {'Error': 1}, - 198: {'Error': 1}, - 199: {'Error': 1, 'Ignore': True}, - 201: {'Warning': 1}, + 5: {'Hex': '05', 'Error': 1}, + 9: {'Hex': '09', 'Warning': 12000, 'Error': 18000, 'Ignore': True}, + 10: {'Hex': '0A', 'Error': 1}, + 184: {'Hex': 'B8', 'Error': 1}, + 187: {'Hex': 'BB', 'Error': 1}, + 188: {'Hex': 'BC', 'Error': 1}, + 196: {'Hex': 'C4', 'Error': 1}, + 197: {'Hex': 'C5', 'Error': 1}, + 198: {'Hex': 'C6', 'Error': 1}, + 199: {'Hex': 'C7', 'Error': 1, 'Ignore': True}, + 201: {'Hex': 'C9', 'Error': 1}, }, } IO_VARS = { @@ -603,7 +603,7 @@ def post_drive_results(ticket_number): report.append('') # SMART Short test result - if TESTS['NVMe/SMART']['Short Test'][name]: + if TESTS['NVMe/SMART']['Short Test'].get(name, False): report.append('SMART short test result: {}'.format( TESTS['NVMe/SMART']['Short Test'][name])) report.append('') @@ -668,44 +668,43 @@ def post_drive_results(ticket_number): # Used space report.append('') report.append('Volumes:') - if dev_failed or dev_unknown: - report.append('Skipped due to error(s) above.') - else: - volume_report = mount_volumes( - all_devices=False, - device_path='/dev/{}'.format(name)) - for vol_path, vol_data in sorted(volume_report.items()): - vol_report = [ - vol_path, - '{q}{label}{q}'.format( - label=vol_data.get('label', ''), - q='"' if vol_data.get('label', '') else ''), - '{}'.format( - vol_data.get('size', 'UNKNOWN').upper()), - '{}'.format( - vol_data.get('size_used', 'UNKNOWN').upper()), - '{}'.format( - vol_data.get('size_avail', 'UNKNOWN').upper()), - ] - if vol_report[2][-1:] != 'N': - vol_report[2] = '{} {}B'.format( - vol_report[2][:-1], - vol_report[2][-1:]) - vol_report = [v.strip().replace(' ', '_') for v in vol_report] - for i in range(5): - pad = 8 - if i < 2: - pad += 4 * (2 - i) - vol_report[i] = pad_with_dots( - left_pad=False, - s='{s:<{p}}'.format( - s=vol_report[i], - p=pad)) - vol_report[-1] = re.sub(r'\.*$', '', vol_report[-1]) - vol_report = [v.replace('_', ' ') for v in vol_report] - line = '{}..{}..Total..{}..(Used..{}..Free..{})'.format( - *vol_report) - report.append(line) + core_storage = dev_passed and not dev_failed and not dev_unknown + volume_report = mount_volumes( + all_devices=False, + device_path='/dev/{}'.format(name), + core_storage=core_storage) + for vol_path, vol_data in sorted(volume_report.items()): + vol_report = [ + vol_path, + '{q}{label}{q}'.format( + label=vol_data.get('label', ''), + q='"' if vol_data.get('label', '') else ''), + '{}'.format( + vol_data.get('size', 'UNKNOWN').upper()), + '{}'.format( + vol_data.get('size_used', 'UNKNOWN').upper()), + '{}'.format( + vol_data.get('size_avail', 'UNKNOWN').upper()), + ] + if vol_report[2][-1:] != 'N': + vol_report[2] = '{} {}B'.format( + vol_report[2][:-1], + vol_report[2][-1:]) + vol_report = [v.strip().replace(' ', '_') for v in vol_report] + for i in range(5): + pad = 8 + if i < 2: + pad += 4 * (2 - i) + vol_report[i] = pad_with_dots( + left_pad=False, + s='{s:<{p}}'.format( + s=vol_report[i], + p=pad)) + vol_report[-1] = re.sub(r'\.*$', '', vol_report[-1]) + vol_report = [v.replace('_', ' ') for v in vol_report] + line = '{}..{}..Total..{}..(Used..{}..Free..{})'.format( + *vol_report) + report.append(line) # Post reply for drive osticket_post_reply( diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py index 0c592623..8a53aac6 100644 --- a/.bin/Scripts/functions/setup.py +++ b/.bin/Scripts/functions/setup.py @@ -41,12 +41,6 @@ SETTINGS_ESET = { }, }, } -SETTINGS_EXPLORER_SYSTEM_HW = { - # Enable RegBack - r'System\CurrentControlSet\Control\Session Manager\Configuration Manager': { - 'DWORD Items': {'EnablePeriodicBackup': 1}, - }, - } SETTINGS_EXPLORER_SYSTEM = { # Disable Location Tracking r'Software\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': { @@ -73,10 +67,6 @@ SETTINGS_EXPLORER_SYSTEM = { r'Software\Microsoft\PolicyManager\default\WiFi\AllowAutoConnectToWiFiSenseHotspots': { 'DWORD Items': {'Value': 0}, }, - # Enable RegBack - r'System\CurrentControlSet\Control\Session Manager\Configuration Manager': { - 'DWORD Items': {'EnablePeriodicBackup': 1}, - }, } SETTINGS_EXPLORER_USER = { # Disable silently installed apps @@ -125,6 +115,12 @@ SETTINGS_MOZILLA_FIREFOX_64 = { 'uBlock0@raymondhill.net': MOZILLA_FIREFOX_UBO_PATH}, }, } +SETTINGS_REGBACK = { + # Enable RegBack + r'System\CurrentControlSet\Control\Session Manager\Configuration Manager': { + 'DWORD Items': {'EnablePeriodicBackup': 1}, + }, + } VCR_REDISTS = [ {'Name': 'Visual C++ 2010 x32...', 'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']}, @@ -200,10 +196,6 @@ def config_classicstart(): sleep(1) popen_program(cs_exe) -def config_explorer_system_hw(): - """Configure Windows Explorer for all users via Registry settings (HW).""" - write_registry_settings(SETTINGS_EXPLORER_SYSTEM_HW, all_users=True) - def config_explorer_system(): """Configure Windows Explorer for all users via Registry settings.""" write_registry_settings(SETTINGS_EXPLORER_SYSTEM, all_users=True) @@ -212,8 +204,8 @@ def config_explorer_user(): """Configure Windows Explorer for current user via Registry settings.""" write_registry_settings(SETTINGS_EXPLORER_USER, all_users=False) -def config_privacy_settings(): - """Configure Windows 10 privacy settings with O&O ShutUp10.""" +def disable_windows_telemetry(): + """Disable Windows 10 telemetry settings with O&O ShutUp10.""" extract_item('ShutUp10', silent=True) cmd = [ r'{BinDir}\ShutUp10\OOSU10.exe'.format(**global_vars), @@ -221,6 +213,10 @@ def config_privacy_settings(): '/quiet'] run_program(cmd) +def enable_regback(): + """Enable RegBack.""" + write_registry_settings(SETTINGS_REGBACK, all_users=True) + def enable_system_restore(): """Enable System Restore and set disk usage to 5%""" cmd = [ diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index ff151bc1..fcd997d8 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -994,6 +994,19 @@ def update_adwcleaner(): 'AdwCleaner.exe', SOURCE_URLS['AdwCleaner']) +def update_eset_online_scanner(): + # Stop running processes + kill_process('ESET.exe') + + # Remove existing folders + remove_from_kit('ESET') + + # Download + download_generic( + r'{}\ESET'.format(global_vars['CBinDir']), + 'ESET.exe', + SOURCE_URLS['ESET Online Scanner']) + def update_kvrt(): # Stop running processes kill_process('KVRT.exe') diff --git a/.bin/Scripts/mount-backup-shares b/.bin/Scripts/mount-backup-shares index 9706a0a5..9f3612b6 100755 --- a/.bin/Scripts/mount-backup-shares +++ b/.bin/Scripts/mount-backup-shares @@ -22,7 +22,7 @@ if __name__ == '__main__': # Mount if is_connected(): - mount_backup_shares() + mount_backup_shares(read_write=True) else: # Couldn't connect print_error('ERROR: No network connectivity.') diff --git a/.bin/Scripts/network_stability_test.py b/.bin/Scripts/network_stability_test.py index 6a7f4f56..a1ca63b3 100644 --- a/.bin/Scripts/network_stability_test.py +++ b/.bin/Scripts/network_stability_test.py @@ -24,6 +24,7 @@ if __name__ == '__main__': # Open programs print_success('Starting browser tests') popen_program(['start', '', NETWORK_TEST_URL.replace('&', '^&')], shell=True) + sleep(1) popen_program(['start', '', YOUTUBE_VID_URL], shell=True) # Start pinging diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py index fb194764..ef0f6c16 100644 --- a/.bin/Scripts/settings/launchers.py +++ b/.bin/Scripts/settings/launchers.py @@ -544,11 +544,6 @@ LAUNCHERS = { 'L_ITEM': 'OOSU10.exe', 'L_ARGS': '1201.cfg', }, - 'Update Kit': { - 'L_TYPE': 'PyScript', - 'L_PATH': 'Scripts', - 'L_ITEM': 'update_kit.py', - }, 'WizTree': { 'L_TYPE': 'Executable', 'L_PATH': 'WizTree', @@ -656,7 +651,7 @@ LAUNCHERS = { }, 'WinAIO Repair': { 'L_TYPE': 'Executable', - 'L_PATH': 'WinAIO Repair', + 'L_PATH': 'WinAIORepair', 'L_ITEM': 'Repair_Windows.exe', 'L_ELEV': 'True', 'Extra Code': [ @@ -665,7 +660,7 @@ LAUNCHERS = { }, 'WinAIO Repair (Fix Associations)': { 'L_TYPE': 'Executable', - 'L_PATH': 'WinAIO Repair', + 'L_PATH': 'WinAIORepair', 'L_ITEM': 'Repair_Windows.exe', 'L_ELEV': 'True', 'Extra Code': [ @@ -674,7 +669,7 @@ LAUNCHERS = { }, 'WinAIO Repair (Fix Permissions)': { 'L_TYPE': 'Executable', - 'L_PATH': 'WinAIO Repair', + 'L_PATH': 'WinAIORepair', 'L_ITEM': 'Repair_Windows.exe', 'L_ELEV': 'True', 'Extra Code': [ diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py index c65735f2..1dc650f2 100644 --- a/.bin/Scripts/settings/sources.py +++ b/.bin/Scripts/settings/sources.py @@ -13,6 +13,7 @@ SOURCE_URLS = { 'ClassicStartSkin': 'http://www.classicshell.net/forum/download/file.php?id=3001&sid=9a195960d98fd754867dcb63d9315335', 'Du': 'https://download.sysinternals.com/files/DU.zip', 'ERUNT': 'http://www.aumha.org/downloads/erunt.zip', + 'ESET Online Scanner': 'https://download.eset.com/com/eset/tools/online_scanner/latest/esetonlinescanner_enu.exe', 'ESET NOD32 AV': 'https://download.eset.com/com/eset/apps/home/eav/windows/latest/eav_nt64.exe', 'Everything32': 'https://www.voidtools.com/Everything-1.4.1.895.x86.zip', 'Everything64': 'https://www.voidtools.com/Everything-1.4.1.895.x64.zip', diff --git a/.bin/Scripts/settings/windows_builds.py b/.bin/Scripts/settings/windows_builds.py index 6c642928..2db18b6f 100644 --- a/.bin/Scripts/settings/windows_builds.py +++ b/.bin/Scripts/settings/windows_builds.py @@ -149,6 +149,36 @@ WINDOWS_BUILDS = { '17655': ( '10', None, 'Redstone 5', None, 'preview build'), '17661': ( '10', None, 'Redstone 5', None, 'preview build'), '17666': ( '10', None, 'Redstone 5', None, 'preview build'), + '17677': ( '10', None, 'Redstone 5', None, 'preview build'), + '17682': ( '10', None, 'Redstone 5', None, 'preview build'), + '17686': ( '10', None, 'Redstone 5', None, 'preview build'), + '17692': ( '10', None, 'Redstone 5', None, 'preview build'), + '17704': ( '10', None, 'Redstone 5', None, 'preview build'), + '17711': ( '10', None, 'Redstone 5', None, 'preview build'), + '17713': ( '10', None, 'Redstone 5', None, 'preview build'), + '17723': ( '10', None, 'Redstone 5', None, 'preview build'), + '17728': ( '10', None, 'Redstone 5', None, 'preview build'), + '17730': ( '10', None, 'Redstone 5', None, 'preview build'), + '17733': ( '10', None, 'Redstone 5', None, 'preview build'), + '17735': ( '10', None, 'Redstone 5', None, 'preview build'), + '17738': ( '10', None, 'Redstone 5', None, 'preview build'), + '17741': ( '10', None, 'Redstone 5', None, 'preview build'), + '17744': ( '10', None, 'Redstone 5', None, 'preview build'), + '17746': ( '10', None, 'Redstone 5', None, 'preview build'), + '17751': ( '10', None, 'Redstone 5', None, 'preview build'), + '17754': ( '10', None, 'Redstone 5', None, 'preview build'), + '17755': ( '10', None, 'Redstone 5', None, 'preview build'), + '17758': ( '10', None, 'Redstone 5', None, 'preview build'), + '17760': ( '10', None, 'Redstone 5', None, 'preview build'), + '17763': ( '10', 'v1809', 'Redstone 5', 'October 2018 Update', 'preview build'), + '18204': ( '10', None, '19H1', None, 'preview build'), + '18214': ( '10', None, '19H1', None, 'preview build'), + '18219': ( '10', None, '19H1', None, 'preview build'), + '18234': ( '10', None, '19H1', None, 'preview build'), + '18237': ( '10', None, '19H1', None, 'preview build'), + '18242': ( '10', None, '19H1', None, 'preview build'), + '18247': ( '10', None, '19H1', None, 'preview build'), + '18252': ( '10', None, '19H1', None, 'preview build'), } if __name__ == '__main__': diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py index 9803d90c..aa4e68b7 100644 --- a/.bin/Scripts/system_checklist.py +++ b/.bin/Scripts/system_checklist.py @@ -45,12 +45,14 @@ if __name__ == '__main__': if global_vars['OS']['Version'] == '10': try_and_print(message='Explorer...', function=config_explorer_system, cs='Done') - try_and_print(message='Privacy...', - function=config_privacy_settings, cs='Done') - try_and_print(message='Updating Clock...', - function=update_clock, cs='Done') + try_and_print(message='Disabling telemetry...', + function=disable_windows_telemetry, cs='Done') + try_and_print(message='Enabling RegBack...', + function=enable_regback, cs='Done') try_and_print(message='Enabling System Restore...', function=enable_system_restore, cs='Done') + try_and_print(message='Updating Clock...', + function=update_clock, cs='Done') # Cleanup print_info('Cleanup') diff --git a/.bin/Scripts/system_checklist_hw.py b/.bin/Scripts/system_checklist_hw.py index ba696934..01d6d551 100644 --- a/.bin/Scripts/system_checklist_hw.py +++ b/.bin/Scripts/system_checklist_hw.py @@ -42,8 +42,8 @@ if __name__ == '__main__': # Configure print_info('Configure') if global_vars['OS']['Version'] == '10': - try_and_print(message='Explorer...', - function=config_explorer_system_hw, cs='Done') + try_and_print(message='Enabling RegBack...', + function=enable_regback, cs='Done') try_and_print(message='Enabling System Restore...', function=enable_system_restore, cs='Done') diff --git a/.bin/Scripts/system_diagnostics.py b/.bin/Scripts/system_diagnostics.py index affc4b4b..442dbc5e 100644 --- a/.bin/Scripts/system_diagnostics.py +++ b/.bin/Scripts/system_diagnostics.py @@ -128,7 +128,8 @@ if __name__ == '__main__': if D7_MODE: result = try_and_print(message='DISM RestoreHealth...', function=run_dism, other_results=other_results, repair=True) - system_ok &= check_result(result, other_results) + if global_vars['OS']['Version'] in ('8', '8.1', '10'): + system_ok &= check_result(result, other_results) else: try_and_print(message='DISM CheckHealth...', function=run_dism, other_results=other_results, repair=False) diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index aec91c6b..63ed62c3 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -82,6 +82,7 @@ if __name__ == '__main__': # Repairs print_info(' Repairs') try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results, width=40) + try_and_print(message='ESET Online Scanner...', function=update_eset_online_scanner, other_results=other_results, width=40) try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results, width=40) try_and_print(message='RKill...', function=update_rkill, other_results=other_results, width=40) try_and_print(message='TDSS Killer...', function=update_tdsskiller, other_results=other_results, width=40) diff --git a/.bin/WinAIO Repair/__associations.ini b/.bin/WinAIORepair/__associations.ini similarity index 100% rename from .bin/WinAIO Repair/__associations.ini rename to .bin/WinAIORepair/__associations.ini diff --git a/.bin/WinAIO Repair/__empty.ini b/.bin/WinAIORepair/__empty.ini similarity index 100% rename from .bin/WinAIO Repair/__empty.ini rename to .bin/WinAIORepair/__empty.ini diff --git a/.bin/WinAIO Repair/__permissions.ini b/.bin/WinAIORepair/__permissions.ini similarity index 100% rename from .bin/WinAIO Repair/__permissions.ini rename to .bin/WinAIORepair/__permissions.ini diff --git a/.bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg b/.bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg index 3ad516fc..17e363c9 100644 --- a/.bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg +++ b/.bin/d7ii/Config/CustomApps/IObit Uninstaller.cfg @@ -31,4 +31,4 @@ LogVerbiage=Uninstalled unnecessary / junk programs. AppDesc=Application uninstaller and cleanup utility AppParms=Uninstallers\IObit Uninstaller.cmd WaitOnProcesses=IObitUninstallerPortable.exe -AppWaitTime=60 +AppWaitTime=30 diff --git a/.bin/d7ii/Config/CustomApps/Install SW Bundle.cfg b/.bin/d7ii/Config/CustomApps/Install SW Bundle.cfg index 33d1196d..70adf438 100644 --- a/.bin/d7ii/Config/CustomApps/Install SW Bundle.cfg +++ b/.bin/d7ii/Config/CustomApps/Install SW Bundle.cfg @@ -31,4 +31,4 @@ AutoFlag=0 WaitOnProcesses=ConEmu.exe;ConEmuC.exe;ConEmu64.exe;ConEmuC64.exe;python.exe;Ninite.exe AppDesc=Install software bundle LogVerbiage=Installed or updated commonly used applications (Adobe Reader, Google Chrome, etc) -AppWaitTime=60 +AppWaitTime=30 diff --git a/.bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg b/.bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg index 1014745e..867e8314 100644 --- a/.bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg +++ b/.bin/d7ii/Config/CustomApps/WizardKit Browser Reset.cfg @@ -32,4 +32,4 @@ Vista=1 Servers=1 NonDirectURLs=0 AutoFlag=0 -AppWaitTime=30 +AppWaitTime=10 diff --git a/.bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg b/.bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg index 03628cc8..8071c345 100644 --- a/.bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg +++ b/.bin/d7ii/Config/CustomApps/WizardKit System Checklist.cfg @@ -32,4 +32,4 @@ Servers=1 NonDirectURLs=0 AutoFlag=0 LogVerbiage=Examined and verified system-wide settings (available updates, drivers, activation, etc) -AppWaitTime=60 +AppWaitTime=30 diff --git a/.bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg b/.bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg index f7f239f3..a484f115 100644 --- a/.bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg +++ b/.bin/d7ii/Config/CustomApps/WizardKit System Diagnostics.cfg @@ -32,4 +32,4 @@ Servers=1 NonDirectURLs=0 AutoFlag=0 LogVerbiage=Ran OS built-in repairs and backed up system information -AppWaitTime=60 +AppWaitTime=30 diff --git a/.bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg b/.bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg index bf53c889..7fc15c29 100644 --- a/.bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg +++ b/.bin/d7ii/Config/CustomApps/WizardKit User Checklist.cfg @@ -32,4 +32,4 @@ Vista=1 Servers=1 NonDirectURLs=0 AutoFlag=0 -AppWaitTime=60 +AppWaitTime=30 diff --git a/.linux_items/authorized_keys b/.linux_items/authorized_keys index be79388e..e8b34ed3 100644 --- a/.linux_items/authorized_keys +++ b/.linux_items/authorized_keys @@ -1 +1,9 @@ -#Put SSH keys here +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC593iDKb9EPKHs98Zr+w0+JJZUgQ6fk4EFLQ2dB6Tro26a3tGeNQhgFuic1M04J/W/dHb+tHONHil8abmIfUEw34if/iQdhZDAkSTda6j+8oVrKXKGYRqtt15kAXZ7JxuLmvcrHwyzVfo/YHEpliYVaSU4dp8LJxJPjwiZ3/9SLcphmHqzkiDsGk1J8D2z0rFyPXv0w1sXWSX2JJ/p+viwy0lX9Yj+e1e2ulay0nICbVCoqLDDmzOZBY3SPNAq8pflz9QkXE1jhN3DCjzTox/6O0w1OSHehaRGfU4ob0Uz1kS+TMFB2/xvsvvDl9BLi8UVRZej1anJLb9KhTf3x0VtdavN1T086xCNndQ204HW785upjF9LHSqdFQF7i+tN/Ui56aBJ3v+ONYvfKSylMYaRGIvhyhFGTpMRpwfWJh2LCUGnpEHRbO9Z2f2QpPB7ko2tm0wnjK/9xat1JKM2Q/NeAGfDDTbPm7OGnG1NKBxbNXQpdqTh95d8aRbcXi1jFKlJki1bqKE6UlfiXBvhu+ORtXB3oVPBCQxLPdUvnB44Lfr5j8J+0y/PNTOhz+RlXmLeDHbXtNXhBmm6Jq9x7JwaVC6GFqbfhElerhrCMxK4DZiS0xxPZtnOez4MIPkUfKo7K1gYeFUpV/sn2q1P3jLAEeVKsOGc/aME6xIE11FHw== twoshirt@paya +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDaJkYcxi7eSpRE7i0n2N2q4CHebPqxYc5eLQ2mDbrLpAIRUSdVjqe8RiVLJ5LKejkGMnWbaiDZ59cLWJhDTfqZFCRexVQkA9v8MVHUWINzxqfJFOnz7dKXP0PmggDbuKMIUkY65KtOLC2Cnqs3epmysQxrSf33W3IqPwL2XjJQXRbFLd4UG1bSZtBAAF3C/i7hBzb2iQPIpr1v1rCrW6gVhrgyoN7ZTfMqcKHnTPsUn95Qtyp6NUYKh4ctrPmTcTHFfwmgQiAYQ6jMcH8bNBf1XDmJuEIwaILYVzzrWOXlx84rqaEUdeRbvd4S/G9FcRt9eO3o+jD4hupdyvIDCttP3ct6yeWQVotreZE/5OVwfxr0BNXPBmTiyF2c6cRrMlXpQMoRQyjnD5Eua0VEUJzj2ows5APGmciJudDw4rXoRLOZRX/nDuXqgNJJ6q+MgRx3hor/etbV2mXcmSMdoI8DuybFzHuEb9GRwYhLxzDdDe+zmevx0rl01W8EJImqgrTwMblADbM4VHpC974d5w2s9uoXJg1NY4UVkSjJdK0De0kyGh8hK2pqTqCBh1OznB43Yla5PwM+05JIMySVRuivvZ1+tBh8ZURzIbFFIrdgNiZIooI4hA/m8qz4CTWIxKWstXR08eOufIbjV+R6VJjEssvLmgYw93rUJ4WbQNbaiw== twoshirt@anaconda.1201.com +ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAlnTlZGWMLjyJ2iBwc62m3+ZgfsXMCaCiQox+lbbKDzYwTdr2a0UU4293z4DHEbG/wgBXl1FB17ac/XGfLeJIBjLhQy7FRgbQ/z8PNttyNDvrb48ld2zq5C0ZhTxEn2v63mPzxsyEKVKd+YgaUrSvJHtw+3HgJpXruc5zcKCZf9BNjPW1Bq4lCt5gDc95DTWFsuLIfc0Kk1KntqMNgyuprp7zPIrolTR4FvPCoZyvcp5mXhM+Q1SNVs+XgvGKVW1fZrwvUoRrriqctnfFKPXIo9ChgRfvhbmsOx1MirShNHP7/5qbG1C3Ju0eEEiV8YLndvkLgprkyG8RYJG6CnXBjI3no7bxhHPfRnAcflPEaGpuvGnDzE5V8K8mhVk+kFI13nPQcuuvJajX2hAiz4xaJD5JUsAv64Gpj6J6cc1/8rOT1wlWzA0r3QYjD6A5dheMwAzdIO1p4TGO2XlUkvM/Hs4LOHG1BodsCpDr5GIEnKawms+9CLV4VeBhnik6W45ZkY1dqp/Qhfjju2pWXYyisrsinUHB2TPuTTQHxjEjqlJQJ8i6wjiB4p0ruyIups24kXXENiwCRjCqhm5WRXdr5h79uzYZMUJCejY9Dn9o953410XjzwFLY4Q6w5FjQb+MjoKACUnYaHPCpK2qxzQN9CR2GUPqDi3dRKMw8TgblV0= Ryokou\2Shirt +ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAhF5u/wn04dSDI1mg6HlbDhmM3orJtu2kZdOTBd+/kvCxdC4h+AuwRSWjbIhGi9s8R3iq64gC6TJ2dX4skJ5fMeYqHMZieGgfXderRiPgMURCDWONLZCWyowBun5qGaXkYQo5VbLUNGXua9+RMXaxoJSCOhxq/6CzdleD6pkNNgL5a1ZarD3wLCNRsS50OmyGytXsYTClAY+F9lTd4VXjKuZpjqGfhA5Xz09Rad3Me2Tsd07cdO3LxDNlr969Q/hEwfZ/g+ePaIO0Z/zFHIO4J6Mnt8POTU1fM99tgqUQHWZRP2A+9OYx7nApdA4IFWVUhNfsVkrgcgYdCLD8U16Cdfwm1i1RiBhlYBfzA+EDjD6cbegaaMCKhsCZMZKQB4LyJTDgjvCrk1Q7dE0Nc1Nq8qD/BMbZkIKQcQH8xrX1hONayUMdOPnpDpi6IP2NIYFTbdJD70JQ8ru+gIDRQJR6g0AwnjMoJYNRKgAtWlcbKQ8YQW/FNREtyUhh8tquCyFbofGUiJxmTbWki7u7VJxRLNSnp+NQhPNT4FUbWy1vPrJi0l3MxuXdG3nZ0Brnggn72tnGcAUOmRTPubNlkhFStqcCM+tAVTHeLwHobdMewKQMWGPt6UXLtEJINqW9nCh1SAOA3cjsZ3ugXLRQQc82rEgTfTp2RtuN+NSf/vgoDbk= 1201 PuTTY Key +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGZqPA7/T3zw8YipngM6vKpxX+IMpwqm2jad+NcJWxC0Hh09oVUalgbO/eWRloQlNgxHTosdIkSp++xnyeEHI3vL0pbko/c0OJbs6vEsHp8ljzt61HKKsscVADCI/ogGwHkPIHENgbiXkBPutEBLYFPtMcJQw6GBIkagW+dTyqEw/8c1cDmTq7AM74tHqgrpYjJy35Nne0K+zGIeqzTJdtg3fkRCN9JH24c3VbYoeIpMlgfxxgRG44DC/o0BRoMr3wWiS/sTrutlluB03vaQWe+4o8p789wq+fDqKhBTisH96RQ1Y1D5eZcf0DngBJtnCLWPG+z6YP0DFW5DYeQRoYNneRkR10RUqN0Eufok/UMNnxWcW+TztTxO5JSucXt0MYpLsWO1U7B22MR1W7oVlbznUrVENSQGRqyOS4PdqmI4faF0vEKis68S7NaXg88zwBr612HwFBianXvvxhkyEKv8ECbeXSvHcIajepdzbGLwaussDQiNv8vyX/8o3K7Si/ktdgIK4UzfaMq7G0vX1KEvuKAfMPYn4z0zuc/ahxTTfvHqfO+cnYgH8Pnzi1DGziRveeKIFT4OKOP5C3wHntsfv1CStK/LXhH3j4PNRuet0Fm5+jUJ22DQqlXtFiwFz4E+Bt+67exhm4Out4rAUqCzjDW5+mw0WU2P7u01cT+Q== admin@anaconda.1201.com +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCatoW5AZa8JlvA7WZD3GkB3IMXtCClxGEtpeEb2q/6Ltd8+/EngGgfjm2buBdHsRY4y+8Q/dZnMXbD1kfSw8pv7q4WUy2RHccM6xNpkhhioRzLebWc3m8C3ySFx0uTipZCgAG0IBGINeHHl3zeWo5M21WSPNAjZsUUX24z1TszXP/nkDMh24593OGbyqDydXIz6xWPtZOo0Ot8Y4yplXipO6yJUjGianSJ1DVQCwFj5G2XgDdqHJDTsKXcHDAVZU4WyB7br6ONZLj8How4FX15o68Zu/9m5EVuoR1vf7iBZev6sE9/1rub5IIW7f3ADXf+z4N2cuhOJSwoKxxf669U2Fm3ZegQdn3+P5yONuPzI2w3f5FZtyQE22NBLMzqRv+9WZxILPq4ocGojMck9rbvYXEaDYTOYBbjWjVZK9qhCFilUwSzv9mtBN6/3thHumCod7PVuVcldd2BJutIEwJ+lRqTKsuHkj9ybSo+kh3ycDtZhpERLNE5EAaJEnXTGraSz8MgKaI9FsCDFVwdJDKz897vgjd8WyFgGSEKI8pmqZcpGK4243yCZ5Xuqe73i18sPZrQtg6nfyYR0GksH7qBW9zbmgw4D0Zmctxvg8imsMrfHGIhipHS8OozEuabbxAqgCIWzjcVSMWAnontu7DcLOzQ3GW+mFVd/aItXsnfQw== admin@management-1 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKj1CNZo7TDBsNmkv3gz/AVMNmhFXzJZO9B5SgHOdjpfOTCNUlbSBZncDH33gXgrXo65ETKUh7jnqP60nDst8WSR/B86/hxAT1kqNZ83cS4SJcAI0OyBVlj08mehTCcRr6e5BQ5k9hjJ4vWZftwtdVq8MsZS1aJyZB9JR7gvY+mAmrkKN5hI93Ugw04mn/jT/5YiHdrxTBjvhk0A2C23SrxkyEXxWwXGx6Iyfrsbyk7q7/2S8G1KEw/h9Em+1MMJk2kg3k6oXLCGWLRkepDHMpzHbRZWO61EwDiN3XX3wA8fc0nc3Tzg7rPCBe++2att5RKV+51D9MnJ3Ak7Tyb4QMZpkKXTfdpYbnDXn5HlwTeM5tOk28Dm4exzJUknGS6rY1vWzlw/XP6wxCLS7mcsoIyH6JIiQM64SBtpAU3lWIcnYGRwKAQL1asOud1VJ0UyW7VSoQ9fAdb/5935bNZy9iNeDbw0PMKuOjbPxbpMcj9gKXABmPA9fb+OY70N6nQy7hTT19ie7lt0soQPyfEPgGyDZKToYIfj3gzSpp841he6hFwDukDAAn+oB4TnDyIWVuAPGlIRVr7KU5ykfA3p/LQHcoeoo9w0k5NMCS+24Rw0Dapz8O+nt+fJNTQv9YeKoM96vuS76s3C4fKJopiH6eWjSZxe/Z0WV9DT3ROcX5NQ== admin@management-2 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQBijJrUvWlBsaXOwo7CAsYz/hCZJWP/KsQpK1PTjxASwEi0iaIONQ6G+TtETb3HuSpAWBu4Qc09dh1vGIxdsm5UoVwW1HdmGT39lN4gGrIs/auDP4UxHnFIME3aNfh9VAFsLjgM6AZ8zPYaFN4V0dTZOlArDTLjKzVijymXdedOgRD6m5Xouuf4PdzKYjfvt0h/dQx/xCX1cTltXTKZhZfVcYqsWBKwjtfdxGfxYp5q2HiM1KPTEF7hlNr+48i0MBJTsj25JqXv57l0mifow0mgBuXq/a+4JTAPbL2KvREZQOyaTzndROOCodBJgwnSq62NSMu+kVcEj9oc6wR1pau8KlhE/iFTVhs/4b6Mzk3xSCDbNXiMC6/+Av6VYFDuSNhXsx/GhU3NLvx4XL9xfHmnkaydZ6sARQN/tBAYk+DQv1Jeh11fHsqVY3CRVHBn7VCv4cIyb90JjK7rtOj9nLwHu7J573yi6VvnduIaqmo9RaICncz9/OU17Ca1o7iDs+BsTJe73Evz/RLg81ADr+4pmcQqyvBPROzAr12tJ7EzCb0lw1DK/ssSl5n2jFsOaxuIX/t++CunfDZGejFvGWwHc2DdbCgNk/cTHSUPE6K+MpR1ssp9RdUnOr34yixM3iJ6hHg8OIHBGwk0cyBNrihRChJ67xdDS+MgChrU14Vw== admin@management-3 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCZCxfcETfZL1ZYJPT9R1Sgwwamdn7ilS+ZLxFt7qWTIwLZJoh4XU0JRsMZCspmC2LW5aqiluo269aSGm9zdtgpurySk7pJVggNOHDECl6zQAzEfe8Lok1MvyqotuVFHFADVvuZ783KeTrtMkLCd+v4pAQMkKk7A5trHFfobCXLUC3VMQ9UviTxyCuRjN6Lurz6DSoCtWVoVVPMwls0ZUE2qXevyalmQFrOztnz6sIfHN61dGTNcd2ZtOGT6nUZ5yEsq63zoSpABgwK+9Px/2V4LSYLasJbQVm+A9odpN1AswsD17ui+dUXK8gzCV7CglMftFN2rJLGyTDNidi/0bdTDuDjat/D6kqJi9vXq1n8LA6+m1iBsRSKyOvsUJIGcNSC5ZkNn9CMwg4zG0iqBQ9v0aTndtQmZBikUrXpCtzAa1hCwHcNFNQTzi/iZGZ6o/9I8id+RGXxQFas7zb7v6Wfi5BZDj0YrNX58Eac9rwZJQonrrE7ELDl4pBILpxUtLqPhGSWSXVao749DASkoI0WRKzlEUvt90+GR02d/i4xPZI0RodyOoU61x0ergsYzTJp9rf3+NuWLAKZmuVBSqs76BRc3J9Bj8cCGOqLD2f3Vx+q/oF1rYqovg/qlJsuNdll6kFgYoQNmYn8ifvOy6kdb1ZYRJ2wS1tcuBDdMi7r5w== admin@management-haw diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf index de5f4318..5ca39701 100644 --- a/.linux_items/include/EFI/boot/refind.conf +++ b/.linux_items/include/EFI/boot/refind.conf @@ -25,12 +25,48 @@ menuentry "Linux" { initrd /arch/boot/intel_ucode.img initrd /arch/boot/amd_ucode.img initrd /arch/boot/x86_64/archiso.img - options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3" + options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% copytoram loglevel=3" submenuentry "Linux (i3)" { add_options "i3" } submenuentry "Linux (CLI)" { - add_options "nox" + add_options "loglevel=4 nomodeset nox" + } + submenuentry "Linux (Mac CLI)" { + add_options "loglevel=5 nomodeset nox" + } + submenuentry "Linux (MacBook9,1)" { + add_options "loglevel=5 intremap=nosid noacpi nomodeset" + } + submenuentry "Linux (MacBookAir5,2)" { + add_options "loglevel=5 intremap=off" + } + submenuentry "Linux (MacBookAir6,x)" { + add_options "loglevel=5 libata.force=1:noncq" + } + submenuentry "Linux (MacBookPro7,1)" { + add_options "loglevel=5 acpi_osi=! acpi_osi="Darwin" intremap=off nomodeset" + } + submenuentry "Linux (MacBookPro10,x)" { + add_options "loglevel=5 noapic" + } + submenuentry "Linux (MacBookPro11,x)" { + add_options "loglevel=5 acpi_osi=" + } + submenuentry "Linux (Mac Generic Fix 1)" { + add_options "loglevel=5 acpi=force irqpoll noapic" + } + submenuentry "Linux (Mac Generic Fix 2)" { + add_options "loglevel=5 acpi=off" + } + submenuentry "Linux (Mac Generic Fix 3)" { + add_options "loglevel=5 acpi_osi=! acpi_osi="Darwin"" + } + submenuentry "Linux (Mac Generic Fix 4)" { + add_options "loglevel=5 add_efi_memmap" + } + submenuentry "Linux (DEBUG)" { + add_options "loglevel=7 nomodeset nox" } } #UFD#menuentry "WindowsPE" { diff --git a/.linux_items/include/syslinux/wk_iso_linux.cfg b/.linux_items/include/syslinux/wk_iso_linux.cfg index 3f2c3556..fef9a9e1 100644 --- a/.linux_items/include/syslinux/wk_iso_linux.cfg +++ b/.linux_items/include/syslinux/wk_iso_linux.cfg @@ -6,7 +6,7 @@ ENDTEXT MENU LABEL Linux LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet loglevel=3 +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=3 LABEL wk_iso_linux_i3 TEXT HELP @@ -16,7 +16,7 @@ ENDTEXT MENU LABEL Linux (i3) LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet loglevel=3 i3 +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=3 i3 SYSAPPEND 3 LABEL wk_iso_linux_cli @@ -27,5 +27,5 @@ ENDTEXT MENU LABEL Linux (CLI) LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nox nomodeset +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=4 nomodeset nox SYSAPPEND 3 diff --git a/.linux_items/include/syslinux/wk_pxe_linux.cfg b/.linux_items/include/syslinux/wk_pxe_linux.cfg index d2468e03..caa6a1cc 100644 --- a/.linux_items/include/syslinux/wk_pxe_linux.cfg +++ b/.linux_items/include/syslinux/wk_pxe_linux.cfg @@ -6,7 +6,7 @@ ENDTEXT MENU LABEL Linux (PXE) LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ quiet loglevel=3 +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=3 SYSAPPEND 3 LABEL wk_http_linux_i3 @@ -17,7 +17,7 @@ ENDTEXT MENU LABEL Linux (PXE) (i3) LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ quiet loglevel=3 i3 +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=3 i3 SYSAPPEND 3 LABEL wk_http_linux_cli @@ -28,5 +28,5 @@ ENDTEXT MENU LABEL Linux (PXE) (CLI) LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ nox nomodeset +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=4 nomodeset nox SYSAPPEND 3 diff --git a/.linux_items/include/syslinux/wk_sys.cfg b/.linux_items/include/syslinux/wk_sys.cfg index c36606f5..af388ed3 100644 --- a/.linux_items/include/syslinux/wk_sys.cfg +++ b/.linux_items/include/syslinux/wk_sys.cfg @@ -4,6 +4,6 @@ INCLUDE boot/syslinux/wk_sys_linux.cfg #UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg #UFD#INCLUDE boot/syslinux/1201_hdclone.cfg #UFD#INCLUDE boot/syslinux/1201_eset.cfg -#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg +#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg INCLUDE boot/syslinux/wk_tail.cfg diff --git a/.linux_items/include/syslinux/wk_sys_linux.cfg b/.linux_items/include/syslinux/wk_sys_linux.cfg index 55b5f239..b65047ad 100644 --- a/.linux_items/include/syslinux/wk_sys_linux.cfg +++ b/.linux_items/include/syslinux/wk_sys_linux.cfg @@ -6,26 +6,12 @@ ENDTEXT MENU LABEL Linux LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3 +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 -LABEL wk_linux_i3 +LABEL wk_sys_linux_extras TEXT HELP -A live Linux environment (i3) - * HW diagnostics, file-based backups, data recovery, etc +Show extra Linux options ENDTEXT -MENU LABEL Linux (i3) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3 i3 -SYSAPPEND 3 - -LABEL wk_linux_cli -TEXT HELP -A live Linux environment (CLI) - * HW diagnostics, file-based backups, data recovery, etc -ENDTEXT -MENU LABEL Linux (CLI) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox nomodeset -SYSAPPEND 3 +MENU LABEL Linux (Extras) +KERNEL vesamenu.c32 +APPEND boot/syslinux/wk_sys_linux_extras.cfg diff --git a/.linux_items/include/syslinux/wk_sys_linux_extras.cfg b/.linux_items/include/syslinux/wk_sys_linux_extras.cfg new file mode 100644 index 00000000..979be787 --- /dev/null +++ b/.linux_items/include/syslinux/wk_sys_linux_extras.cfg @@ -0,0 +1,198 @@ +INCLUDE boot/syslinux/wk_head.cfg + +LABEL wk_linux +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 + +LABEL wk_linux_i3 +TEXT HELP +A live Linux environment (i3) + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (i3) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 i3 +SYSAPPEND 3 + +LABEL wk_linux_cli +TEXT HELP +A live Linux environment (CLI) + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (CLI) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=4 nomodeset nox +SYSAPPEND 3 + +LABEL wk_linux_mac_generic +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (Mac) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 reboot=pci +SYSAPPEND 3 + +LABEL wk_linux_mac_cli +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (Mac CLI) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 nomodeset nox reboot=pci +SYSAPPEND 3 + +MENU SEPARATOR + +LABEL wk_linux_macbook52 +TEXT HELP +A live Linux environment + * WARNING System will be limited to one CPU/thread + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (MacBook5,2) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 acpi=off irqpoll maxcpus=1 noapic reboot=pci +SYSAPPEND 3 + +LABEL wk_linux_macbook91 +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (MacBook9,1) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 intremap=nosid noacpi nomodeset reboot=pci +SYSAPPEND 3 + +MENU SEPARATOR + +LABEL wk_linux_macbookair52 +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (MacBookAir5,2) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 intremap=off reboot=pci +SYSAPPEND 3 + +LABEL wk_linux_macbookair6_ +TEXT HELP +A live Linux environment + * WARNING Drive I/O performance will be impacted + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (MacBookAir6,x) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 libata.force=1:noncq reboot=pci +SYSAPPEND 3 + +MENU SEPARATOR + +LABEL wk_linux_macbookpro71 +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (MacBookPro7,1) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 acpi_osi=! acpi_osi="Darwin" intremap=off nomodeset reboot=pci +SYSAPPEND 3 + +LABEL wk_linux_macbookpro10_ +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (MacBookPro10,x) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 noapic reboot=pci +SYSAPPEND 3 + +LABEL wk_linux_macbookpro11_ +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (MacBookPro11,x) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 acpi_osi= reboot=pci +SYSAPPEND 3 + +MENU SEPARATOR + +LABEL wk_linux_mac_misc1 +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (Misc Mac Fix 1) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 acpi=force irqpoll noapic reboot=pci +SYSAPPEND 3 + +LABEL wk_linux_mac_misc2 +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (Misc Mac Fix 2) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 acpi=off reboot=pci +SYSAPPEND 3 + +LABEL wk_linux_mac_misc3 +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (Misc Mac Fix 3) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=5 acpi_osi=! acpi_osi="Darwin" reboot=pci +SYSAPPEND 3 + +MENU SEPARATOR + +LABEL wk_linux_debug +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (DEBUG) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=7 nomodeset nox +SYSAPPEND 3 + +MENU SEPARATOR + +LABEL wk_return +TEXT HELP +Show Return to the main menu +ENDTEXT +MENU LABEL Main Menu +KERNEL vesamenu.c32 +APPEND boot/syslinux/wk_sys.cfg diff --git a/Images/logo.svg b/Images/logo.svg deleted file mode 100644 index 69b2ca2a..00000000 --- a/Images/logo.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - -