systematisches ersetzen der distro-variablen-namen

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@22 95ad53e4-c205-0410-b2fa-d234c58c8868

9 files changed, 126 insertions, 126 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
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 7d098d45..8afbb74e 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -167,7 +167,7 @@ for section in Files ServerFlags Module InputDevice Monitor \
       # check for 64bit CPU/installation (fixme!!)
       [ -n "$amd64" ] && \
         echo '"\tModulePath\t"/usr/X11R6/lib64/modules"\n' >>$xfc
-      for i in ${XFONTPATH} ; do
+      for i in ${D_XFONTPATH} ; do
         echo -e "\tFontPath\t\"$i/\"" >>$xfc ; done
     ;;
     ServerFlags)  
@@ -259,11 +259,11 @@ fi
 . /etc/distro-functions
 
 # set X11 configuration file
-if [ -n "${XF86CONFFILE}" ] ; then
-  XF86CONFFILE="/mnt/${XF86CONFFILE}"
+if [ -n "${D_XF86CONFFILE}" ] ; then
+  D_XF86CONFFILE="/mnt/${D_XF86CONFFILE}"
 else
-  XF86CONFFILE="/mnt/etc/X11/xorg.conf"
-  error "  You should define the variable XF86CONFFILE in yours distro \
+  D_XF86CONFFILE="/mnt/etc/X11/xorg.conf"
+  error "  You should define the variable D_XF86CONFFILE in yours distro \
 configuration\n  file" nonfatal
 fi
 
@@ -376,13 +376,13 @@ if [ -z "${KEYTABLE}" ] ; then
   KEYTABLE=${DEFKEYTABLE}
 fi
 echo -e "# entry added by $0: $date" \
-  >>/mnt/etc/${INITDIR}/boot.ld
-echo -e "loadkeys -q ${KEYTABLE}\n" >>/mnt/etc/${INITDIR}/boot.ld
+  >>/mnt/etc/${D_INITDIR}/boot.ld
+echo -e "loadkeys -q ${KEYTABLE}\n" >>/mnt/etc/${D_INITDIR}/boot.ld
 [ -n "${CONSOLE_FONT}" ] && consolefont
 # run X11 / Xorg configurator
 . /etc/sysconfig/xserver >/dev/null 2>&1 || error "  The xserver \
 configuration file generated by hwsetup could not\n  be found." nonfatal
-displaysetup ${XF86CONFFILE}
+displaysetup ${D_XF86CONFFILE}
 
 echo "finished" > /tmp/hwcfg
 
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 0a3a39a7..0ac46875 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -21,7 +21,7 @@
 . /etc/sysconfig/config
 . /etc/distro-functions
 # get location of logfile definition
-. /mnt/etc/${SYSCONFDIR}/logfile
+. /mnt/etc/${D_SYSCONFDIR}/logfile
 
 #######################################################################
 # copy distro specific scripts, programs, libraries and configs
@@ -54,8 +54,8 @@ data via dhcp until now ..." nonfatal
 # set localization
 if [ -z "$country" ] ; then
   msg "servconfig" "No configuration for localization found in config file. \
-Using default\ncountry setting '${DEFAULTCOUNTRY}' defined in $0."
-  country=${DEFAULTCOUNTRY}
+Using default\ncountry setting '${D_DEFAULTCOUNTRY}' defined in $0."
+  country=${D_DEFAULTCOUNTRY}
 fi
 localization $country
 
@@ -92,15 +92,15 @@ case ${DISTRO} in
 esac
 case ${DISTRO} in
   suse*|debian*|ubuntu*)
