Changeset 755

Timestamp:

Dec 3, 2007 12:43:52 AM (5 years ago)

Author:

jrollins

Message:

debirf: added getopt command line argument parsing, and tweaked
install-kernel plugin a bit.

Location:

trunk/debirf

Files:

• debian/changelog (modified) (1 diff)
• fs/usr/bin/make-debirf (modified) (4 diffs)
• fs/usr/share/debirf/plugins/install-kernel (modified) (3 diffs)

trunk/debirf/debian/changelog

@@ -4 +4 @@
   * added ability to run make-debirf with fakechroot ('-f' option).  there are problems creating the device tree with this method, though, so it is still underdevelopment.
   * modified debootstrap, plugin run-parts, and debirf_exec to also use fakechroot
-  * being root *should* no longer be necessary to make-debirf, therefore make-debirf was moved to /usr/bin/
-  * debirf can now function with stock debian kernels (as of 2.6.22), in rootfs
+  * being root *should* no longer be necessary to make-debirf, therefore make-debirf has been moved to /usr/bin/
+  * debirf can now function in rootfs with stock debian kernels (as of 2.6.22)
   * removed /var/lib/debirf
   * removed /etc/debirf in favor of doc/example-profiles
   * added xkiosk plugin to start X session with browser on startup
+  * added xkiosk profile
+  * added getopt for command line argument checking
+  * added command line arguments to skip some checking/user interaction
+  * can now pass kernel package name to make-debirf, instead of just deb, although proper package checking is not fully working
 
- -- Jameson Rollins <jrollins@fifthhorseman.net>  Sun, 02 Dec 2007 12:00:32 -0500
+ -- Jameson Rollins <jrollins@fifthhorseman.net>  Mon, 03 Dec 2007 00:40:46 -0500
 
 debirf (0.5) unstable; urgency=low

trunk/debirf/fs/usr/bin/make-debirf

@@ -27 +27 @@
     cat <<EOF
 Usage: $CMD [options] profile kernel-image.deb|kernel-package-name
+Build a debirf diskless image.
+'profile' is a path to a debirf profile directory.
 
 options:
-  -f         fakechroot build (other wise requires being root)
+  -h|--help          this help message
+  -f|--fakechroot    fakechroot build (other wise requires being root)
+  -c|--check-vars    check variables before make
+  -n|--new           create new root, even if old one exists
+  -o|--overwrite     debootstrap on top of old root if it exists
+  -s|--skip          skip debootstrap step if old root exists
 EOF
 }
@@ -39 +46 @@
 
 create_debootstrap() {
-    msg "creating debirf root..."
-    # include initramfs-tools because they'll be handy
     mkdir -p "$DEBIRF_ROOT"
     if [ "$FAKECHROOT_BUILD" = 'true' ] ; then
@@ -176 +181 @@
 ### MAIN
 
-#trap umount_proc-sys EXIT
-
-if [ "$1" = '-h' -o "$1" = '--help' ] ; then
+# option parsing
+TEMP=$(getopt --options -hfcnos --longoptions help,fakechroot,check-vars,new,overwrite,skip -n "$CMD" -- "$@")
+
+if [ $? != 0 ] ; then
+    echo "Invalid options." >&2 
     usage
-    exit 0
-fi
-
-case $# in
-    2)
-        DEBIRF_PROFILE="$1"
-        DEBIRF_KERNEL_PACKAGE="$2"
-        ;;
-    3)
-        if [ "$1" = '-f' ] ; then
+    exit 1
+fi
+
+# Note the quotes around `$TEMP': they are essential!
+eval set -- "$TEMP"
+
+while true ; do
+    case "$1" in
+        -h|--help)
+            usage
+            exit 0
+            ;;
+        -f|--fakechroot)
             echo "Using fakechroot build."
             FAKECHROOT_BUILD=true
