Changeset 374

Timestamp:

Mar 16, 2007 2:50:37 AM (6 years ago)

Author:

jrollins

Message:

debif: a couple of tweaks to clean up output.
modified serial-terminal console to not fail on discovering serial-terminal
already in inittab.
tweaked man page.

Location:

trunk/debirf/fs/usr

Files:

• sbin/make-debirf (modified) (10 diffs)
• share/debirf/common (modified) (1 diff)
• share/debirf/plugins/install-kernel (modified) (1 diff)
• share/debirf/plugins/serial-terminal (modified) (1 diff)
• share/man/man8/make-debirf.8 (modified) (1 diff)

trunk/debirf/fs/usr/sbin/make-debirf

@@ -39 +39 @@
 usage() {
 cat <<EOF
-Usage: $CMD kernel-image
+Usage: $CMD kernel-image.deb
 
-Creat a debirf initramfs.
+Create a debirf initramfs.
 
 Default config file: /etc/debirf/debirf.conf
@@ -67 +67 @@
 ## their first argument.
  
-### stupid simple method
+# stupid simple method
 create_initrd_stupid_simple() {
     #ln sbin/init to /init
@@ -73 +73 @@
     
     # create root image
-    debirf_msg "creating debirf initrd..."
+    msg "creating debirf initrd..."
     ( cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) > "$1"
 }
 
-### tweak initrd method: untested, probably doesn't work right yet.  soon!
+# tweak initrd method: untested, probably doesn't work right yet.  soon!
 create_initrd_tweak_initrd() {
     cat "$DEBIRF_ROOT"/scripts/debirf <<EOF
@@ -96 +96 @@
 EOF
     # create root image
-    debirf_msg "creating debirf initrd..."
+    msg "creating debirf initrd..."
     cp initrd.img* "$1"
     (cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) >> "$1"
@@ -107 +107 @@
 
 # check specified kernel package exists, and determine kernel name
-DEBIRF_KERNEL_PACKAGE="$1"
+export DEBIRF_KERNEL_PACKAGE="$1"
 if [ ! -f "$DEBIRF_KERNEL_PACKAGE" ] ; then
     echo "Specified kernel package $DEBIRF_KERNEL_PACKAGE not found."
@@ -116 +116 @@
 
 # check for common functions
-[ -f "$DEBIRF_COMMON" ] || debirf_fail "debirf function file $DEBIRF_COMMON not found."
+[ -f "$DEBIRF_COMMON" ] || failure "debirf function file $DEBIRF_COMMON not found."
 source "$DEBIRF_COMMON"
 
@@ -123 +123 @@
     read -p "Plugin directory $DEBIRF_PLUGINS not found.  Continue? [y|N]: " -n 1 OK ; [ -z $OK ] || echo
     if [ "${OK/y/Y}" != 'Y' ] ; then
-        debirf_fail "aborting."
+        failure "aborting."
     fi
 fi
@@ -131 +131 @@
     read -p "Directory $DEBIRF_ROOT already exists.  write over? [y|N]: " -n 1 OK ; [ -z $OK ] || echo
     if [ "${OK/y/Y}" = 'Y' ] ; then
-        debirf_msg "installing new root..."
+        msg "installing new root..."
         create_debootstrap
     fi
 else
-    debirf_msg "installing root..."
+    msg "installing root..."
     create_debootstrap
 fi
@@ -149 +149 @@
 
 # install plugins
-debirf_msg "installing plugins..."
+msg "installing plugins..."
 run_plugins
 
@@ -169 +169 @@
 # final output
 DEBIRF_KERNEL="vmlinu"*"$KERNAVAIL"
-debirf_msg "debirf initrd created."
+msg "debirf initrd created."
 if [ "$DEBIRF_INITRD/$DEBIRF_KERNEL" ] ; then
-    debirf_msg "kernel: $DEBIRF_PATH/"$DEBIRF_KERNEL
+    msg "kernel: $DEBIRF_PATH/"$DEBIRF_KERNEL
 fi
-debirf_msg "initrd: $DEBIRF_PATH/$DEBIRF_INITRD"
+msg "initrd: $DEBIRF_PATH/$DEBIRF_INITRD"

trunk/debirf/fs/usr/share/debirf/common

@@ -6 +6 @@
 
 # output debirf message to stdout
-debirf_msg() {
-    echo " debirf: $@"
+msg() {
+    echo "debirf: $@"
 }
-export -f debirf_msg
+export -f msg
 
 # cause debirf to exit immediately with message and exit code
 # failure message <exit-code>
-debirf_fail() {
+failure() {
     echo "$1" >&2
     exit ${2:-'1'}
 }
-export -f debirf_fail
+export -f failure
 
 # output info to the debirf.info file on the initramfs

trunk/debirf/fs/usr/share/debirf/plugins/install-kernel

@@ -33 +33 @@
 
 ##### install kernel
-msg "installing kernel..."
 install_kernel "$DEBIRF_KERNEL_PACKAGE"

trunk/debirf/fs/usr/share/debirf/plugins/serial-terminal

@@ -8 +8 @@
 if grep "$TTY" "$INITTAB" | grep -q -v "^[:space:]*#" ; then
     echo "inittab already has terminal on $TTY."
-    exit 1
-fi
-
-cat >> "$DEBIRF_ROOT"/etc/inittab <<EOF
+else
+    cat >> "$DEBIRF_ROOT"/etc/inittab <<EOF
 # debirf: added serial console output:
 T0:23:respawn:/sbin/getty -L ttyS0 115200 vt100
 EOF
+fi

trunk/debirf/fs/usr/share/man/man8/make-debirf.8

@@ -52 +52 @@
 ).
 .TP
-.B debirf_msg <message>
+.B msg <message>
 Output a message to standard out during the build process.
 .TP
-.B debirf_failure <message> <exit-code>
+.B failure <message> <exit-code>
 Cause make-debirf script to fail with <exit-code>, and <message> to stderr.
 .RE