diff options
-rw-r--r-- | initrd/distro-specs/ubuntu/functions-6.06 | 1 | ||||
-rw-r--r-- | initrd/distro-specs/ubuntu/functions-default | 26 | ||||
-rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 2 | ||||
-rw-r--r-- | initrd/initrd-stuff/etc/functions | 5 |
4 files changed, 32 insertions, 2 deletions
diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06 index 7d3840ae..7f8226f3 100644 --- a/initrd/distro-specs/ubuntu/functions-6.06 +++ b/initrd/distro-specs/ubuntu/functions-6.06 @@ -150,7 +150,6 @@ consolefont () { echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \ >>/mnt/etc/${D_INITDIR}/boot.ld } -"20" "02" # acpi and powersave config_acpi () { rllinker "acpid" "02" "19" diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default index e1d1c0c7..bbb87e6e 100644 --- a/initrd/distro-specs/ubuntu/functions-default +++ b/initrd/distro-specs/ubuntu/functions-default @@ -23,6 +23,31 @@ preinit () { modprobe ${MODPRV} unix || error "$df_errumod" nonfatal } + +#overwrite settings set by hwautocfg +displayvars (){ +Files=' \t FontPath\t\t "/usr/share/X11/fonts/misc"\n +\t FontPath\t\t "/usr/share/X11/fonts/cyrillic"\n +\t FontPath\t\t "/usr/share/X11/fonts/100dpi/:unscaled"\n +\t FontPath\t\t "/usr/share/X11/fonts/75dpi/:unscaled"\n +\t FontPath\t\t "/usr/share/X11/fonts/Type1"\n +\t FontPath\t\t "/usr/share/X11/fonts/100dpi"\n +\t FontPath\t\t "/usr/share/X11/fonts/75dpi"\n +\t # path to defoma fonts\n +\t FontPath\t\t "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"\n' + +Module=' \t Load\t "i2c"\n +\t Load\t "bitmap"\n +\t Load\t "ddc"\n +\t Load\t "dri"\n +\t Load\t "extmod"\n +\t Load\t "freetype"\n +\t Load\t "glx"\n +\t Load\t "int10"\n +\t Load\t "type1"\n +\t Load\t "vbe"\n' + +} # distro specific function called from servconfig script config_distro () { # add the halt link to the 0 and 6 runlevel directories @@ -157,7 +182,6 @@ consolefont () { echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \ >>/mnt/etc/${D_INITDIR}/boot.ld } -"20" "02" # acpi and powersave config_acpi () { rllinker "acpid" "02" "19" diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 0dd99e8a..c6fbf5d7 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -90,6 +90,8 @@ local ServerLayout='\tIdentifier\t"Simple Layout"\n local DRI='\tGroup\t\t"video"\n \tMode\t\t0666' +displayvars + if [ -n "$hw_graphic" ] ; then DRV=${hw_graphic% *} CDP=${hw_graphic##* } diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions index 7ae7b7e0..5ae2927a 100644 --- a/initrd/initrd-stuff/etc/functions +++ b/initrd/initrd-stuff/etc/functions @@ -733,6 +733,11 @@ done ####################################################################### # dummy functions +#overwrite xorg configuration set by hwautocfg +displayvars (){ +: +} + # AUS SuSE-9.3 # linking runlevel scripts |