-        else
-            failure "Improper input arguments."
-        fi
-        DEBIRF_PROFILE="$2"
-        DEBIRF_KERNEL_PACKAGE="$3"
-        ;;
-    *)
-        echo "Improper number of input arguments."
-        usage
-        exit 1
-        ;;
-esac
+            shift 1
+            ;;
+        -c|--check-vars)
+            CHECK_VARS=true
+            shift 1
+            ;;
+        -n|--new)
+            WRITE_MODE=rewrite
+            shift 1
+            ;;
+        -o|--overwrite)
+            WRITE_MODE=overwrite
+            shift 1
+            ;;
+        -s|--skip)
+            WRITE_MODE=skip
+            shift 1
+            ;;
+        --)
+            shift
+            ;;
+        *)
+            if (( $# < 1 )) ; then
+                echo "Improper number of input arguments."
+                usage
+                exit 1
+            fi
+            DEBIRF_PROFILE="$1"
+            DEBIRF_KERNEL_PACKAGE="$2"
+            break
+            ;;
+    esac
+done
 
 # check specified kernel package exists
@@ -263 +294 @@
 
 # check variables
-echo "Debirf variables:"
-for var in ${!DEBIRF_*}; do
-    if [ $var ] ; then
-        export $var
-    else
-        failure "Variable '$var' not properly set."
-    fi
-done
-env | /bin/grep "^DEBIRF_"
-read -p "enter to continue: " OK
+if [ "$CHECK_VARS" ] ; then
+    echo "Debirf variables:"
+    for var in ${!DEBIRF_*}; do
+        if [ $var ] ; then
+            export $var
+        else
+            failure "Variable '$var' not properly set."
+        fi
+    done
+    env | /bin/grep "^DEBIRF_"
+    read -p "enter to continue: " OK
+fi
 
 # create debootstrap root
 if [ -d "$DEBIRF_ROOT" ] ; then
     echo "Directory $DEBIRF_ROOT already exists."
-    echo "Select one of the following:"
-    select foo in 'rewrite' 'overwrite' 'skip' 'exit' ; do
-        case "$foo" in
-            'wipe & rewrite')
-                msg "clearing old debirf root..."
-                rm -rf "$DEBIRF_ROOT"
-                create_debootstrap
-                ;;
-            'overwrite')
-                create_debootstrap
-                ;;
-            'skip')
-                ;;
-            *)
-                failure "aborting."
-                ;;
-        esac
-        break
-    done
+    if [ -z "$WRITE_MODE" ] ; then
+        echo "Select one of the following:"
+        select foo in 'new' 'overwrite' 'skip' 'exit' ; do
+            case "$foo" in
+                'new')
+                    WRITE_MODE=rewrite
+                    ;;
+                'overwrite')
+                    WRITE_MODE=overwrite
+                    ;;
+                'skip')
+                    WRITE_MODE=skip
+                    ;;
+                *)
+                    failure "aborting."
+                    ;;
+            esac
+            break
+        done
+    fi
 else
-    create_debootstrap
-fi
+    WRITE_MODE=new
+fi
+case "$WRITE_MODE" in
+    'new')
+        msg "creating debirf root..."
+        create_debootstrap
+        ;;
+    'rewrite')
+        msg "clearing old debirf root..."
+        rm -rf "$DEBIRF_ROOT"
+        msg "creating debirf root..."
+        create_debootstrap
+        ;;
+    'overwrite')
+        msg "overwriting old debirf root..."
+        create_debootstrap
+        ;;
+    'skip')
+        msg "skipping debootstrap..."
+        ;;
+    *)
+        failure "aborting."
+        ;;
+esac
 
 setup_debirf_info

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

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
 # debirf plugin: install-kernel
@@ -26 +26 @@
 
 install_kernel_apt() {
-    debirf_exec apt-get --assume-yes --force-yes -f install "$1"
+    debirf_exec apt-get --assume-yes install "$1"
 }
 
@@ -33 +33 @@
     cat >"$DEBIRF_ROOT/etc/kernel-img.conf" <<EOF
 # debirf: default kernel-img options:
-do_symlinks = yes
+do_symlinks = no
 do_bootloader = no
-do_initrd = yes
+warn_initrd = no
+silent_modules = yes
 EOF