Changeset 894 for trunk/debirf/fs/usr/bin/debirf

Timestamp:

Jan 10, 2008 7:36:34 PM (5 years ago)

Author:

jrollins

Message:

debirf: a bunch of little changes to clean things up. also removed
old build-debirf-kernel.

File:

• trunk/debirf/fs/usr/bin/debirf (modified) (5 diffs)

trunk/debirf/fs/usr/bin/debirf

@@ -33 +33 @@
 
 # list of packages to include/exclude from debootstrap
-export INCLUDE=less
-export EXCLUDE=bsdmainutils,cron,ed,info,logrotate,man-db,manpages,tasksel,tasksel-data,tcpd,traceroute
+export INCLUDE=less,udhcpc
+export EXCLUDE=bsdmainutils,cron,ed,dhcp3-common,dhcp3-client,info,logrotate,man-db,manpages,tasksel,tasksel-data,tcpd,traceroute
 
 ###############################################################
@@ -62 +62 @@
     cat <<EOF
 It looks like your profile is not correctly formed.  Please refer to the
-README file included with this package.
-On Debian, unpack one of the example profiles from the debirf docs:
-tar xzvf /usr/share/doc/debirf/example-profiles/<profile-name>.tgz 
+README file included with this package on how to setup a profile.
 EOF
 }
@@ -282 +280 @@
     source "$DEBIRF_CONF"
 else
-    echo "$DEBIRF_CONF not found."
+    echo "Configuration file '$DEBIRF_CONF' not found."
     usage_profile
     exit 1
@@ -288 +286 @@
 
 # check modules directory
-if [ ! -d "$DEBIRF_MODULES" ] ; then
-    echo "$DEBIRF_MODULES does not exist."
+if [ ! -d "$DEBIRF_MODULES" ] || [ -z "$(ls "$DEBIRF_MODULES")" ] ; then
+    echo "Modules directoy '$DEBIRF_MODULES' does not exist or is empty."
     usage_profile
     exit 1
 fi
-if [ $(ls "$DEBIRF_MODULES" -1 | wc -l) = 0 ] ; then
-    echo "$DEBIRF_MODULES is empty."
-    usage_profile
-    exit 1
-fi
+for MODULE in $(find "$DEBIRF_MODULES") ; do
+    if [ ! -s "$MODULE" ] ; then
+        failure "Module '$MODULE' is a broken link or empty file."
+    fi
+done
 
 # check buildd
@@ -332 +330 @@
 # determine write mode
 if [ -d "$DEBIRF_ROOT" ] ; then
-    echo "Debirf root '$DEBIRF_ROOT' already exists."
+    echo "Debirf root already exists."
     if [ -z "$WRITE_MODE" ] ; then
         echo "Select one of the following:"