[Debian-live-changes] r2251 - dists/trunk/live-initramfs/scripts
daniel at alioth.debian.org
daniel at alioth.debian.org
Tue Jun 26 21:41:16 UTC 2007
Author: daniel
Date: 2007-06-26 21:41:16 +0000 (Tue, 26 Jun 2007)
New Revision: 2251
Modified:
dists/trunk/live-initramfs/scripts/live
Log:
Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live 2007-06-26 20:42:47 UTC (rev 2250)
+++ dists/trunk/live-initramfs/scripts/live 2007-06-26 21:41:16 UTC (rev 2251)
@@ -538,23 +538,19 @@
roopt="ro"
fi
- if [ -n "${MODULE}" ]
+ # Read image names from ${MODULE}.module if it exists
+ if [ -e "${image_directory}/filesystem.${MODULE}.module" ]
then
- # Read image names from ${MODULE}.module if it exists
- if [ -e "${image_directory}/filesystem.${MODULE}.module" ]
- then
- FILE="${image_directory}/filesystem.${MODULE}.module"
- elif [ -e "${image_directory}/${MODULE}.module" ]
- then
- FILE="${image_directory}/${MODULE}.module"
- else
- panic "Could not find module ${MODULE}"
- fi
-
- for IMAGE in `cat ${FILE}`
+ for IMAGE in `cat ${image_directory}/filesystem.${MODULE}.module`
do
image_string="${image_string} ${image_directory}/${image}"
done
+ elif [ -e "${image_directory}/${MODULE}.module" ]
+ then
+ for IMAGE in `cat ${image_directory}/${MODULE}.module`
+ do
+ image_string="${image_string} ${image_directory}/${image}"
+ done
else
# ${MODULE}.module does not exist, create a list of images
for FILESYSTEM in squashfs ext2 ext3 xfs dir
@@ -569,7 +565,7 @@
done
# Now sort the list
- image_string=$(echo ${image_string} | sed -e 's/ /\n/g' | sort )
+ image_string="`echo ${image_string} | sed -e 's/ /\n/g' | sort `"
fi
mkdir -p "${croot}"
More information about the Debian-live-changes
mailing list