Update with new dependancy based init system, call the right script directories, always use busybox now, sigh.

7 files changed, 105 insertions, 113 deletions

diff --git a/debian/control b/debian/control
index fe8d332..89c37e4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: initramfs-tools
 Section: utils
 Priority: optional
 Maintainer: Jeff Bailey <jbailey@ubuntu.com>
-Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, busybox-cvs-static
+Build-Depends-Indep: debhelper (>= 4.0.0), cdbs
 Standards-Version: 3.6.1
 
 Package: initramfs-tools
 Architecture: all
-Depends: klibc-utils
+Depends: klibc-utils, busybox-cvs-static
 Description: tools for generting an Ubuntu-style initramfs
  This package generates an initramfs for an Ubuntu system.
diff --git a/init b/init
index c09074f..733e7fd 100644
--- a/init
+++ b/init
@@ -1,4 +1,14 @@
 #!/bin/sh -x
+
+/bin/busybox ln -s /bin/busybox /bin/[
+/bin/busybox ln -s /bin/busybox /bin/basename
+/bin/busybox ln -s /bin/busybox /bin/mount
+/bin/busybox ln -s /bin/busybox /bin/mkdir
+/bin/busybox ln -s /bin/busybox /bin/umount
+/bin/busybox ln -s /bin/busybox /bin/sed
+/bin/busybox ln -s /bin/busybox /bin/grep
+/bin/busybox ln -s /bin/busybox /bin/cat
+
 mkdir /sys
 mkdir /proc
 mkdir /tmp
@@ -40,7 +50,7 @@ for x in $(cat /proc/cmdline); do
 	esac
 done
 
-run_scripts /scripts/init_top
+run_scripts /scripts/init-top
 
 . /scripts/${BOOT}
 
@@ -59,7 +69,7 @@ fi
 
 mountroot
 
-run_scripts /scripts/init_bottom
+run_scripts /scripts/init-bottom
 
 umount /sys
 umount /proc
diff --git a/mkinitramfs b/mkinitramfs
index 359ecd2..e1c9a6b 100644
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -99,7 +99,7 @@ done
 ln -s /usr/lib/klibc/bin/* ${TMPDIR}/bin
 ln -s /usr/lib/klibc/lib/* ${TMPDIR}/lib
 ln -s /usr/share/initramfs-tools/init ${TMPDIR}/init
-ln -s /usr/share/initramfs-tools/scripts/* ${TMPDIR}/scripts
+cp -a /usr/share/initramfs-tools/scripts/* ${TMPDIR}/scripts
 ln -s ${CONFDIR}/initramfs.conf ${TMPDIR}/conf
 ln -s /etc/udev ${TMPDIR}/etc
 
@@ -112,14 +112,16 @@ rm ${TMPDIR}/lib/*lsb*
 
 # Busybox
 if [ "x${BUSYBOX}" = "xy" ]; then
+	rm ${TMPDIR}/bin/sh
 	ln -s /bin/busybox ${TMPDIR}/bin
+	ln -s /bin/busybox ${TMPDIR}/bin/sh
 fi
 
 # Raid
 ln -s /sbin/mdadm ${TMPDIR}/bin
 ln -s /sbin/mdrun ${TMPDIR}/bin
-ln -s /bin/grep ${TMPDIR}/bin
-ln -s /bin/sed ${TMPDIR}/bin
+#ln -s /bin/grep ${TMPDIR}/bin
+#ln -s /bin/sed ${TMPDIR}/bin
 
 (cd ${TMPDIR} && find . | cpio --quiet --dereference -o -H newc | gzip -9 >${outfile})
 
diff --git a/scripts/functions b/scripts/functions
index 4a92011..a2ffd54 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -8,124 +8,104 @@ panic()
 	fi
 }
 
-# this function finds scripts with empty depends and adds them
-# to the ordered list
-dep_reduce()
+render()
 {
-	i=0
-	j=0
-	unset neworder
-
-	for entry in "${array[@]}"; do
-		set - ${entry}
+	eval "echo -n \${$@}"
+}
 
-		if [ "$#" -eq "0" ]; then
+set_initlist()
+{
+	unset initlist
+	for si_x in ${initdir}/*; do
+		if [ ! -x ${si_x} ]; then
 			continue
-		elif [ "$#" -eq "1" ]; then
-			if [ $end -eq 0 ] ||
-			   [ x"${order[$((end-1))]}" != x"$1" ]; then
-				order[$((end))]=$1
-				end=$((end+1))
-				neworder[$((j))]=$1
-				j=$((j+1))
-			fi
-
-			array[$((i))]=
 		fi
-
-		i=$((i+1))
+		initlist="${initlist} $(basename ${si_x})"
 	done
 }
 
-dep_remove()
+reduce_satisfied()
 {
-	i=0
-
-	# for each row in the array
-	for entry in "${array[@]}"; do
-		unset newentry
-
-		set - ${entry}
-
-		# for each dependency of the script
-		for dep in "$@"; do
-			new=1
-
-			# for each new dependency
-			for tmp in "${order[@]}"; do
-				if [ x"$dep" = x"$tmp" ]; then
-					new=0
-				fi
-			done
-
-			if [ x"$new" = x"1" ]; then
-				newentry="$newentry $dep"
-			fi
-		done
+	deplist="$(render array_${1})"
+	for rs_x in ${runlist}; do
+		pop_list_item ${rs_x} ${deplist}
+		deplist=${tmppop}
+	done
+	eval array_${1}=\"${deplist}\"
+}
 
-		array[$((i))]="$newentry"
-		i=$((i+1))
+get_prereqs()
+{
+	set_initlist
+	for gp_x in ${initlist}; do
+		tmp=$(${initdir}/${gp_x} prereqs)
+		eval array_${gp_x}=\"${tmp}\"
 	done
 }
 
-run_scripts()
+count_unsatisfied()
 {
-	initdir=${1}
-	scripts=$(ls ${initdir})
-	order=
-	end=0
-	array=
+	set - ${@}
+	return ${#}
+}
 
-	# FIXME: New algorithm
-	# array of strings: "$file $prereqs"
-	# iterate over all strings; find empty strings (just $file)
-	# add to order, delete from all strings and zero out entry
-	# repeat until all strings are empty
-	
-	i=0
-	for file in $scripts; do
-		# if it's not a regular file, or if it's not executable, skip it
-		if ! [ -f ${initdir}/${file} ] || ! [ -x ${initdir}/${file} ]; then
+# Removes $1 from initlist
+pop_list_item()
+{
+	item=${1}
+	shift
+	set - ${@}
+	unset tmppop
+	# Iterate
+	for pop in ${@}; do
+		if [ ${pop} = ${item} ]; then
 			continue
 		fi
-	
-		array[$((i))]="$file $(${initdir}/${file} prereqs)"
-		i=$((i+1))
+		tmppop="${tmppop} ${pop}"
 	done
 
-	# No scripts in directory, bail.
-	if [ ${i} -eq 0 ]; then
-		return 0
-	fi
-	
-	while /bin/true; do
-		set - ${array[@]}
-	
-		if [ "$#" -eq "0" ]; then
-			break
-		fi
-		
-		dep_reduce
-	
-		dep_remove
-			
-		if [ "${#neworder}" -eq "0" ]; then
-			for x in "${array[@]}"; do
-				if [ x"$x" != x"" ]; then
-					printf "could not reduce further; "
-					printf "circular dependencies\n"
-					return 1
-				fi
-			done
-	
-			# we're done!
-			break
+}
+
+# This function generates the runlist, so we clear it first.
+reduce_prereqs()
+{
+	unset runlist
+	set_initlist
+	set - ${initlist}
+	i=$#
+	# Loop until there's no more in the queue to loop through
+	while [ ${i} -ne 0 ]; do
+		oldi=${i}
+		for rp_x in ${initlist}; do
+			reduce_satisfied ${rp_x}
+			count_unsatisfied $(render array_${rp_x})
+			cnt=${?}
+			if [ ${cnt} -eq 0 ]; then
+				runlist="${runlist} ${rp_x}"
+				pop_list_item ${rp_x} ${initlist}
+				initlist=${tmppop}
+				i=$((${i} - 1))
+			fi
+		done
+		if [ ${i} -eq ${oldi} ]; then
+			echo "PANIC: Circular dependancy.  Exiting." >&2
+			exit 1
 		fi
 	done
-	
-	# run the initscripts
-	for script in "${order[@]}"; do
-		${initdir}/${script}
+}
+
+call_scripts()
+{
+	echo ${runlist}
+	for cs_x in ${runlist}; do
+		${initdir}/${cs_x}
 	done
-}	
+}
 
+run_scripts()
+{
+	initdir=${1}
+	get_prereqs
+	reduce_prereqs
+	call_scripts
+}
diff --git a/scripts/local b/scripts/local
index ffbd230..b322f09 100644
--- a/scripts/local
+++ b/scripts/local
@@ -3,7 +3,7 @@
 # Parameter: Where to mount the filesystem
 mountroot ()
 {
-	run_scripts /scripts/local_top
+	run_scripts /scripts/local-top
 
 	# Get the root filesystem type
 	if [ ! -e ${ROOT} ]; then
@@ -12,10 +12,10 @@ mountroot ()
 
 	eval $(fstype < ${ROOT})
 
-	run_scripts /scripts/local_premount
+	run_scripts /scripts/local-premount
 
 	# Mount root
 	mount ${ro} -t ${FSTYPE} ${ROOT} ${rootmnt}
 
-	run_scripts /scripts/local_bottom
+	run_scripts /scripts/local-bottom
 }
diff --git a/scripts/init-top/test b/scripts/local-top/md
index e4d59fb..d6f7e94 100644
--- a/scripts/init-top/test
+++ b/scripts/local-top/md
@@ -15,4 +15,4 @@ prereqs)
 	;;
 esac
 
-echo "Got here!"
+/bin/mdrun /dev
diff --git a/scripts/nfs b/scripts/nfs
index d0f1600..9860ea7 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -2,7 +2,7 @@
 # Paramter: Where the root should be mounted
 mountroot ()
 {
-	run_scripts /scripts/nfs_top
+	run_scripts /scripts/nfs-top
 
 	ipconfig ${DEVICE}
 	. /tmp/net-${DEVICE}.conf
@@ -10,10 +10,10 @@ mountroot ()
 		NFSROOT=${ROOTSERVER}:${ROOTPATH}
 	fi
 
-	run_scripts /scripts/nfs_premount
+	run_scripts /scripts/nfs-premount
 
 	nfsmount ${NFSROOT} ${rootmnt}
 
-	run_scripts /scripts/nfs_bottom
+	run_scripts /scripts/nfs-bottom
 
 }