remove <script>_<machine> (they're now in <machine>/)

run /etc/init.d/devices in rcS

BKrev: 4072cecf7QOe3XFaukgzkZmYsNLicw

7 files changed, 71 insertions, 4 deletions

diff --git a/initscripts/initscripts-1.0-r0/devices b/initscripts/initscripts-1.0-r0/devices
index 241972679f..fc1d96788b 100644
--- a/initscripts/initscripts-1.0-r0/devices
+++ b/initscripts/initscripts-1.0-r0/devices
@@ -43,9 +43,6 @@ else
 	cd /
 	mkdir -p dev/msys
 	mkdir -p dev/pts
-#	ln -sf /dev/dsp1 /dev/sharp_buz
-	ln -sf /dev/sharp_ts /dev/ts
-	ln -sf /dev/collie-fl /dev/fl
 	ln -sf /proc/self/fd /dev/fd
 	ln -sf /proc/kcore /dev/core
 	/sbin/makedevs -r / -D /etc/device_table
diff --git a/initscripts/initscripts-1.0-r0/packages b/initscripts/initscripts-1.0-r0/packages
new file mode 100644
index 0000000000..26263bde20
--- /dev/null
+++ b/initscripts/initscripts-1.0-r0/packages
@@ -0,0 +1,70 @@
+#!/bin/sh
+# Original author: ???
+#
+# Additions by Steph Meslin-Weber:
+# x Percentage display
+# x Dot display of dependency installations
+# - removed both of above
+# - display is now X of Y packages and current package name being installed
+
+. /etc/default/rcS
+
+if [ -e /dev/tty0 ]; then
+  vtmaster=/dev/tty0
+elif [ -e /dev/vc/0 ]; then
+  vtmaster=/dev/vc/0
+else
+  vtmaster=/dev/null
+fi
+
+# Display formatting
+linelength=80
+head1="  Progress: "
+head2="  Packages: "
+disp1="\033[1A\033[${linelength}D\033[K${head1}"
+disp2="\033[1B\033[${linelength}D\033[K${head2}"
+
+reconfigure () {
+  pkg=$1;
+  path=$2;
+	curposition=$3;
+	max=$4;
+  test -e "$path/info/$pkg.control" || return 1;
+
+	echo >$vtmaster -ne "$disp1 \033[1m${curposition} of ${max}\033[0m packages"
+	echo >$vtmaster -ne "$disp2 ${pkg}..."
+	
+  test -e "$path/info/$pkg.prerm" && $path/info/$pkg.prerm unconfigure >/dev/null 2>&1
+  test -e "$path/info/$pkg.postinst" && $path/info/$pkg.postinst configure >/dev/null 2>&1
+	
+  log="$log $pkg";
+
+  return 0;
+}
+
+if test ! -e /etc/.configured; then
+	test "$VERBOSE" != "no" && echo >$vtmaster "Starting at `date +%H:%M:%S`"
+  echo >$vtmaster -ne "\rReconfiguring all packages installed to root...\n\r\n\r";
+
+	# switch off console cursor
+	echo >$vtmaster -ne "\033[?25l"
+	
+  log="";
+
+	# number of root packages (not including dependencies)
+	maxcount=`ls -l /usr/lib/ipkg/info/*.control|wc -l|sed -e 's, ,,g'`
+	
+	curposition=0
+	for control in /usr/lib/ipkg/info/*.control; do
+		package=`echo $control|sed -e 's,.*/,,g; s,\.control,,g;'`
+		(echo $log|grep -q $package) || reconfigure $package /usr/lib/ipkg "$curposition" "$maxcount";
+		curposition=`expr $curposition + 1`
+  done
+
+  echo >$vtmaster -ne "$disp1 \033[1m${maxcount} of ${maxcount}\033[0m packages"	
+	echo >$vtmaster -ne "$disp2 Completed.\r\n"
+	test "$VERBOSE" != "no" && echo >$vtmaster "Finished at `date +%H:%M:%S`"
+
+	# switch on console cursor
+	echo >$vtmaster -ne "\033[?25h"
+fi
diff --git a/initscripts/initscripts-1.0-r0/packages_default b/initscripts/initscripts-1.0-r0/packages_default
deleted file mode 100644
index e69de29bb2..0000000000
--- a/initscripts/initscripts-1.0-r0/packages_default
+++ /dev/null
diff --git a/initscripts/initscripts-1.0-r0/packages_ramses b/initscripts/initscripts-1.0-r0/packages_ramses
deleted file mode 100644
index e69de29bb2..0000000000
--- a/initscripts/initscripts-1.0-r0/packages_ramses
+++ /dev/null
diff --git a/initscripts/initscripts-1.0-r0/devices_h3600 b/initscripts/initscripts-1.0-r0/ramses/packages
index e69de29bb2..e69de29bb2 100644
--- a/initscripts/initscripts-1.0-r0/devices_h3600
+++ b/initscripts/initscripts-1.0-r0/ramses/packages
diff --git a/initscripts/initscripts-1.0-r0/devices_simpad b/initscripts/initscripts-1.0-r0/uml/devices
index e69de29bb2..e69de29bb2 100644
--- a/initscripts/initscripts-1.0-r0/devices_simpad
+++ b/initscripts/initscripts-1.0-r0/uml/devices
diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 1593bda49a..70fc3dbfd4 100644
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -95,7 +95,7 @@ do_install () {
 	ln -sf		../init.d/urandom	${D}/etc/rcS.d/S55urandom
 #	ln -sf		../init.d/packages	${D}/etc/rcS.d/S98packages
 	ln -sf		../init.d/finish	${D}/etc/rcS.d/S99finish
-#	ln -sf		../init.d/devices	${D}/etc/rcS.d/S01devices
+	ln -sf		../init.d/devices	${D}/etc/rcS.d/S01devices
 #	ln -sf		../init.d/devpts.sh	${D}/etc/rcS.d/S31devpts.sh
 #	ln -sf		../init.d/ramdisk	${D}/etc/rcS.d/S30ramdisk