systematisches ersetzen der distro-variablen-namen

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

3 files changed, 24 insertions, 24 deletions

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