Changing distro-specific stuff to change default to Ubuntu 10.04 ...

4 files changed, 19 insertions, 33 deletions

diff --git a/initramfs/distro-specs/ubuntu/functions-8.04 b/initramfs/distro-specs/ubuntu/functions-8.04
index 5f41b690..3b93e86d 100644
--- a/initramfs/distro-specs/ubuntu/functions-8.04
+++ b/initramfs/distro-specs/ubuntu/functions-8.04
@@ -134,14 +134,6 @@ for i in rc2.d/K$stop$script rc3.d/K$stop$script \
 done
 }
 
-# set up localization like keytable, console
-dlocale () {
-# fixme -- use keytable setup script here
-# echo -e "\t# entries added by $0: $date" >> /mnt/etc/init.d/boot.slx
-sed "s/LANG.*/LANG=\"${LANG}\"/" -i /mnt/etc/default/locale
-#d_mkrlscript entry boot.slx "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1"
-}
-
 # group of functions for the normal runlevels - first parameter is start
 # second stop
 
diff --git a/initramfs/distro-specs/ubuntu/functions-8.10 b/initramfs/distro-specs/ubuntu/functions-8.10
index 971af0b8..8a3469e7 100644
--- a/initramfs/distro-specs/ubuntu/functions-8.10
+++ b/initramfs/distro-specs/ubuntu/functions-8.10
@@ -134,14 +134,6 @@ for i in rc2.d/K$stop$script rc3.d/K$stop$script \
 done
 }
 
-# set up localization like keytable, console
-dlocale () {
-# fixme -- use keytable setup script here
-# echo -e "\t# entries added by $0: $date" >> /mnt/etc/init.d/boot.slx
-sed "s/LANG.*/LANG=\"${LANG}\"/" -i /mnt/etc/default/locale
-#d_mkrlscript entry boot.slx "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1"
-}
-
 # group of functions for the normal runlevels - first parameter is start
 # second stop
 
diff --git a/initramfs/distro-specs/ubuntu/functions-9.04 b/initramfs/distro-specs/ubuntu/functions-9.04
index 66247b3b..09567aa5 100644
--- a/initramfs/distro-specs/ubuntu/functions-9.04
+++ b/initramfs/distro-specs/ubuntu/functions-9.04
@@ -28,13 +28,12 @@
 #X11/xdm/pixmaps\ndhclient.script"
 D_BINDMPTS="tmp root home media"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
-D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
+RODIRSINRW="/var/lib/gconf /var/lib/dpkg /var/lib/aspell /var/lib/mlocate \
 /var/lib/pango /var/lib/defoma /var/cache/fontconfig /var/lib/dkms"
 #D_RWDIRSINRO="/var/lib/gdm"
-D_DIRINDXS="/var/X11R6/compose-cache /var/run/sysconfig/tmp /var/adm \
-/var/lib/nobody /var/lib/pam_devperm /var/lib/bluetooth /var/lib/texmf \
-/var/lib/nfs/sm /var/lib/misc /var/lib/acpi /var/spool/cron /var/lib/alsa \
-/var/lock/subsys/sysconfig"
+D_DIRINDXS="/var/run/sysconfig/tmp /var/adm /var/lib/nobody /var/lib/pam \
+/var/lib/bluetooth /var/lib/texmf /var/lib/nfs/sm /var/lib/misc \
+/var/lib/acpi-support /var/spool/cron /var/lib/alsa /var/lock/subsys"
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -42,8 +41,6 @@ D_DIRINDXS="/var/X11R6/compose-cache /var/run/sysconfig/tmp /var/adm \
 preinit () {
   # load unix module to provide sockets (is compiled into kernel on
   # the live CDs!?)
-  modprobe ${MODPRV} unix 2>/dev/null || error "$df_errumod" nonfatal
-  modprobe ${MODPRV} vesafb 2>/dev/null || error "$df_errumod" nonfatal
   modprobe ${MODPRV} fbcon 2>/dev/null || error "$df_errumod" nonfatal
 }
 
@@ -134,14 +131,6 @@ for i in rc2.d/K$stop$script rc3.d/K$stop$script \
 done
 }
 
-# set up localization like keytable, console
-dlocale () {
-# fixme -- use keytable setup script here
-# echo -e "\t# entries added by $0: $date" >> /mnt/etc/init.d/boot.slx
-sed "s/LANG.*/LANG=\"${LANG}\"/" -i /mnt/etc/default/locale
-#d_mkrlscript entry boot.slx "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1"
-}
-
 # group of functions for the normal runlevels - first parameter is start
 # second stop
 
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index d3d55fec..ccc02288 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -21,7 +21,10 @@
 # D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
 # TempFS usage
 # D_DIRINDXS - directories in client filesystem which should be present anyhow
-
+D_BINDMPTS="tmp root home media"
+D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
+D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
+/var/lib/pango /var/lib/defoma /var/cache/fontconfig /var/lib/dkms"
 D_DIRINDXS="/var/run/sysconfig/tmp /var/lib/nobody /var/lib/misc /var/lib/pam \
 /var/lib/bluetooth /var/lib/texmf /var/lib/nfs/sm /var/lib/acpi_support \
 /var/spool/cron /var/lib/alsa"
@@ -35,7 +38,9 @@ config_distro () {
   done
   # remove unneeded init scripts (stuff handled in stage3 which would
   # interface with already existing setup)
-  rm bridge-network-interface.conf hostname.conf network*conf >/dev/null 2>&1
+  for file in bridge-network-interface.conf hostname.conf network*conf ;
+    do rm /mnt/init/${file} >/dev/null 2>&1
+  done
 
   # add the halt link to the 0 and 6 runlevel directories and other useful
   # links
@@ -62,6 +67,14 @@ initial_boot () {
   :
 }
 
+# set up localization like keytable, console
+dlocale () {
+# fixme -- use keytable setup script here
+# echo -e "\t# entries added by $0: $date" >> /mnt/etc/init.d/boot.slx
+sed -e "1i# File modified during SLX stage3 bootup (config_distro)" \
+    -e "s/LANG.*/LANG=\"${LANG}\"/" -i /mnt/etc/default/locale
+}
+
 # function for ntp configuration
 config_ntp () {
 if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then