From: Andrew Gaffney <agaffney@gentoo.org>
Date: Fri, 14 Nov 2008 20:50:57 +0000 (-0600)
Subject: Add --unionfs commandline option to enable building of unionfs-fuse
X-Git-Tag: v3.4.10.902~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d07862bb8e1344f3da6aff6bc3c1ebdb0f6a08fc;p=genkernel.git

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

diff --git a/ChangeLog b/ChangeLog
index ef19b25..28cf05c 100644
--- 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 84b23a0..d5e2870 100644
--- 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 44f4802..cd884ae 100755
--- 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 c47174b..85b137b 100644
--- 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 0d4b77d..8717df8 100755
--- 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