diff options
| author | Oliver Tappe | 2007-04-28 19:32:13 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-04-28 19:32:13 +0200 |
| commit | 5e758ddaabf0e74ba6bbfd5b934cd5ee991b6a5d (patch) | |
| tree | 99aba5e1a153e0a6783d96557ff9185233c0d77f /initramfs | |
| parent | Code cleanups, simplifications ... (diff) | |
| download | core-5e758ddaabf0e74ba6bbfd5b934cd5ee991b6a5d.tar.gz core-5e758ddaabf0e74ba6bbfd5b934cd5ee991b6a5d.tar.xz core-5e758ddaabf0e74ba6bbfd5b934cd5ee991b6a5d.zip | |
* fixed -D not being accepted
* $SLX_VERSION is not determined via slxversion (which is currently incomplete, though)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@943 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/mkdxsinitrd | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 5f1ae434..f75548e0 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -72,7 +72,7 @@ usage() [-c machine-setup]" echo "OPTIONEN" echo " -c location of client configuration file (machine-setup)" - echo " -d use ISC dhclient instead of udhcpcd of busybox" + echo " -d use ISC dhclient instead of udhcpcd of busybox" echo " -h show usage information" echo " -k kernel version" echo " -i path/file" @@ -170,6 +170,9 @@ else elif [ -L ${SLX_SHARE_PATH}/initramfs/${FILENAME} ] ; then cp -a ${SLX_SHARE_PATH}/initramfs/${FILENAME} ${INSTDIR}/${FILENAME%/*} else + if [ -z ${SLX_VERSION} ] ; then + SLX_VERSION=$(slxversion) + fi sed -e "s,@@@INSTDIR@@@,${INSTDIR},g;s,@@@KERNVER@@@,${KERNVER},g" \ -e "s,@@@DISTRO@@@,${DISTRO}-${DISTRO_VER},g;s,@@@NETIF@@@,${NET_IF},g" \ -e "s,@@@NWMODULES@@@,${NWMODULES},g" \ @@ -181,7 +184,7 @@ else # the stage3 init - fixme: version string should be added in a more clever way echo -e "slxconf_date=${DATE}\nslxconf_kernver=${KERNVER}\n\ slxconf_listnwmod=\"${NWMODULES}\"\nslxconf_distro=${DISTRO}-${DISTRO_VER}\n\ -slxconf_slxver=\"4.0.8b\"" > ${INSTDIR}/etc/sysconfig/slxsystem.conf +slxconf_slxver=\"${SLX_VERSION}\"" > ${INSTDIR}/etc/sysconfig/slxsystem.conf sed -e "s,^#!/bin/sh,#!/bin/ash," -i ${INSTDIR}/${FILENAME} fi fi @@ -305,7 +308,7 @@ cp -a ${themes}* ${INSTDIR}/usr/share/themes ######################################################################### # End of function declaration -while getopts :hk:c:i:r:o:s:f:n:m:Sut:d:v:I:V:a: a ; do +while getopts :hk:c:i:r:o:s:f:n:m:Sut:d:v:I:D:V:a: a ; do case $a in \:|\?) case $OPTARG in |