Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RPi | Remove "config.txt" from non-RPi devices #1863

Merged
merged 8 commits into from
Jun 23, 2018
Merged

Conversation

MichaIng
Copy link
Owner

@MichaIng MichaIng commented Jun 21, 2018

Status: Ready for review/testing

  • Remove config.txt from DietPi-PREP for non-RPi devices
  • Adjust config.txt to use gpu_mem
  • Patch gpu_mem use and config.txt removal
  • Changelog entry

Reference: https://github.com/Fourdee/DietPi/issues/1816

Commit list/description:

  • DietPi-Set_Software | Move all "config.txt" adjustments into RPi check statements
  • DietPi-Set_Software | RPi: Switch from "gpu_mem_256/512/1024" to "gpu_mem"
  • DietPi-Set_Software | Use G_CONFIG_INJECT where possible for failure/duplicate safer file edit
  • DietPi-Set_Software | General code improvements
  • DietPi-PREP | Move "config.txt" in place only for RPi systems
  • RPi | "config.txt": Switch from "gpu_mem_256/512/1024" to "gpu_mem"
  • DietPi-Patchfile | Remove config.txt for non-RPi devices and switch from "gpu_mem_256/512/1024" to "gpu_mem" setting
  • CHANGELOG | Removed unused "/DietPi/config.txt" form non-RPi devices and switched from "gpu_mem_256/512/1024" settings to single "gpu_mem" setting
  • CHANGELOG | Minor wording on "initial_turbo" removal

+ DietPi-Set_Software | Move all "config.txt" adjustments into RPi check statements
+ DietPi-Set_Software | RPi: Switch from "gpu_mem_256/512/1024" to "gpu_mem"
+ DietPi-Set_Software | Use G_CONFIG_INJECT where possible for failure/duplicate safer file edit
+ DietPi-Set_Software | General code improvements
@MichaIng MichaIng added this to the v6.10 milestone Jun 21, 2018
@MichaIng MichaIng self-assigned this Jun 21, 2018
MichaIng added 4 commits June 22, 2018 19:11
+ DietPi-PREP | Move "config.txt" in place only for RPi systems
+ RPi | "config.txt": Switch from "gpu_mem_256/512/1024" to "gpu_mem"
+ DietPi-Patchfile | Remove config.txt for non-RPi devices and switch from "gpu_mem_256/512/1024" to "gpu_mem" setting
+ CHANGELOG | Removed unused "/DietPi/config.txt" form non-RPi devices and switched from "gpu_mem_256/512/1024" settings to single "gpu_mem" setting
+ CHANGELOG | Minor wording
@Fourdee
Copy link
Collaborator

Fourdee commented Jun 23, 2018

@MichaIng

Great work, legend 👍

RPi: Switch from "gpu_mem_256/512/1024" to "gpu_mem"

This needs testing on all RPi memory models. If I remember correctly, we originally had gpu_mem but it did not effect some of the memory models (cant remember which).

@Fourdee
Copy link
Collaborator

Fourdee commented Jun 23, 2018

Note:
Would be great if we could? When both scrape and value entries are the same?

G_CONFIG_INJECT 'snd-soc-pcm5102' /etc/modules

@Fourdee Fourdee merged commit b864173 into testing Jun 23, 2018
@MichaIng MichaIng deleted the config_txt_rpi_only branch June 23, 2018 22:34
@MichaIng
Copy link
Owner Author

MichaIng commented Jun 25, 2018

@Fourdee
I have no nice idea how the function should know if $2 should be handled as setting or file then, without implementing some exact_match option/variable or something. But this would not reduce usage code then, just increase G_CONFIG_INJECT code.
Maybe check [[ -f $2 ]] && file=$2 || file=$3, but then the setting must never be a file path only, although I am not aware where this could be the case.

