fixed -c parameter handling and Makefile

diff --git a/Makefile b/Makefile
index a40b8ee48fff80f4a13ba5d38768f3120df8f942..215844885d7668fd4cbba785ff13172cfa3c4bbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,5 +31,5 @@ rpm: dracut-$(VERSION)-$(GITVERSION).tar.bz2
        rm -fr BUILD BUILDROOT
 
 testimage: all
-       ./dracut -l -f test-$(shell uname -r).img $(shell uname -r)
+       ./dracut -l -c ./dracut.conf -f test-$(shell uname -r).img $(shell uname -r)
        @echo wrote  test-$(shell uname -r).img 

diff --git a/dracut b/dracut
index dad66877e85a0629c49b09be0235394f8b4e8748..2bebabe1bca2f801ac5a99a356ebbcd250564450 100755 (executable)
--- a/dracut
+++ b/dracut
@@ -16,7 +16,7 @@ while (($# > 0)); do
        -h|--help) echo "Usage: $0 [-f] <initramfs> <kernel-version>"
            exit 1 ;;
        -v|--verbose) set -x;;
-       -c|--conf) conffile="$2" ;;
+       -c|--conf) conffile="$2"; shift;;
        -l|--local) allowlocal="yes" ;;
        --allow-missing) : ;;
        *) break ;;