-    for i in ${RCDIRS} ${INITBOOTD} ; do
+    for i in ${D_RCDIRS} ${D_INITBOOTD} ; do
       rm -f /mnt/etc/$i/*
     done
     count=10
-    for i in ${INITSCRIPTS}; do 
+    for i in ${D_INITSCRIPTS}; do 
       count=`expr $count + 1`
       revcnt=`expr 41 - $count`
-      ln -sf /etc${INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}S${count}$i
-      ln -sf /etc${INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}K${revcnt}$i
+      ln -sf /etc${D_INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}S${count}$i
+      ln -sf /etc${D_INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}K${revcnt}$i
     done
   ;;
   gentoo*)
@@ -113,7 +113,7 @@ esac
 # boot.local
 if [ -n "$bootlocal_script" ]; then
   echo -e "# entries added by $0:\n#\t$date\n\n\
-$bootlocal_script" >> /mnt/etc/${INITDIR}/boot.local
+$bootlocal_script" >> /mnt/etc/${D_INITDIR}/boot.local
 fi
 
 #######################################################################
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index e6e957c7..4f983390 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -251,12 +251,12 @@ if [ -n "${UNIONFS}" ] ; then
 else
   echo -n "Using bind mounts to ramdisk for rw access"
   mount -n -t tmpfs -o size=${TMPFSSIZE} ramfs ${RWDIR}
-  for path in ${BINDMPTS} ; do
+  for path in ${D_BINDMPTS} ; do
     mkdir -p ${RWDIR}/${path} >/dev/null 2>&1
     mount -n --bind ${RWDIR}/${path} /mnt/${path}
   done
   [ -z "${NOLDSC}" ] && ldconfig /tmp/ld.so.cache &
-  for path in ${RODIRSINRW}; do
+  for path in ${D_RODIRSINRW}; do
     if [ -d /mnt/${path} ] ; then
       LIST=${path}" "$LIST
       # exclude them from etc copy process too
@@ -266,13 +266,13 @@ else
       mount -n --bind /mnt/${path} /root/${path} >/dev/null 2>&1
     fi
   done
-  for path in /etc/${SYSCONFDIR} ${DIRINBINDMNT} ${LIST}; do
+  for path in /etc/${D_SYSCONFDIR} ${D_DIRINBINDMNT} ${LIST}; do
     mkdir -p ${RWDIR}/${path}
   done
   testmkd ${RWDIR}/var/tmp
   chmod a+rwxt ${RWDIR}/var/tmp >/dev/null 2>&1
 
-  echo -e "${DISETCEXCL} @@@COMETCEXCL@@@" >>/tmp/etc.exclude
+  echo -e "${D_ETCEXCL} @@@COMETCEXCL@@@" >>/tmp/etc.exclude
   # if ld.so.cache is to be generated then do not copy the file
   [ -z "${NOLDSC}" ] && echo -e "ld.so.cache*" >>/tmp/etc.exclude
   # for tar exclude lists might be used, more difficult for cp
@@ -291,19 +291,19 @@ else
   # run some specific stuff !?
 fi
 # script for stuff to execute during early bootup
-echo -e "#!/bin/sh\n# skeleton written from $0" >/mnt/etc/${INITDIR}/boot.ld
+echo -e "#!/bin/sh\n# skeleton written from $0" >/mnt/etc/${D_INITDIR}/boot.ld
 echo "fs complete" >/tmp/fscmpl
 
 # write debug file information after filesystem setup completed
-echo -e "# /etc${SYSCONFDIR}/logfile - file created by $0\n#\n# logfile for linux diskless client specific debugging output\nLOGFILE=\"$LOGFILE\"\n#\n# debug level\nDEBUGLEVEL=\"$DEBUGLEVEL\"" > /mnt/etc/${SYSCONFDIR}/logfile || \
-  error "Unable to create the logfile configuration in /etc/${SYSCONFDIR}. \
+echo -e "# /etc${D_SYSCONFDIR}/logfile - file created by $0\n#\n# logfile for linux diskless client specific debugging output\nLOGFILE=\"$LOGFILE\"\n#\n# debug level\nDEBUGLEVEL=\"$DEBUGLEVEL\"" > /mnt/etc/${D_SYSCONFDIR}/logfile || \
+  error "Unable to create the logfile configuration in /etc/${D_SYSCONFDIR}. \
 That\n  might indicate some severe error."
 
 # run distribution independent and dependent configuration of files and 
 # services
 servconfig &
 
-for path in @@@COMDIRINDXS@@@ ${DISDIRINDXS} ${DIRINBINDMNT} ; do
+for path in @@@COMDIRINDXS@@@ ${D_DIRINDXS} ${D_DIRINBINDMNT} ; do
   testmkd /mnt/${path}
 done
 for i in /var/run/utmp /var/log/wtmp /var/log/lastlog /etc/mtab ; do
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index e11baa2a..e9193ab6 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -17,34 +17,34 @@ COMETCEXCL="XF86Config*\nissue*\nmtab*\nfstab*\n"
 COMDIRINDXS="/tmp/scratch /var/lib/nobody"
 
 # distro specific settings read from configuration file
-# 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="<set in ~/distro-config/distro file>"
-DISETCEXCL="<set in ~/distro-config/distro file>"
-BINDMPTS="<set in ~/distro-config/distro file>"
-DIRINBINDMNT="<set in ~/distro-config/distro file>"
-RODIRSINRW="<set in ~/distro-config/distro file>"
-DISDIRINDXS="<set in ~/distro-config/distro file>"
-DISBINDMNT="<set in ~/distro-config/distro file>"
-INITDIR="<set in ~/distro-config/distro file>"
-INITBOOTD="<set in ~/distro-config/distro file>"
-RCDIRS="<set in ~/distro-config/distro file>"
-RCDIRSINRW="<set in ~/distro-config/distro file>"
-INITSCRIPTS="<set in ~/distro-config/distro file>"
-XF86CONFFILE="<set in ~/distro-config/distro file>"
-XFONTPATH="<set in ~/distro-config/distro file>"
-DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
+# D_BINDMNT - any code which is specific in bind mount environment
+# D_RCDIRS - runlevel directories relative to /etc
+
+D_SYSCONFDIR="<set in ~/distro-config/distro file>"
+D_ETCEXCL="<set in ~/distro-config/distro file>"
+D_BINDMPTS="<set in ~/distro-config/distro file>"
+D_DIRINBINDMNT="<set in ~/distro-config/distro file>"
+D_RODIRSINRW="<set in ~/distro-config/distro file>"
+D_DIRINDXS="<set in ~/distro-config/distro file>"
+D_BINDMNT="<set in ~/distro-config/distro file>"
+D_INITDIR="<set in ~/distro-config/distro file>"
+D_INITBOOTD="<set in ~/distro-config/distro file>"
+D_RCDIRS="<set in ~/distro-config/distro file>"
+D_RCDIRSINRW="<set in ~/distro-config/distro file>"
+D_INITSCRIPTS="<set in ~/distro-config/distro file>"
+D_XF86CONFFILE="<set in ~/distro-config/distro file>"
+D_XFONTPATH="<set in ~/distro-config/distro file>"
+D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
 
 #########################################################################
 # End of global variable declaration, nothing needed to be changed at 
@@ -59,7 +59,7 @@ local FPTB=`which $1`
 if [ -z ${FPTB} ] ; then
   return 1;
 else
-  cp ${FPTB} ${INSTDIR}/${DEST}
+  cp ${boot_dir}/${FPTB} ${INSTDIR}/${DEST}
 fi
 }
 
@@ -187,7 +187,7 @@ resolve_modules() {
 #########################################################################
 # End of function declaration
 
-while getopts :hgMRk:i:m:b:d:o:s:Sut:D:I:V:a: a ; do
+while getopts :hgMRk:i:m:r:d:o:s:Sut:D:I:V:a: a ; do
     case $a in
 	\:|\?)	case $OPTARG in
 		k)  echo "-k requires kernel list parameter"
@@ -196,7 +196,7 @@ while getopts :hgMRk:i:m:b:d:o:s:Sut:D:I:V:a: a ; do
 		    ;;
 		m)  echo "-m requires module list parameter"
 		    ;;
-		b)  echo "-b requires boot dir parameter"
+		r)  echo "-r requires root dir parameter"
 		    ;;
 		d)  echo "-d requires root device parameter"
 		    ;;
@@ -227,7 +227,7 @@ while getopts :hgMRk:i:m:b:d:o:s:Sut:D:I:V:a: a ; do
 	m)  modules=$OPTARG
 	    modules_set=1
 	    ;;
-	b)  boot_dir=$OPTARG
+	r)  root_dir=$OPTARG
 	    ;;
 	d)  rootdev=$OPTARG
 	    ;;
@@ -267,7 +267,7 @@ shift $(expr $OPTIND - 1)
 rm -rf ${INSTDIR}
 mkdir -p ${INSTDIR}/{dev,proc,tmp,mnt,root,bin,sbin,sys,lib}
 mkdir -p ${INSTDIR}/usr/share
-# needed for KNOPPIX hwsetup not to confuse with ${SYSCONFDIR}
+# needed for KNOPPIX hwsetup not to confuse with ${D_SYSCONFDIR}
 mkdir -p ${INSTDIR}/etc/sysconfig
 
 # source configuration file for the distribution used