Skip to content

Commit

Permalink
v6.27
Browse files Browse the repository at this point in the history
+ DietPi-Software | Samba/NFS: Name servers "Server" to have clearer demarcation from clients
+ DietPi-Software | DietPi-RAMlog: Align fstab entry with current dietpi-drive_manager version
  • Loading branch information
MichaIng authored Oct 26, 2019
1 parent bdddd83 commit d009708
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -1727,15 +1727,15 @@ DietPi-Software will decrypt and use it for software installs. You can change it
#------------------
software_id=96

aSOFTWARE_NAME[$software_id]='Samba'
aSOFTWARE_NAME[$software_id]='Samba Server'
aSOFTWARE_DESC[$software_id]='feature-rich file server'
aSOFTWARE_CATEGORY_INDEX[$software_id]=15
aSOFTWARE_TYPE[$software_id]=0
aSOFTWARE_ONLINEDOC_URL[$software_id]='p=56#p56'
#------------------
software_id=109

aSOFTWARE_NAME[$software_id]='NFS'
aSOFTWARE_NAME[$software_id]='NFS Server'
aSOFTWARE_DESC[$software_id]='network file system server'
aSOFTWARE_CATEGORY_INDEX[$software_id]=15
aSOFTWARE_TYPE[$software_id]=0
Expand Down Expand Up @@ -1869,18 +1869,18 @@ DietPi-Software will decrypt and use it for software installs. You can change it
software_id=1

aSOFTWARE_NAME[$software_id]='Samba Client'
aSOFTWARE_DESC[$software_id]='access network shares'
aSOFTWARE_DESC[$software_id]='access SMB/CIFS/Samba network shares'
aSOFTWARE_CATEGORY_INDEX[$software_id]=1
aSOFTWARE_TYPE[$software_id]=1
aSOFTWARE_ONLINEDOC_URL[$software_id]=' dietpi-config > Network Options: NAS/Misc'
aSOFTWARE_ONLINEDOC_URL[$software_id]=' dietpi-drive_manager > Add network drive'
#------------------
software_id=110

aSOFTWARE_NAME[$software_id]='NFS Client'
aSOFTWARE_DESC[$software_id]='network file system client'
aSOFTWARE_CATEGORY_INDEX[$software_id]=1
aSOFTWARE_TYPE[$software_id]=1
aSOFTWARE_ONLINEDOC_URL[$software_id]=' dietpi-config > Network Options: NAS/Misc'
aSOFTWARE_ONLINEDOC_URL[$software_id]=' dietpi-drive_manager > Add network drive'

# File managers
#--------------------------------------------------------------------------------
Expand Down Expand Up @@ -6257,40 +6257,40 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y

fi

software_id=0
software_id=0 # OpenSSH Client
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
G_AGI openssh-client

fi

software_id=1
software_id=1 # Samba Client
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing

# Remove Information file
rm /mnt/samba/readme.txt &> /dev/null
[[ -f '/mnt/samba/readme.txt' ]] && rm /mnt/samba/readme.txt

G_AGI smbclient cifs-utils

fi

software_id=110
software_id=110 # NFS Client
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing

# Remove information file
[[ -f /mnt/nfs_client/readme.txt ]] && rm /mnt/nfs_client/readme.txt
[[ -f '/mnt/nfs_client/readme.txt' ]] && rm /mnt/nfs_client/readme.txt

# "netbase" is needed for mounting NFSv3: https://github.com/MichaIng/DietPi/issues/1898#issuecomment-406247814
G_AGI nfs-common netbase

fi

software_id=104
software_id=104 # Dropbear
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
Expand Down Expand Up @@ -6325,7 +6325,7 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y

fi

software_id=105
software_id=105 # OpenSSH Server
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
Expand Down Expand Up @@ -6362,10 +6362,9 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y
Banner_Installing

# Install persistent tmpfs
local tmpfs_max_size=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_RAMLOG_MAXSIZE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
tmpfs_max_size=${tmpfs_max_size:=50}
local tmpfs_max_size=$(sed -n '/^[[:blank:]]*AUTO_SETUP_RAMLOG_MAXSIZE=/{s/^[^=]*=//p;q}' /DietPi/dietpi.txt)
sed -i '/[[:blank:]]\/var\/log[[:blank:]]/d' /etc/fstab
echo "tmpfs /var/log tmpfs defaults,size=${tmpfs_max_size}m,noatime,nodev,nosuid,mode=1777 0 0" >> /etc/fstab
echo "tmpfs /var/log tmpfs size=${tmpfs_max_size:-50}M,noatime,lazytime,nodev,nosuid,mode=1777" >> /etc/fstab

# Enable DietPi-RAMdisk
systemctl enable dietpi-ramlog
Expand Down

0 comments on commit d009708

Please sign in to comment.