Check for /etc/oz_version.. tired of seeing OpenZaurus v0.0 in opie-login.

1 files changed, 8 insertions, 0 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 9871e80..3bc1e0c 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -520,70 +520,78 @@ bool ODeviceIPAQ::setDisplayBrightness ( int bright )
         }
         return res;
 }
 
 int ODeviceIPAQ::displayBrightnessResolution ( ) const
 {
         return 255; // really 128, but logarithmic control is smoother this way
 }
 
 
 /**************************************************
  *
  * Zaurus
  *
  **************************************************/
 
 
 
 void ODeviceZaurus::init ( )
 {
         d-> m_modelstr = "Zaurus SL5000";
         d-> m_model = OMODEL_Zaurus_SL5000;
         d-> m_vendorstr = "Sharp";
         d-> m_vendor = OVENDOR_Sharp;
 
         QFile f ( "/proc/filesystems" );
 
         if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
                 d-> m_systemstr = "OpenZaurus";
                 d-> m_system = OSYSTEM_OpenZaurus;
 
                 f. close ( );
+
+                f. setName ( "/etc/oz_version" );
+                if ( f. open ( IO_ReadOnly )) { 
+                        QTextStream ts ( &f );
+                        d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
+                        f. close ( );
+                }
         }
         else {
                 d-> m_systemstr = "Zaurus";
                 d-> m_system = OSYSTEM_Zaurus;
         }
 
+
         d-> m_leds [0] = OLED_Off;
 }
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 //#include <asm/sharp_char.h> // including kernel headers is evil ...
 
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
 
         #defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 
 /* --- for SHARP_BUZZER device --- */
 
         //#defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 //#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
 #define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
 #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
 
 //#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 //#define SHARP_BUZ_KEYSOUND         2  /* key sound */