Adding clean parameter to lh_config to minimize config directory by automatically removing unused and thus empty subdirectories.

2 files changed, 19 insertions, 1 deletions

diff --git a/helpers/lh_config b/helpers/lh_config
index c0cd61839..4b4118699 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -55,6 +55,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--chroot-build enabled|disabled]\n\
 \t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
 \t    [-c|--conffile FILE]\n\
+\t    [--clean\n\
 \t    [--debconf-frontend dialog|editor|noninteractive|readline]\n\
 \t    [--debconf-nowarnings enabled|disabled]\n\
 \t    [--debconf-priority low|medium|high|critical]\n\
@@ -130,7 +131,7 @@ Local_arguments ()
 		apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,genisoimage:,
 		initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
-		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,
+		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
 		mirror-binary-security:,categories:,chroot-filesystem:,union-filesystem:,exposed-root:,
 		hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
@@ -194,6 +195,19 @@ Local_arguments ()
 				exit 0
 				;;
 
+			clean)
+				# Remove empty directories in config tree
+				if ls config/*/ > /dev/null 2>&1
+				then
+					rmdir --ignore-fail-on-non-empty config/*/
+				fi
+
+				if [ -d config ]
+				then
+					rmdir --ignore-fail-on-non-empty config
+				fi
+				;;
+
 			# config/common
 			--apt)
 				LH_APT="${2}"
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index dcb67fdfb..80f7d174a 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -60,6 +60,8 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2]
 .br
+	[\fB\-\-clean]
+.br
 	[\-c|\fB\-\-conffile\fR \fIFILE\fR]
 .br
 	[\fB\-\-debconf\-frontend\fR dialog|editor|noninteractive|readline]
@@ -254,6 +256,8 @@ defines if the binary image should contain a file called md5sums.txt that lists
 defines whetever live-helper should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
 .IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2" 4
 defines which filesystem type should be used for the root filesystem image. If you use plain, then no filesystem image is created and the root filesystem content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with a plain root filesystem, e.g. fat16/fat32 and plain don't work as linux does not support to run on them.
+.IP "\fB\-\-clean\fR" 4
+minimizes config directory by automatically removing unused and thus empty subdirectories.
 .IP "\-c|\fB\-\-conffile\fR \fIFILE\fR" 4
 using a user specified alternative configuration file in addition to the normally used one in the config directory.
 .IP "\fB\-\-debconf\-frontend\fR dialog|editor|noninteractive|readline" 4