X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=fai%2Fscripts%2Frc_fai.sh;h=1947361a7b15b5e3a5909bd9c0b08a7de143ba6d;hb=81448f4769de98bceec0f9f62a2033af86a96bcf;hp=192c63f6de6ee9fdf7e217c4bad4e83778ab54a5;hpb=b827aab00491c32a3fc9f8debaad6995d5391d83;p=hdw-linux%2Fhdw-linux.git

diff --git a/fai/scripts/rc_fai.sh b/fai/scripts/rc_fai.sh
index 192c63f..1947361 100755
--- a/fai/scripts/rc_fai.sh
+++ b/fai/scripts/rc_fai.sh
@@ -9,7 +9,6 @@ root=/trg
 croot=/fai/config
 myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $2 }' | awk -F: '{ print $2 }'`"
 myconf=$croot/$myip
-proot=""
 
 if [ ! -d $myconf ] ; then
 	echo "no config found, aborting fai"
@@ -28,15 +27,15 @@ mount -tramfs ramfs /tmp
 #
 # check if disk is ready
 #
-if [ ! -f $croot/$myip/disk_ready ] ; then
+if [ ! -f $myconf/disk_ready ] ; then
 	echo
 	echo "you're disk seems to not be ready. login now and use cfdisk"
 	echo "to partition your harddisk. please make sure it's compatible"
-	echo "to $croot/$myip/disk:"
-	cat $croot/$myip/disk
+	echo "to $myconf/disk:"
+	cat $myconf/disk
 	echo
 	echo "after partitioning your harddisk please touch the file"
-	echo "$croot/$myip/disk_ready"
+	echo "$myconf/disk_ready"
 	echo "on your fai install server and reboot."
 	echo "... fully automated, he? :p"
 	echo
@@ -75,7 +74,6 @@ cat $myconf/disk | grep -v '^#' | while read nr mp fs ac; do
 			grep -v '/dev/root' /etc/fstab > $root/etc/fstab
 			echo -e "${disk}${nr}\t$mp\t$fs\tdefaults 0 2" >> \
 				$root/etc/fstab
-			proot=${disk}${nr}
 		fi
 	fi
 done
@@ -89,6 +87,8 @@ cat $myconf/disk | grep -v '^#' | while read nr mp fs ac; do
 		fi
 	fi
 done
+[ "$swap" != "0" -a -b ${disk}${swap} ] && \
+	echo -e "${disk}${swap}\tswap\tswap\tdefaults 0 0" >> $root/etc/fstab
 # packages might install new fstab file, stored.
 cp $root/etc/fstab $root/etc/fstab~
 
@@ -97,7 +97,7 @@ cp $root/etc/fstab $root/etc/fstab~
 #
 cd /tmp # we need to wget stuff!
 pkglist=""
-[ -f /fai/config/$myip/packages ] && pkglist=/fai/config/$myip/packages
+[ -f $myconf/packages ] && pkglist=$myconf/packages
 if [ -z "$pkglist" ] ; then
 	echo "cant find package list for $myip, aborting"
 	exit
@@ -114,7 +114,11 @@ cd /fai/files
 for file in `find -type f | grep -v CVS`; do
 	srcf=`basename $file`
 	trgf=`dirname $file`
-	[ "$srcf" = "DEFAULT" -o "$srcf" = "$myip" ] && cp -v $file $root/$trgf
+	trgdir=`dirname $trgf`
+	if [ "$srcf" = "DEFAULT" -o "$srcf" = "$myip" ] ; then
+		mkdir -p $root/$trgdir
+		cp -v $file $root/$trgf
+	fi
 done
 
 #
@@ -127,6 +131,8 @@ done
 #
 # lilo
 #
+proot=${disk}`grep /[^a-z,^A-Z] $myconf/disk | awk '{ print $1 }'`
+echo "running lilo -> root device = $proot"
 cat > $root/etc/lilo.conf << EOF
 boot=$disk
 prompt
@@ -146,8 +152,9 @@ cat > $root/run_lilo.sh << EOF
 mount /dev
 mount /sys
 mount /proc
+mkdir -p /dev/shm && mount /dev/shm
+mkdir -p /dev/pts && mount /dev/pts
 udevstart
-mount -a
 ln -s /proc/self/fd /dev/fd
 ln -s /proc/self/fd/0 /dev/stdin
 ln -s /proc/self/fd/1 /dev/stdout