About gpu_mem: https://www.raspberrypi.org/documentation/configuration/config-txt/memory.md

  • Should work for all RPi with current firmware.
  • But the memory specific values overwrite it, thus if users add them manually, our setting is without effect. Maybe then it's best to revert this change, so memory setting it's effective in every thinkable case.

@Fourdee Fourdee mentioned this pull request Jun 30, 2018
Fourdee referenced this pull request Jul 3, 2018
**v6.10**
(03/07/18)

**Changes / Improvements / Optimizations:**

General | ASUS TB: GLES GPU and VPU support now enabled, once Xserver is installed.

General | 'firmware-iwlwifi': Is now a pre-req to WiFi enable. Adds support for Intel based WiFi chips by default: https://github.com/Fourdee/DietPi/issues/1855

General | "net-tools" commands (ifconfig, netstat, route, ...) were replaced by modern "ip" commands (ip a, ip r, ...) within DietPi scripts and the package therefore removed from DietPi core packages: https://github.com/Fourdee/DietPi/issues/1666

General | Removed unused "/DietPi/config.txt" from non-RPi devices: https://github.com/Fourdee/DietPi/pull/1863

General | CurlFTPFS: Removed from DietPi scripts and is no longer supported. Due to lack of security, and, single digit install count (survey).

General | Timesync: DietPi will now only check for a sucessful sync once per system boot, and, again hourly/daily if set. This is to prevent excess delay of systemd-timesyncd service, once the time has already been synced.

General | Sparky SBC: Designs patch added for DSD on MPD-5 dac , new Ids added Mytek Manhatten , LH labs 1V5 2V0 ,HD-AVP/AVA IDA-8: https://github.com/sparky-sbc/sparky-test/tree/master/dsd-marantz

DietPi-Backup | Rewritten. Userdata option removed, included by default backup. Added options to edit include/exclude filters in the GUI. Existing backups (v6.9 or less) are no longer supported: https://github.com/Fourdee/DietPi/issues/1851

DietPi-Config | Soundcards (RPi): Allo Katana, now available for selection. https://github.com/Fourdee/DietPi/issues/1849

DietPi-Config | IntelGPU Driver: Installation code added: https://github.com/Fourdee/DietPi/issues/1855#issue-333150262

DietPi-Config | Networking: You can now view the sent and recieved totals for both network devices. NB: 32bit devices will reset the values after 32bit int limit is reached (roughly 4.3GB~), this is a kernel/arch limitation: https://github.com/Fourdee/DietPi/issues/1666#issuecomment-401546728

DietPi-Drive_Manager | Rewrite and improvements:
 - Now supports ROM devices (eg: DVD). NB: compatibility for DVD/CD devices relies on kernel support. Not all devices will support DVD/CD devices, and/or their filesystem format: https://github.com/Fourdee/DietPi/issues/1858
 - Resize ext4 options added: https://github.com/Fourdee/DietPi/issues/1821
 - Support for detecting and formatting non-partitioned drives
 - You can now benchmark read/write for all available mounted drives: https://github.com/Fourdee/DietPi/issues/1858
 - Now supports mounting, viewing, removal of network drives on system (nfs4, cifs). This replaces the previous options in 'dietpi-config': https://github.com/Fourdee/DietPi/issues/1858
 - Moving of DietPi user data to filesystems that do not support permission (FAT), is no longer supported and disabled: https://github.com/Fourdee/DietPi/issues/1846

DietPi-Globals | G_BACKUP: Added to globals. This will be gradually rolled out in DietPi scripts, allowing the user to create a system backup, prior to significant system changes: https://github.com/Fourdee/DietPi/issues/1871#issuecomment-400443401

DietPi-Globals | G_CHECK_USERDATA: Added to DietPi scripts: https://github.com/Fourdee/DietPi/issues/1850#issuecomment-401407996

DietPi-Services | Rsync: Added to service control. This will prevent errors if rsync is running in daemon mode, when 'dietpi-backup' is run: https://github.com/Fourdee/DietPi/issues/1869#issuecomment-399890771

