Add --unionfs commandline option to enable building of unionfs-fuse

Add nounionfs boot option

diff --git a/ChangeLog b/ChangeLog
index ef19b2566e6db2742ab5fe119362a34d68fbce90..28cf05cf06819cb1a307b03e921719f4f829bfec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc,
+  gen_cmdline.sh, gen_determineargs.sh, genkernel:
+  Add --unionfs commandline option to enable building of unionfs-fuse Add
+  nounionfs boot option
+
   14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
   Add good_msg for creating the union mount
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 84b23a0aaf421d580788a6d51ea683059aa0b21f..d5e287029699e084056164bf7b8f58b77ed15481 100644 (file)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -192,6 +192,9 @@ do
                                USE_UNIONFS_NORMAL=1
                        fi
                        ;;
+               nounionfs)
+                       USE_UNIONFS_NORMAL=0
+                       ;;
 #                 unionfs\=*)   
 #                         if [ ! -x /sbin/unionfs ]     
 #                         then          

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 44f4802489df6f8e80bfe0640cc358de90871d0c..cd884aef3a3d1d4a288b3e4bc1d6eff8536c9295 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -90,6 +90,7 @@ longusage() {
   echo "       --luks                  Include LUKS support"
   echo "                               --> 'emerge cryptsetup-luks' with USE=-dynamic"
   echo "    --no-busybox    Do not include busybox in the initramfs."
+  echo "    --unionfs       Include support for unionfs"
   echo "  Internals"
   echo "       --arch-override=<arch>  Force to arch instead of autodetect"
   echo "       --cachedir=<dir>        Override the default cache location"
@@ -244,6 +245,10 @@ parse_cmdline() {
                        CMD_BUSYBOX=0
                        print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
                        ;;
+               --unionfs)
+                       CMD_UNIONFS=1
+                       print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}"
+                       ;;
                --slowusb)
                        CMD_SLOWUSB=1
                        print_info 2 "CMD_SLOWUSB: ${CMD_SLOWUSB}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index c47174bcd42ff8bcf0983cc534575d9060079663..85b137bb28fae250adc382ee558c92bb34035698 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -94,6 +94,7 @@ determine_real_args() {
        set_config_with_override 1 EVMS                 CMD_EVMS
        set_config_with_override 1 DMRAID               CMD_DMRAID
        set_config_with_override 1 BUSYBOX              CMD_BUSYBOX              "yes"
+       set_config_with_override 1 UNIONFS                              CMD_UNIONFS
        set_config_with_override 1 DISKLABEL            CMD_DISKLABEL
        set_config_with_override 1 LUKS                 CMD_LUKS
        set_config_with_override 1 MDADM                CMD_MDADM

diff --git a/genkernel b/genkernel
index 0d4b77d52692e38982b0867d383862a68939630f..8717df8182d33f19e2f1b64404984d2879889213 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -302,8 +302,11 @@ then
                compile_busybox
        fi
 
-       compile_unionfs_fuse
-    
+       if isTrue "${UNIONFS}"
+       then
+               compile_unionfs_fuse
+       fi
+
        # Compile initramfs
        create_initramfs
 else