Changeset 691

Timestamp:

Nov 5, 2007 12:58:31 AM (6 years ago)

Author:

jrollins

Message:

debirf: added minimal profile, and tweaked the config file loading a
bit in make-debirf.

Location:

trunk/debirf

Files:

• COPYING (modified) (1 prop)
• debian/changelog (modified) (1 diff)
• debian/debirf.links (modified) (2 diffs)
• fs/etc/debirf/profiles/minimal (added)
• fs/etc/debirf/profiles/minimal/debirf.conf (added)
• fs/etc/debirf/profiles/minimal/plugins (added)
• fs/etc/debirf/profiles/rescue/debirf.conf (modified) (1 diff)
• fs/usr/sbin/make-debirf (modified) (4 diffs)
• fs/usr/share/debirf/common (modified) (1 diff)
• fs/usr/share/man/man8/make-debirf.8 (modified) (2 diffs)

trunk/debirf/debian/changelog

@@ -7 +7 @@
   * mknod /dev/ttyS0 in serial-terminal plugin
   * moved profiles directory to /etc/debirf/profiles
+  * added 'minimal' profile
 
- -- Jameson Rollins <jrollins@fifthhorseman.net>  Sat, 03 Nov 2007 01:19:19 -0400
+ -- Jameson Rollins <jrollins@fifthhorseman.net>  Mon, 05 Nov 2007 00:53:26 -0500
 
 debirf (0.4) unstable; urgency=low

trunk/debirf/debian/debirf.links

@@ +1 @@
+/usr/share/debirf/plugins/a0_store-config /etc/debirf/profiles/minimal/plugins/a0_store-config
+/usr/share/debirf/plugins/a0_motd /etc/debirf/profiles/minimal/plugins/a0_motd
+/usr/share/debirf/plugins/bootlog /etc/debirf/profiles/minimal/plugins/bootlog
+/usr/share/debirf/plugins/hostname /etc/debirf/profiles/minimal/plugins/hostname
+/usr/share/debirf/plugins/install-kernel /etc/debirf/profiles/minimal/plugins/install-kernel
+/usr/share/debirf/plugins/interfaces /etc/debirf/profiles/minimal/plugins/interfaces
+/usr/share/debirf/plugins/root-bashrc /etc/debirf/profiles/minimal/plugins/root-bashrc
+/usr/share/debirf/plugins/z0_remove-locales /etc/debirf/profiles/minimal/plugins/z0_remove-locales
+/usr/share/debirf/plugins/z1_apt-clean /etc/debirf/profiles/minimal/plugins/z1_apt-clean
+/usr/share/debirf/plugins/z2_motd_end /etc/debirf/profiles/minimal/plugins/z2_motd_end
+
 /usr/share/debirf/plugins/a0_store-config /etc/debirf/profiles/rescue/plugins/a0_store-config
 /usr/share/debirf/plugins/a0_motd /etc/debirf/profiles/rescue/plugins/a0_motd
@@ -11 +22 @@
 /usr/share/debirf/plugins/z1_apt-clean /etc/debirf/profiles/rescue/plugins/z1_apt-clean
 /usr/share/debirf/plugins/z2_motd_end /etc/debirf/profiles/rescue/plugins/z2_motd_end
-
-/etc/debirf/profiles/rescue /etc/debirf/profiles/default

trunk/debirf/fs/etc/debirf/profiles/rescue/debirf.conf

@@ -4 +4 @@
 
 # label for debirf system (for hostname and initrd)
-#DEBIRF_LABEL="debirf"
+DEBIRF_LABEL="debirf-resuce"
 
 # where to build the debirf

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

@@ -143 +143 @@
     1)
         DEBIRF_KERNEL_PACKAGE="$1"
-        echo "Profile not specified.  Setting profile to '$DEBIRF_PROFILE_DEFAULT'."
+        echo "Profile not specified.  Using default profile '$DEBIRF_PROFILE_DEFAULT'."
         DEBIRF_PROFILE="$DEBIRF_PROFILE_DEFAULT"
         ;;
@@ -162 +162 @@
 fi
 
+# source debirf.conf default
+source /usr/share/debirf/debirf.conf.defaults
+# source system debirf.conf
+if [ -f /etc/debirf/debirf.conf ] ; then
+    source /etc/debirf/debirf.conf
+fi
+
 # check for debirf profile
 if [ ! -d "$DEBIRF_PROFILE" ] ; then
@@ -168 +175 @@
     else
         echo "Profile '$DEBIRF_PROFILE' not found."
-        read -p "Continue? [y|N]: " OK
-        if [ -z "$OK" -o "${OK/y/Y}" != 'Y' ] ; then
+        read -p "Continue with defaults? [y|N]: " OK; OK=${OK:-N}
+        if [ "${OK/y/Y}" != 'Y' ] ; then
             failure "Aborting."
         fi
@@ -175 +182 @@
 fi
 
-DEBIRF_CONF=${DEBIRF_CONF:-"$DEBIRF_PROFILE/debirf.conf"}
-DEBIRF_PLUGINS=${DEBIRF_PLUGINS:-"$DEBIRF_PROFILE/plugins"}
-
-# find debirf.conf and set unset variables with defaults.
+DEBIRF_CONF="$DEBIRF_PROFILE/debirf.conf"
+DEBIRF_PLUGINS="$DEBIRF_PROFILE/plugins"
+
+# source profile debirf.conf
 if [ -f "$DEBIRF_CONF" ] ; then
     source "$DEBIRF_CONF"
-else
-    echo "debirf.conf not found.  Using defaults."
-    if [ /etc/debirf/debirf.conf ] ; then
-        source /etc/debirf/debirf.conf
-    fi
-fi
-source /usr/share/debirf/debirf.conf.defaults || failure "Could not source config defaults."
-
+fi
+  
 # check plugins
 if [ ! -d "$DEBIRF_PLUGINS" -o $(ls "$DEBIRF_PLUGINS" -1 | wc -l) = 0 ] ; then
     echo "Plugin directory '$DEBIRF_PLUGINS' is empty or does not exist."
-    read -p "Continue without plugins? [Y|n]: " OK
-    if [ "$OK" -a "${OK/y/Y}" != 'Y' ] ; then
+    read -p "Continue without plugins? [Y|n]: " OK; OK=${OK:-Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
         failure "Aborting."
     fi

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

@@ -17 +17 @@
 
 DEBIRF_PROFILED=${DEBIRF_PROFILED:-"/etc/debirf/profiles"}
-DEBIRF_PROFILE_DEFAULT=${DEBIRF_PROFILE_DEFAULT:-"$DEBIRF_PROFILED/default"}
+DEBIRF_PROFILE_DEFAULT=${DEBIRF_PROFILE_DEFAULT:-"$DEBIRF_PROFILED/rescue"}
 
 # set locale default

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

@@ -34 +34 @@
 A debirf profile is a directory in /etc/debirf/profiles or a full path
 to a directory that possibly contains a debirf.conf and/or 'plugins'
-sub-directory.  If a profile is not specified, the profile 'default'
+sub-directory.  If a profile is not specified, the profile 'rescue'
 is assumed.  If that profile is not found, the default variables will
 be used (see \fBENVIRONMENT\fP below).
@@ -107 +107 @@
 .TP
 /etc/debirf/debirf.conf
+System-wide configuration file.
+.TP
 /etc/debirf/profiles/<profile>/debirf.conf
-Default configuration file.
+Profile-specific configuration file.
 .TP
 $DEBIRF_ROOT/etc/debirf/debirf.info