initrd: fixed setup, setup-helper, crux and rc files

diff --git a/filesystem/crux b/filesystem/crux
index 98de73dd90d788f93203b5c3c3b6358b524c08b9..85ddd0ecf61493cf5f74032ad21b2d55ad803506 100755 (executable)
--- a/filesystem/crux
+++ b/filesystem/crux
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-echo "CRUX-ARM 3.2"
+echo "CRUX-ARM 3.3"
 
 # End of file

diff --git a/filesystem/rc b/filesystem/rc
index 5f18d2a94a6cbda5d5c45ced5b8ce1e2e024af55..baf1581beb619ae82c1e414765969ed15f0fc130 100755 (executable)
--- a/filesystem/rc
+++ b/filesystem/rc
@@ -98,7 +98,7 @@ find_and_mount_media() {
 #
 
 echo ""
-echo -e "${BOLD}CRUX-ARM 3.2 - ${BLUE}http://crux-arm.nu/${NORM}"
+echo -e "${BOLD}CRUX-ARM 3.3 - ${BLUE}http://crux-arm.nu/${NORM}"
 echo ""
 
 exec >/dev/console </dev/console 2>&1

diff --git a/filesystem/setup b/filesystem/setup
index 88a0966cd003047df3ded7ec8758c128bd27a0a1..c1a72f41076a35476814cec0e2bde91e5da8aede 100755 (executable)
--- a/filesystem/setup
+++ b/filesystem/setup
@@ -22,7 +22,7 @@
 # USA.
 #
 
-VERSION="3.2"
+VERSION="3.3"
 
 do_dialog() {
     dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@"

diff --git a/filesystem/setup-helper b/filesystem/setup-helper
index 8076647bed6d150f903ac6b8422a8632ce11f2c5..c650c08c291abc20b523777a15901d472c245f4e 100755 (executable)
--- a/filesystem/setup-helper
+++ b/filesystem/setup-helper
@@ -102,13 +102,18 @@ for i in /media/crux/*; do.
        fi
 done
 
-##### # 3.1 -> 3.2 #####
-echo "* CRUX-ARM 3.1 -> 3.2 setup-helper"
+##### # 3.2 -> 3.3 #####
+echo "* CRUX-ARM 3.2 -> 3.3 setup-helper"
+
+inject_packages signify
 
 if grep -q opt $EXTRA_COLLECTIONS; then
-       if [ `is_installed pango` ]; then
-               inject_packages dash gperf start-stop-daemon
-       fi
+  if [ `is_installed firefox` ]; then
+    inject_packages autoconf-2.13
+  fi
+  if [ `is_installed xorg-server` ]; then
+    inject_packages xorg-libxfont2
+  fi
 fi
 
 # force replacement of /etc/mtab with symlink