5 files changed, 74 insertions, 74 deletions
diff --git a/initrd/distro-specs/debian/config b/initrd/distro-specs/debian/config
index a04620fd..a38f1fb0 100644
--- a/initrd/distro-specs/debian/config
+++ b/initrd/distro-specs/debian/config
@@ -5,43 +5,43 @@
 #
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
 
-# SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
+# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
-# DISETCEXCL - list of files, wildcards to be excluded from /etc when using 
+# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
 # bind mounts
-# DIRINBINDMNT - lists of directories to be created in bind mounted rw
+# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
 # part of the client filesystem
-# RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
+# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
 # TempFS usage
-# DISDIRINDXS - directories in client filesystem which should be present 
+# D_DIRINDXS - directories in client filesystem which should be present 
 # anyhow
-# DISBINDMNT - any code which is specific in bind mount environment
-# RCDIRS - runlevel directories relative to /etc
-# XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
+# D_BINDMNT - any code which is specific in bind mount environment
+# D_RCDIRS - runlevel directories relative to /etc
+# D_XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
-# XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
-# DEFAULTCOUNTRY - localization (see common functions)
+# D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
+# D_DEFAULTCOUNTRY - localization (see common functions)
 
-SYSCONFDIR=/default
-DISETCEXCL="etc/gconf/*\n*.old\n*-\n\
+D_SYSCONFDIR=/default
+D_ETCEXCL="etc/gconf/*\n*.old\n*-\n\
 etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\ndhclient.script\n\
 rc2.d/*\nrc5.d/*"
-BINDMPTS="tmp root home"
-DIRINBINDMNT="/var/run /var/log /var/tmp"
-RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf /var/lib/gdm"
-DISDIRINDXS="/var/X11R6/compose-cache \
+D_BINDMPTS="tmp root home"
+D_DIRINBINDMNT="/var/run /var/log /var/tmp"
+D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf /var/lib/gdm"
+D_DIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /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/lock/subsys/sysconfig"
-DISBINDMNT="# "
-INITDIR="/init.d"
-INITBOOTD="/rcS.d"
-RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
-INITSCRIPTS="udev procps.sh bootlogd keymap.sh hwclock.sh sudo"
-XF86CONFFILE="/etc/X11/xorg.conf"
-XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
-DEFAULTCOUNTRY="de"
+D_BINDMNT="# "
+D_INITDIR="/init.d"
+D_INITBOOTD="/rcS.d"
+D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
+D_INITSCRIPTS="udev procps.sh bootlogd keymap.sh hwclock.sh sudo"
+D_XF86CONFFILE="/etc/X11/xorg.conf"
+D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
+D_DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/debian/functions-debian b/initrd/distro-specs/debian/functions-debian
index 00d64832..4344ac96 100644
--- a/initrd/distro-specs/debian/functions-debian
+++ b/initrd/distro-specs/debian/functions-debian
@@ -42,9 +42,9 @@ if [ -f /mnt/etc/init.d/ntp ] ; then
   testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null
   if [ "x$start_ntp" = "xinitial" ] ; then
     echo -e "# entry added by $0: $date" \
-      >>/mnt/etc/${INITDIR}/boot.ld
+      >>/mnt/etc/${D_INITDIR}/boot.ld
     echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
-      >>/mnt/etc/${INITDIR}/boot.ld
+      >>/mnt/etc/${D_INITDIR}/boot.ld
   else
     rllinker "ntp" "$start" "$stop"
   fi
@@ -163,7 +163,7 @@ config_dm () {
   cp /etc/displaymanager /mnt/etc/sysconfig/displaymanager
 
 #  echo -e "#!/bin/sh\n# entry added by $0: $date\n\
-#(sleep 1; /etc/init.d/xdm start) &" >>/mnt/etc/${INITDIR}/boot.ld
+#(sleep 1; /etc/init.d/xdm start) &" >>/mnt/etc/${D_INITDIR}/boot.ld
   ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/S01xdm
   ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/K20xdm
 }
