Changeset 775

Timestamp:

Dec 10, 2007 5:58:21 PM (5 years ago)

Author:

jrollins

Message:

debirf: see changelog

Location:

trunk/debirf

Files:

• debian/changelog (modified) (1 diff)
• docs/example-profiles/minimal/debirf.conf (modified) (1 diff)
• docs/example-profiles/rescue/debirf.conf (modified) (1 diff)
• docs/example-profiles/xkiosk/debirf.conf (modified) (1 diff)
• fs/usr/bin/make-debirf (modified) (6 diffs)
• fs/usr/share/debirf/debirf.conf.defaults (modified) (1 diff)

trunk/debirf/debian/changelog

@@ +1 @@
+debirf (0.9) unstable; urgency=low
+
+  * added DEBIRF_KERNEL_PACKAGE to debirf.conf
+  * added more informative error message when profile is malformed.
+
+ -- Jameson Rollins <jrollins@fifthhorseman.net>  Mon, 10 Dec 2007 17:52:43 -0500
+
 debirf (0.8) unstable; urgency=low
 

trunk/debirf/docs/example-profiles/minimal/debirf.conf

@@ -18 +18 @@
 #DEBIRF_DISTRO="lenny"
 
+# kernel, either a package name, or a path to a .deb
+# in either case, it must be a package or deb for a complete kernel,
+# not a metapackage.
+#DEBIRF_KERNEL_PACKAGE="linux-image-2.6.22-3-686"
+
 # proxy
 #export http_proxy=http://localhost:3128/

trunk/debirf/docs/example-profiles/rescue/debirf.conf

@@ -18 +18 @@
 #DEBIRF_DISTRO="lenny"
 
+# kernel, either a package name, or a path to a .deb
+# in either case, it must be a package or deb for a complete kernel,
+# not a metapackage.
+#DEBIRF_KERNEL_PACKAGE="linux-image-2.6.22-3-686"
+
 # proxy
 #export http_proxy=http://localhost:3128/

trunk/debirf/docs/example-profiles/xkiosk/debirf.conf

@@ -18 +18 @@
 #DEBIRF_DISTRO="lenny"
 
+# kernel, either a package name, or a path to a .deb
+# in either case, it must be a package or deb for a complete kernel,
+# not a metapackage.
+#DEBIRF_KERNEL_PACKAGE="linux-image-2.6.22-3-686"
+
 # proxy
 #export http_proxy=http://localhost:3128/

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

@@ -29 +29 @@
 usage() {
     cat <<EOF
-Usage: $CMD [options] profile kernel
+Usage: $CMD [options] profile [kernel]
 Create a debirf system.  'profile' is a path to a debirf profile
-directory, and 'kernel' is a kernel-img .deb, or a kernel package name.
+directory.  If a kernel is specified, it will override the kernel
+specified in the profile debirf.conf.
 
 options:
@@ -41 +42 @@
   -s|--skip          skip debootstrap step if old root exists
   -i|--initrd-only   do not create root, just create initramfs
+EOF
+}
+
+usage_profile() {
+    cat <<EOF
+It looks like your profile is not correctly formed.  You should begin
+by copying and modifying one of the example debirf profiles.
+On Debian, you should run:
+cp -r /usr/share/doc/debirf/example-profiles/<profile-name> . 
 EOF
 }
@@ -237 +247 @@
             fi
             DEBIRF_PROFILE="$1"
-            DEBIRF_KERNEL_PACKAGE="$2"
+            if [ "$2" ] ; then
+                DEBIRF_KERNEL_PACKAGE="$2"
+            fi
             break
             ;;
@@ -252 +264 @@
     DEBIRF_PLUGINS="$DEBIRF_PROFILE/plugins"
 else
-    failure "$DEBIRF_PROFILE not found.  Create a new profile with the '-p' option."
+    echo "$DEBIRF_PROFILE not found."
+    usage_profile
+    exit 1
 fi
 
@@ -259 +273 @@
     source "$DEBIRF_CONF"
 else
-    failure "$DEBIRF_CONF not found."
+    echo "$DEBIRF_CONF not found."
+    usage_profile
+    exit 1
 fi
 
 # check plugins directory
 if [ ! -d "$DEBIRF_PLUGINS" ] ; then
-    failure "$DEBIRF_PLUGINS does not exist."
+    echo "$DEBIRF_PLUGINS does not exist."
+    usage_profile
+    exit 1
 fi
 if [ $(ls "$DEBIRF_PLUGINS" -1 | wc -l) = 0 ] ; then
-    failure "$DEBIRF_PLUGINS is empty."
+    echo "$DEBIRF_PLUGINS is empty."
+    usage_profile
+    exit 1
 fi
 
@@ -307 +327 @@
         failure "Specified kernel package '$DEBIRF_KERNEL_PACKAGE' not found."
     fi
+else
+    echo "Using deb kernel package '$DEBIRF_KERNEL_PACKAGE'."
 fi
 

trunk/debirf/fs/usr/share/debirf/debirf.conf.defaults

@@ -18 +18 @@
 # what distribution should debirf be built from?
 DEBIRF_DISTRO=${DEBIRF_DISTRO:-"lenny"}
+
+# kernel, either a package name, or a path to a .deb
+# in either case, it must be a package or deb for a complete kernel,
+# not a metapackage.
+DEBIRF_KERNEL_PACKAGE=${DEBIRF_KERNEL_PACKAGE:-"linux-image-2.6.22-3-686"}