From: Victor Martinez <pitillo@ono.com>
Date: Mon, 27 Feb 2017 03:09:09 +0000 (+0000)
Subject: initrd: fixed setup, setup-helper, crux and rc files
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=refs%2Fheads%2F3.3;p=initrd.git

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

diff --git a/filesystem/crux b/filesystem/crux
index 98de73d..85ddd0e 100755
--- 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 5f18d2a..baf1581 100755
--- 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 88a0966..c1a72f4 100755
--- 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 8076647..c650c08 100755
--- 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