@@ -171,7 +171,7 @@ config_dm () {
 # consolefont
 consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
-  >>/mnt/etc/${INITDIR}/boot.ld
+  >>/mnt/etc/${D_INITDIR}/boot.ld
 }
 
 # acpi and powersave
diff --git a/initrd/distro-specs/gentoo/config b/initrd/distro-specs/gentoo/config
index 04b3f5f2..297d2e10 100644
--- a/initrd/distro-specs/gentoo/config
+++ b/initrd/distro-specs/gentoo/config
@@ -4,35 +4,35 @@
 #
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
 
-# SYSCONFDIR - system wide configuration settings in /etc - sysconfig in  
+# D_SYSCONFDIR - system wide configuration settings in /etc - sysconfig in  
 # SuSE and RedHat, default in Debian and Ubuntu, conf.d in Gentoo
-# DISETCEXCL - list of files, wildcards to be excluded from /etc when using 
+# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
 # bind mounts
-# DIRINBINDMNT - lists of directories to be created in bind mounted rw
+# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
 # part of the client filesystem
-# RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
+# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
 # TempFS usage
-# DISDIRINDXS - directories in client filesystem which should be present 
+# D_DIRINDXS - directories in client filesystem which should be present 
 # anyhow
-# DISBINDMNT - any code which is specific in bind mount environment
-# RCDIRS - runlevel directories relative to /etc
-SYSCONFDIR=conf.d
-DISETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n\
+# D_BINDMNT - any code which is specific in bind mount environment
+# D_RCDIRS - runlevel directories relative to /etc
+D_SYSCONFDIR=conf.d
+D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n\
 *.YaST2save\netc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 *.SuSEconfig.saved\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\n*.rpmsave\ndhclient.script\ninit.d/boot.d/*\n\
 init.d/rc3.d/*\ninit.d/rc5.d/*"
-BINDMPTS="tmp root home"
-DIRINBINDMNT="/var/run /var/log /var/tmp"
-RODIRSINRW="/var/adm /var/lib/texmf"
-DISDIRINDXS="/var/X11R6/compose-cache \
+D_BINDMPTS="tmp root home"
+D_DIRINBINDMNT="/var/run /var/log /var/tmp"
+D_RODIRSINRW="/var/adm /var/lib/texmf"
+D_DIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
 /var/lib/pam_devperm /var/lib/bluetooth \
 /var/lib/texmf /var/lib/nfs/sm /var/lib/nfs/state \
 /var/lib/misc /var/lib/acpi /var/spool/cron \
 /var/lock/subsys/sysconfig"
-DISBINDMNT="# spielspass fuer splash"
-INITDIR="/init.d"
-INITBOOTD="/runlevels/boot"
-RCDIRS="/runlevels/default /runlevels/nonetwork /runlevels/single"
-INITSCRIPTS=""
+D_BINDMNT="# spielspass fuer splash"
+D_INITDIR="/init.d"
+D_INITBOOTD="/runlevels/boot"
+D_RCDIRS="/runlevels/default /runlevels/nonetwork /runlevels/single"
+D_INITSCRIPTS=""
diff --git a/initrd/distro-specs/suse-10.0/config b/initrd/distro-specs/suse-10.0/config
index 9e75ef0e..52b22880 100644
--- a/initrd/distro-specs/suse-10.0/config
+++ b/initrd/distro-specs/suse-10.0/config
@@ -5,44 +5,44 @@
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
 
 
-# SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
+# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
-# DISETCEXCL - list of files, wildcards to be excluded from /etc when using 
+# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
 # bind mounts
-# DIRINBINDMNT - lists of directories to be created in bind mounted rw
+# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
 # part of the client filesystem
-# RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
+# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
 # TempFS usage
-# DISDIRINDXS - directories in client filesystem which should be present 
+# D_DIRINDXS - directories in client filesystem which should be present 
 # anyhow
-# DISBINDMNT - any code which is specific in bind mount environment
-# RCDIRS - runlevel directories relative to /etc
-# XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
+# D_BINDMNT - any code which is specific in bind mount environment
+# D_RCDIRS - runlevel directories relative to /etc
+# D_XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
-# XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
-# DEFAULTCOUNTRY - localization (see common functions)
+# D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
+# D_DEFAULTCOUNTRY - localization (see common functions)
 
-SYSCONFDIR=/sysconfig
-DISETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n*.rpmorig\n*.rpmnew\n\
+D_SYSCONFDIR=/sysconfig
+D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n*.rpmorig\n*.rpmnew\n\
 *.YaST2save\netc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 *.SuSEconfig.saved\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\n*.rpmsave\ndhclient*script\ninit.d/boot.d/*\n\
 init.d/rc3.d/*\ninit.d/rc5.d/*\nX11/xorg.conf*\n"
-BINDMPTS="tmp root media home"
-DIRINBINDMNT="/var/run /var/log /var/tmp"
-RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf /var/lib/rpm"
-DISDIRINDXS="/var/X11R6/compose-cache \
+D_BINDMPTS="tmp root media home"
+D_DIRINBINDMNT="/var/run /var/log /var/tmp"
+D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf /var/lib/rpm"
+D_DIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /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/lock/subsys/sysconfig"
-DISBINDMNT="# spielspass fuer splash"
-INITDIR="/init.d"
-INITBOOTD="${INITDIR}/boot.d"
-RCDIRS="/init.d/rc0.d /init.d/rc1.d /init.d/rc2.d /init.d/rc3.d /init.d/rc4.d /init.d/rc5.d /init.d/rc6.d /init.d/rcS.d"
-INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig"
-XF86CONFFILE="/etc/X11/xorg.conf"
-XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
-DEFAULTCOUNTRY="de"
+D_BINDMNT="# spielspass fuer splash"
+D_INITDIR="/init.d"
+D_INITBOOTD="${D_INITDIR}/boot.d"
+D_RCDIRS="/init.d/rc0.d /init.d/rc1.d /init.d/rc2.d /init.d/rc3.d /init.d/rc4.d /init.d/rc5.d /init.d/rc6.d /init.d/rcS.d"
+D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig"
+D_XF86CONFFILE="/etc/X11/xorg.conf"
+D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
+D_DEFAULTCOUNTRY="de"
 
diff --git a/initrd/distro-specs/suse-10.0/functions-suse-10.0 b/initrd/distro-specs/suse-10.0/functions-suse-10.0
index be6f3fc8..ed033707 100644
--- a/initrd/distro-specs/suse-10.0/functions-suse-10.0
+++ b/initrd/distro-specs/suse-10.0/functions-suse-10.0
@@ -42,9 +42,9 @@ if [ -f /mnt/etc/init.d/ntp ] ; then
   testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null
   if [ "x$start_ntp" = "xinitial" ] ; then
     echo -e "# entry added by $0: $date" \
-      >>/mnt/etc/${INITDIR}/boot.ld
+      >>/mnt/etc/${D_INITDIR}/boot.ld
     echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
-      >>/mnt/etc/${INITDIR}/boot.ld
+      >>/mnt/etc/${D_INITDIR}/boot.ld
   else
     rllinker "ntp" "$start" "$stop"
   fi
@@ -177,7 +177,7 @@ cp /etc/displaymanager /mnt/etc/sysconfig/displaymanager
 config_xdm () {
 config_dm_entry yes
 #  echo -e "#!/bin/sh\n# entry added by $0: $date\n\
-#(sleep 1; /etc/init.d/xdm start) &" >>/mnt/etc/${INITDIR}/boot.ld
+#(sleep 1; /etc/init.d/xdm start) &" >>/mnt/etc/${D_INITDIR}/boot.ld
 ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/S01xdm
 ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/K20xdm
 }
@@ -315,7 +315,7 @@ config_dm_entry yes
 # consolefont
 consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
-  >>/mnt/etc/${INITDIR}/boot.ld
+  >>/mnt/etc/${D_INITDIR}/boot.ld
 }
 
 # acpi and powersave