--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh 2008/06/27 22:43:02 522 +++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh 2008/06/27 23:33:40 527 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.8 2008-06-27 22:43:02 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.13 2008-06-27 23:33:40 niro Exp $ # # AutoSta_LX Installation Script # @@ -17,15 +17,13 @@ #Includes source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null ### bugfix ############################### -cdromdev="`echo $cdromdev|sed -e 's/ //'`" +cdromdev="$(echo ${cdromdev} | sed 's/ //')" ######################################## ### System/Config Version VERSION="0.3" TITLE="alxinstall-ng - ${VERSION}" -#CONFIGS_TEMPLATE="/opt/alx-config/configs" - CDPATH="/mnt/cdrom" INSTALLPATH="/mnt/magellan" @@ -268,8 +266,8 @@ { while [[ ${CURRENTLINE} != ${TOTALLINES} ]] do - CURRENTLINE=$(grep --count . /tmp/install.log) - PERCENT=$(expr ${CURRENTLINE} \* 100 / ${TOTALLINES}) + CURRENTLINE=$(grep -c . /tmp/install.log) + PERCENT=$(( ${CURRENTLINE} * 100 / ${TOTALLINES})) echo ${PERCENT} sleep 1 done @@ -320,7 +318,7 @@ "3" "Beenden und neustarten" \ "4" "Beenden und eine Shell starten") RES=$? - if [[ ${RES} -eq 1 ]] && exit 1 + [[ ${RES} -eq 1 ]] && exit 1 if [[ ${RES} -eq 0 ]] then case ${METHOD} in @@ -420,12 +418,14 @@ setup (hd0) quit EOF +echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx\"" > /etc/conf.d/mkinitrd +mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") exit 0 CHROOTEOF ## enters chroot mount -t proc proc ${INSTALLPATH}/proc - mount -t sysfs sysfs ${INSTALLPATH}/sysfs + mount -t sysfs sysfs ${INSTALLPATH}/sys mount -o bind /dev ${INSTALLPATH}/dev chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i umount ${INSTALLPATH}/proc