thinstation/build.patch
changeset 35 00eb34bfe348
parent 34 87b508932fa3
equal deleted inserted replaced
34:87b508932fa3 35:00eb34bfe348
     1 diff --git a/build.conf b/build.conf
       
     2 index 560127f..e09157d 100644
       
     3 --- a/build.conf
       
     4 +++ b/build.conf
       
     5 @@ -293,7 +293,8 @@ module r8169          		# Realtek 8169 Gigabit Ethernet support (v. 6.011)
       
     6  #module snd-rme96                       # RME Digi96, Digi96/8 and Digi96/8 PRO/PAD/PST soundcards
       
     7  #module snd-rme9652                     # RME Hammerfall (RME Digi9652/Digi9636) soundcards
       
     8  #module snd-hdsp                        # RME Hammerfall DSP Audio soundcards
       
     9 -#module snd-hda-intel model=auto position_fix=1       # Intel HD Audio with default parameters - you may need to change these
       
    10 +module snd-hda-intel model=auto position_fix=1       # Intel HD Audio with default parameters - you may need to change these
       
    11 +module snd-pcm-oss
       
    12  #module snd-trident                     # Trident 4D-Wave DX/NX or SiS 7018 chips
       
    13  #module snd-ymfpci                      # Yamaha PCI chips YMF724,YMF724F,YMF740,YMF740C,YMF744,YMF754
       
    14  #module snd-als4000                     # Avance Logic ALS4000 chips
       
    15 @@ -322,7 +323,7 @@ module usb-cdrom               # Needed for USB CD-Rom Drives
       
    16  #!!Storage Devices
       
    17  #module ide-floppy       	# LS-120, Iomega Zip
       
    18  #module floppy           	# Floppy disk support
       
    19 -module ide-cd           	# CD-Rom Drive Support
       
    20 +module ide-cd_mod           	# CD-Rom Drive Support
       
    21  #module ahci			# ACHI SATA support
       
    22  module ata_piix 		# Intel piix SATA chipset support
       
    23  #module sata_nv			# NVidia SATA support
       
    24 @@ -342,7 +343,7 @@ module vfat             	# Fat and VFat file system support
       
    25  module ntfs             	# NTFS file system support
       
    26  module ext2             	# Ext2 file system support
       
    27  module ext3            		# Ext3 file system support
       
    28 -module supermount       	# Supermount support for auto unmounting of removable media
       
    29 +#module supermount       	# Supermount support for auto unmounting of removable media
       
    30  #module nfs             	# NFS file system support
       
    31  #module smbfs           	# Samba client FS Support, allows you to mount smb filesystems
       
    32  
       
    33 @@ -365,8 +366,8 @@ module supermount       	# Supermount support for auto unmounting of removable m
       
    34  package hwclock			# Utility to set system time from hardware clock
       
    35  package rdate			# Utility to obtain date & time from network
       
    36  #package ntp			# Utility to obtain date & time from network (only use one of these)
       
    37 -#package sound-esd		# Enable sound-esd or sound-nasd if you want to be able to control
       
    38 -#package sound-nasd		#  sound on your thin client from another computer or
       
    39 +package sound-esd		# Enable sound-esd or sound-nasd if you want to be able to control
       
    40 +package sound-nasd		#  sound on your thin client from another computer or
       
    41                          	#  your remote session.
       
    42  #package iptables		# IP Tables support
       
    43  
       
    44 @@ -538,12 +539,13 @@ package xtdesk         		# Adds icons to desktop
       
    45  ### --- Miscellaneous Parameters --- ###
       
    46  ########################################
       
    47  #!!Basic
       
    48 -param rootpasswd     pleasechangeme			# Do Change!  Console/telnet password for root
       
    49 +param rootpasswd     x			# Do Change!  Console/telnet password for root
       
    50                                          		#  If this is enabled, Telnetd will be enabled.
       
    51 -param xorgvncpasswd  pleasechangeme   			# VNC Access Password
       
    52 -param storagepasswd  pleasechangeme  			# Password for storage server
       
    53 -param dialuppasswd   pleasechangeme  			# Password for dialin account
       
    54 -param sambapasswd    pleasechangeme  			# Password for samba shares when using user mode security
       
    55 +param xorgvncpasswd  x   			# VNC Access Password
       
    56 +param storagepasswd  x  			# Password for storage server
       
    57 +param dialuppasswd   x  			# Password for dialin account
       
    58 +param sambapasswd    x  			# Password for samba shares when using user mode security
       
    59 +# set this to false to remove the 'splash=...' kernel parameter
       
    60  param bootlogo       true            			# Backgound picture during boot
       
    61  param bootresolution 1024x768				# Resolution used during Thinstation boot
       
    62  param desktop	     ./background.jpg			# Background image for the desktop. More images in backgrounds/
       
    63 diff --git a/kernel/dependencies_module/ata_piix b/kernel/dependencies_module/ata_piix
       
    64 new file mode 100644
       
    65 index 0000000..b60306b
       
    66 --- /dev/null
       
    67 +++ b/kernel/dependencies_module/ata_piix
       
    68 @@ -0,0 +1,2 @@
       
    69 +module libata
       
    70 +module dock
       
    71 diff --git a/kernel/dependencies_module/button b/kernel/dependencies_module/button
       
    72 index 2029fec..85324d5 100644
       
    73 --- a/kernel/dependencies_module/button
       
    74 +++ b/kernel/dependencies_module/button
       
    75 @@ -4,4 +4,7 @@ module fan
       
    76  module processor
       
    77  module thermal
       
    78  module video
       
    79 +module thermal_sys
       
    80 +module output
       
    81 +module backlight
       
    82  package acpi
       
    83 diff --git a/kernel/dependencies_module/ext3 b/kernel/dependencies_module/ext3
       
    84 new file mode 100644
       
    85 index 0000000..70cd362
       
    86 --- /dev/null
       
    87 +++ b/kernel/dependencies_module/ext3
       
    88 @@ -0,0 +1,2 @@
       
    89 +module mbcache
       
    90 +module jbd
       
    91 diff --git a/kernel/dependencies_module/snd-hda-intel b/kernel/dependencies_module/snd-hda-intel
       
    92 index 46fac61..7c9cf3f 100644
       
    93 --- a/kernel/dependencies_module/snd-hda-intel
       
    94 +++ b/kernel/dependencies_module/snd-hda-intel
       
    95 @@ -1 +1,5 @@
       
    96 -snd-hda-codec
       
    97 +module snd-pcm
       
    98 +module snd-page-alloc
       
    99 +module snd
       
   100 +module soundcore
       
   101 +module snd-timer
       
   102 diff --git a/kernel/dependencies_module/snd-pcm-oss b/kernel/dependencies_module/snd-pcm-oss
       
   103 new file mode 100644
       
   104 index 0000000..c0b1976
       
   105 --- /dev/null
       
   106 +++ b/kernel/dependencies_module/snd-pcm-oss
       
   107 @@ -0,0 +1,6 @@
       
   108 +module snd-pcm
       
   109 +module snd
       
   110 +module soundcore
       
   111 +module snd-page-alloc
       
   112 +module snd-timer
       
   113 +module snd-mixer-oss
       
   114 diff --git a/kernel/dependencies_module/soundcore b/kernel/dependencies_module/soundcore
       
   115 deleted file mode 100644
       
   116 index 37aac51..0000000
       
   117 --- a/kernel/dependencies_module/soundcore
       
   118 +++ /dev/null
       
   119 @@ -1,3 +0,0 @@
       
   120 -module snd-mixer-oss
       
   121 -module snd-pcm-oss
       
   122 -module snd-seq-oss
       
   123 diff --git a/kernel/dependencies_module/sr_mod b/kernel/dependencies_module/sr_mod
       
   124 new file mode 100644
       
   125 index 0000000..0b48de6
       
   126 --- /dev/null
       
   127 +++ b/kernel/dependencies_module/sr_mod
       
   128 @@ -0,0 +1,2 @@
       
   129 +module scsi_mod
       
   130 +module cdrom
       
   131 diff --git a/kernel/dependencies_module/usb-storage b/kernel/dependencies_module/usb-storage
       
   132 index a98ee9c..c9a618c 100644
       
   133 --- a/kernel/dependencies_module/usb-storage
       
   134 +++ b/kernel/dependencies_module/usb-storage
       
   135 @@ -1 +1,3 @@
       
   136  module sd_mod
       
   137 +module usbcore
       
   138 +module scsi_mod
       
   139 diff --git a/kernel/dependencies_module/usbhid b/kernel/dependencies_module/usbhid
       
   140 new file mode 100644
       
   141 index 0000000..5970e67
       
   142 --- /dev/null
       
   143 +++ b/kernel/dependencies_module/usbhid
       
   144 @@ -0,0 +1,4 @@
       
   145 +module usbcore
       
   146 +module ehci-hcd
       
   147 +module ohci-hcd
       
   148 +module uhci-hcd
       
   149 diff --git a/kernel/dependencies_module/vfat b/kernel/dependencies_module/vfat
       
   150 index 603a11d..23cb22e 100644
       
   151 --- a/kernel/dependencies_module/vfat
       
   152 +++ b/kernel/dependencies_module/vfat
       
   153 @@ -1,2 +1,3 @@
       
   154 +module fat
       
   155  module nls_cp850
       
   156  module nls_iso8859-1
       
   157 diff --git a/packages/base/etc/thinstation.init b/packages/base/etc/thinstation.init
       
   158 index 390f9e4..6b9c193 100755
       
   159 --- a/packages/base/etc/thinstation.init
       
   160 +++ b/packages/base/etc/thinstation.init
       
   161 @@ -43,7 +43,7 @@ umask 022
       
   162  
       
   163  # Mount Filesystems
       
   164  mount -t tmpfs tmpfs /mnt/dynamic
       
   165 -mount -t unionfs -o dirs=/mnt/dynamic:/ unionfs /mnt/union
       
   166 +mount -t unionfs -o dirs=/mnt/dynamic:/=ro unionfs /mnt/union
       
   167  cd /mnt/union
       
   168  mkdir oldroot
       
   169  pivot_root . /mnt/union/oldroot
       
   170 diff --git a/thinstation.conf.buildtime b/thinstation.conf.buildtime
       
   171 index 5965772..d1dfaf1 100644
       
   172 --- a/thinstation.conf.buildtime
       
   173 +++ b/thinstation.conf.buildtime
       
   174 @@ -1,2 +1,3 @@
       
   175  SESSION_0_TYPE=icewm
       
   176  SESSION_0_AUTOSTART=on
       
   177 +AUDIO_LEVEL=100