DietPi-Software | Ubooquity: Now available for installation: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=12969#p12969 (https://github.com/Fourdee/DietPi/issues/1845#issuecomment-397447909)

DietPi-Software | Roon Extension Manager: Now available for installation. Many thanks to @JanKoudijs for contributing this great addition!: https://github.com/Fourdee/DietPi/pull/1865

DietPi-Software | Mosquitto: Now uses Debian APT installation: https://github.com/Fourdee/DietPi/issues/1868#issuecomment-399982278

DietPi-Software | Gogs: Now runs under its own user. For new installations only: https://github.com/Fourdee/DietPi/issues/1877

DietPi-Software | Xserver: 'mesa-utils-extra' now also installed by default, useful for GLES testing 'es2_info es2gears' etc.

DietPi-Software | Moode: Removed from our software lineup: https://github.com/Fourdee/DietPi/issues/1223#issuecomment-401549371

DietPi-Software | Radarr, Sonarr and Jackett: Services optimized and no longer run in debugging mode. Should improve runtime performance. Many thanks to @userdeveloper98 for this contribution! https://github.com/Fourdee/DietPi/pull/1889

DietPi-Survey | Simplified available options. You can now either Opt In, or, Opt Out and automatically have any existing data cleared. Interactive installations will be prompted to Opt In or Out during 1st run. Automated installations are Opted In by default, you can change this once setup is completed. More information on DietPi-Survey and how to change the options: https://dietpi.com/phpbb/viewtopic.php?f=8&t=20 https://github.com/Fourdee/DietPi/issues/1827#issuecomment-396005575

PREP | 'os-prober' installed by default for x86_64 devices. Ensures dual boot OSs are detected by grub. Also added a 3 second timeout to grub boot prompt, allowing OS selection: https://github.com/Fourdee/DietPi/issues/1855

**Bug Fixes:**

ASUS TB | Resolved square (broken) X11 fonts.

Raspberry Pi | Removed "initial_turbo" setting from DietPi-Config and config.txt, as it prevents CPU governor from throttling down: https://github.com/Fourdee/DietPi/issues/1836

DietPi-Drive_Manager | Resolved incorrect detection of available drives: https://github.com/Fourdee/DietPi/issues/1858

DietPi-Software | GMrender: Resolved an issue where two systems on the same network would nullify the other. Hostname is now used for the server name, UUID used is applied via DietPi generated UUID during 1st run: https://dietpi.com/phpbb/viewtopic.php?f=11&t=3900&p=12985#p12985

DietPi-Software | Apache2: Fixed a syntax error that leads to Apache logging to "/error.log" instead of "/var/log/apache2/error.log"

DietPi-Software | Nukkit: Fixed the broken download link on installation. Many thanks to @symbios24 for reporting bug and providing solution: https://github.com/Fourdee/DietPi/issues/1875

DietPi-Software | Linux software: Resolved an issue with NULL entry being displayed: https://github.com/Fourdee/DietPi/pull/1830#issuecomment-401612168

DietPi-Config | Fixen an issue, where IPv6 could not be disabled on RPi. On current kernel version it is no dedicated kernel module any more and needs to be toggled via "/boot/cmdline.txt".

**AlloGUI v9:**
- Changing the root password, no longer breaks web interface: https://github.com/Fourdee/DietPi/issues/1841
- Resolved issues with terminal leakage in the web interface: https://github.com/Fourdee/DietPi/issues/1841
- System settings: Current version is always shown, even if an update is available.
- System settings: Allo Katana, now available for selection. https://github.com/Fourdee/DietPi/issues/1849
@mfeif
Copy link

mfeif commented Jul 4, 2018

I think some unplanned casualties have occurred here :-)

I have a Sparky SPC, and I upgraded to 6.10, and I can now not configure my device with dietpi-config. I've also lost access to my soundcard as per here: https://github.com/Fourdee/DietPi/issues/1894

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants