Modify Makefile to understand the new module structure.

diff --git a/Makefile b/Makefile
index dbc2a7d9d3fa1382da081ccfde60a2311f7df339..039ec9e64354d78e9b2deff41ea040cebe2abd3f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,10 @@ all:
 install:
        mkdir -p $(DESTDIR)/usr/libexec/dracut
        mkdir -p $(DESTDIR)/sbin
-       mkdir -p $(DESTDIR)/usr/libexec/dracut/hooks
-       mkdir -p $(DESTDIR)/usr/libexec/dracut/modules
+       mkdir -p $(DESTDIR)/usr/libexec/dracut/modules.d
        install -m 0755 dracut $(DESTDIR)/sbin/dracut
-       install -m 0755 init $(DESTDIR)/usr/libexec/dracut/init
-       install -m 0755 switch_root $(DESTDIR)/usr/libexec/dracut/switch_root
        install -m 0755 dracut-functions $(DESTDIR)/usr/libexec/dracut/functions
-       mkdir $(DESTDIR)/usr/libexec/dracut/rules.d
-       for rule in rules.d/*.rules ; do install -m 0644 $$rule $(DESTDIR)/usr/libexec/dracut ; done
-       for hook in hooks/*.sh ; do install -m 0755 $$hook $(DESTDIR)/usr/libexec/dracut ; done
-       for module in modules/*.sh; do install -m 0755 $$module $(DESTDIR)/usr/libexec/dracut ; done
+       for module in modules/*/*; do install -D -m 0755 $$module $(DESTDIR)/usr/libexec/dracut ; done
 clean:
        rm -f *~
 

diff --git a/dracut b/dracut
index 307824197720880814e56942852207bc26b2c86c..5811f5714416420d56aeba170ed23666b0270205 100755 (executable)
--- a/dracut
+++ b/dracut
@@ -34,7 +34,7 @@ if [[ -f $outfile && ! $force ]]; then
     exit 1
 fi
 
-[[ $allowlocal && -f ./init ]] && dsrc="." || dsrc=/usr/libexec/dracut
+[[ $allowlocal && -f dracut-functions ]] && dsrc="." || dsrc=/usr/libexec/dracut
 . $dsrc/dracut-functions
 initfile=$dsrc/init
 switchroot=$dsrc/switch_root