From: Eric Edgar Date: Tue, 28 Jun 2005 18:30:13 +0000 (+0000) Subject: changed to backticks and changed /bin/bash back to /bin/sh which is a valid shell... X-Git-Tag: v3.4.10.902~518 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b586f2fb7419d966df51cf1507a2af2c39dead78;p=genkernel.git changed to backticks and changed /bin/bash back to /bin/sh which is a valid shell inside the initrd/initramfs git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@234 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/gen_compile.sh b/gen_compile.sh index 88b53b9..5611c47 100644 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -704,12 +704,12 @@ compile_udev() { ln -snf "${KERNEL_DIR}" klibc/linux || gen_die "Could not link to ${KERNEL_DIR}" if [ "${ARCH}" = 'um' ] then - compile_generic "ARCH=um KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils + compile_generic "ARCH=um KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" runtask elif [ "${ARCH}" = 'sparc64' ] then compile_generic "ARCH=sparc64 CROSS=sparc64-unknown-linux-gnu- KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" runtask else - compile_generic "KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils + compile_generic "KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" runtask fi diff --git a/generic/initrd.scripts b/generic/initrd.scripts index f883591..783a553 100644 --- a/generic/initrd.scripts +++ b/generic/initrd.scripts @@ -294,7 +294,7 @@ cmdline_hwopts() { done # Shouldnt need to sort this the following loop should figure out the duplicates and strip them out - #MY_HWOPTS=$(echo ${MY_HWOPTS}| sort) + #MY_HWOPTS=`echo ${MY_HWOPTS}| sort` for x in ${MY_HWOPTS} do diff --git a/generic/linuxrc b/generic/linuxrc index 005d654..1715966 100644 --- a/generic/linuxrc +++ b/generic/linuxrc @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Daniel Robbins # Copyright 2003 Gentoo Technologies, Inc. # Distributed under the GPL @@ -37,7 +37,7 @@ fi quiet_kmsg -CMDLINE="$(cat /proc/cmdline)" +CMDLINE="`cat /proc/cmdline`" # Scan CMDLINE for any specified real_root= or cdroot arguments for x in ${CMDLINE} do @@ -404,7 +404,7 @@ then then if [ -e "${CHROOT}/mnt/cdrom/add" ] then - for targz in $(ls ${CHROOT}/mnt/cdrom/add/*.tar.gz) + for targz in `ls ${CHROOT}/mnt/cdrom/add/*.tar.gz` do tarname=`basename ${targz}` good_msg "Adding additional package ${tarname}" @@ -458,7 +458,7 @@ then chmod 1777 tmp fi - #UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||') + #UML=`cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||'` #if [ "${UML}" = 'UML' ] #then # # UML Fixes @@ -548,22 +548,22 @@ then INITRAMFS_FILES=`ls /` - INITRAMFS_FILES=$(echo ${INITRAMFS_FILES}|sed -e "s|${CHROOT#/}||g") + INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${CHROOT#/}||g"` if [ -n "${MEMORY}" ] then - INITRAMFS_FILES=$(echo ${INITRAMFS_FILES}|sed -e "s|${MEMORY#/}||g") + INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${MEMORY#/}||g"` fi if [ -n "${UNION}" ] then - INITRAMFS_FILES=$(echo ${INITRAMFS_FILES}|sed -e "s|${UNION#/}||g") + INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${UNION#/}||g"` fi - INITRAMFS_FILES=$(echo ${INITRAMFS_FILES}|sed -e "s|newroot||g") + INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|newroot||g"` for i in ${INITRAMFS_FILES} do - for j in $(/bin/busybox find /$i) + for j in `/bin/busybox find /$i` do #/bin/busybox echo "$j" if /bin/busybox [ ! -d "$j" -a "$j" != "/bin/busybox" ] @@ -571,7 +571,7 @@ then /bin/busybox rm "$j" fi done - for j in $(/bin/busybox find /$i) + for j in `/bin/busybox find /$i` do if /bin/busybox [ -d ${j} -a "${j}" != "/bin" ] then diff --git a/pkg/udev-058.tar.bz2 b/pkg/udev-058.tar.bz2 index 41568c1..8ca0006 100644 Binary files a/pkg/udev-058.tar.bz2 and b/pkg/udev-058.tar.bz2 differ