Fix Samba password issue, remove duplicate cpu info, and fix up readme.

benphelps · Feb 11, 2022 · def727d · def727d
1 parent 714efbb
commit def727d
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,9 @@ limitations under the License.
 ## Network Access
 * The username for ssh and samba access is "root".  The root password is generated during every boot, it can be found in the Network Settings menu.
 
+## Credits
+Like any Linux distribution, this project is not the work of one person.  It is the work of many persons all over the world who have developed the open source bits without which this project could not exist.  Special thanks to 351ELEC, EmuELEC, CoreELEC, LibreELEC, Anbernic, and developers across the ARM handheld community.
+
 ## Frequently Asked Questions
 * Does JELOS offer any support?
   * No. JELOS is something that I develop for fun, it is provided as-is.  If you require a distribution with support, I recommend you choose a community supported distribution instead.

diff --git a/packages/jelos/sources/autostart/common/007-rootpw b/packages/jelos/sources/autostart/common/007-rootpw
@@ -4,6 +4,12 @@
 
 . /etc/profile
 
+if [ ! -d "/storage/.cache/samba" ]
+then
+  mkdir -p /storage/.cache/samba
+  touch /storage/.cache/samba/smbpasswd
+fi
+
 ROTATION=$(get_setting rotate.root.password)
 if [ "${ROTATION}" == "0" ]
 then

diff --git a/packages/jelos/sources/scripts/jelos-info b/packages/jelos/sources/scripts/jelos-info
@@ -73,7 +73,6 @@ echo "SYSTEM INFORMATION:"
 echo "OPERATING SYSTEM: ${OS_NAME}"
 echo "VERSION: ${OS_VERSION}"
 echo "BUILD ID: ${BUILD_ID:0:7}"
-echo "CPU: ${V_CPUMODEL1} (${V_CPUNB} Cores)"
 echo "ARCHITECTURE: ${V_OSARCH}"
 echo "KERNEL: ${V_SYSTEM} (${V_ARCH})"
 echo "DISK SPACE:"

diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf
@@ -20,6 +20,7 @@
   load printers = no
   enable core files = no
   passdb backend = smbpasswd
+  smb passwd file = /storage/.cache/samba/smbpasswd
   smb encrypt = disabled
   fruit:model = Xserve
 

diff --git a/packages/ui/emulationstation/config/es_systems.cfg b/packages/ui/emulationstation/config/es_systems.cfg
@@ -1209,7 +1209,6 @@
       <emulator name="retroarch">
         <cores>
           <core default="true">pcsx_rearmed</core>
-          <core>duckstation</core>
           <core>swanstation</core>
         </cores>
       </emulator>