Changeset 343

Timestamp:

Mar 14, 2007 12:39:34 PM (6 years ago)

Author:

jrollins

Message:

debirf: made some changes in how variables are passed and how the config
directory works. the default variables are not stored in the make-debirf script
itself. i also made the script fail if a kernel image is not specified on the
command line. added usage.

Location:

trunk/debirf

Files:

• etc/debirf/debirf.conf (modified) (1 diff)
• usr/sbin/make-debirf (modified) (4 diffs)

trunk/debirf/etc/debirf/debirf.conf

@@ -3 +3 @@
 
 # label for debirf system (for hostname and initrd)
-DEBIRF_LABEL=${DEBIRF_LABEL:-debirf}
+#DEBIRF_LABEL="debirf
 
 # where to build the debirf
-DEBIRF_PATH=${DEBIRF_PATH:-"/var/lib/debirf"}
+#DEBIRF_PATH="/var/lib/debirf"
 
 # the debirf root, used by plugins
-DEBIRF_ROOT=${DEBIRF_ROOT:-"$DEBIRF_PATH/root"}
+#DEBIRF_ROOT="$DEBIRF_PATH/root"
 
 # the plugins directory
-DEBIRF_PLUGINS=${DEBIRF_PLUGINS:-"/usr/share/debirf/plugins"}
+#DEBIRF_PLUGINS="/usr/share/debirf/plugins"
 
 # debirf boot method
-DEBIRF_METHOD=${DEBIRF_METHOD:-stupid_simple}
+#DEBIRF_METHOD="stupid_simple"
 
 # Debian mirror
-# DEBIRF_MIRROR="http://ftp.debian.org/debian"
-DEBIRF_MIRROR=${DEBIRF_MIRROR:-"http://mirrors.kernel.org/debian"}
+#DEBIRF_MIRROR="http://mirrors.kernel.org/debian"
 
 # what distribution should debirf be built from?
-DEBIRF_DISTRO=${DEBIRF_DISTRO:-etch}
+#DEBIRF_DISTRO="etch"

trunk/debirf/usr/sbin/make-debirf

@@ -3 +3 @@
 # DEBIRF creation script.  You must pass a kernel .deb as the first argument.
 
+###############################################################
+### VARIABLES
+
 CMD=$(basename $0)
-CMD_PATH=$(dirname $0)
 
 DEBIRF_CONF=${DEBIRF_CONF:-"/etc/debirf/debirf.conf"}
+[ -f "$DEBIRF_CONF" ] && source "$DEBIRF_CONF"
+
+### defaults
+# debirf label
+DEBIRF_LABEL=${DEBIRF_LABEL:-"debirf"}
+# where to build the debirf
+DEBIRF_PATH=${DEBIRF_PATH:-"/var/lib/debirf"}
+# the debirf root, used by plugins
+DEBIRF_ROOT=${DEBIRF_ROOT:-"$DEBIRF_PATH/root"}
+# the plugins directory
+DEBIRF_PLUGINS=${DEBIRF_PLUGINS:-"/usr/share/debirf/plugins"}
+# debirf boot method
+DEBIRF_METHOD=${DEBIRF_METHOD:-"stupid_simple"}
+# Debian mirror
+DEBIRF_MIRROR=${DEBIRF_MIRROR:-"http://mirrors.kernel.org/debian"}
+# what distribution should debirf be built from?
+DEBIRF_DISTRO=${DEBIRF_DISTRO:-"etch"}
 
 # set locale default
@@ -16 +35 @@
 ### FUNCTIONS
 
-failure(){
+usage() {
+cat <<EOF
+Usage: $CMD kernel-image
+
+Creat a debirf initramfs.
+
+Default config file: /etc/debirf/debirf.conf
+All config variables are bash shell variables.
+Specify alternate config file with "DEBIRF_CONF=".
+EOF
+}
+
+failure() {
     echo "$1" >&2
     exit ${2:-'1'}
@@ -110 +141 @@
 ### MAIN
 
-# some checks
-[ -f "$DEBIRF_CONF" ] || failure "$DEBIRF_CONF config file not found."
-source "$DEBIRF_CONF"
-
 # check specified kernel package exists, and determine kernel name
-if [ "$1" ]; then
-    DEBIRF_KERNEL_PACKAGE="$1"
-    [ -f "$DEBIRF_KERNEL_PACKAGE" ] || failure "Specified kernel package $DEBIRF_KERNEL_PACKAGE not found."
+DEBIRF_KERNEL_PACKAGE="$1"
+if [ ! -f "$DEBIRF_KERNEL_PACKAGE" ] ; then
+    echo "Specified kernel package $DEBIRF_KERNEL_PACKAGE not found."
+    echo
+    usage
+    exit 1
 fi
 
@@ -174 +204 @@
 
 # final output
-KERNEL="$DEBIRF_PATH/vmlinu"*
+KERNEL="$DEBIRF_PATH/vmlinu"*"$KERNAVAIL"
 if [ "$KERNEL" ] ; then
     msg "kernel: $KERNEL"