]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
Merge branch 'optimization' of https://github.com/ryncsn/dracut into ryncsn-optimization
authorHarald Hoyer <harald@redhat.com>
Fri, 19 Jul 2019 13:48:22 +0000 (15:48 +0200)
committerHarald Hoyer <harald@redhat.com>
Fri, 19 Jul 2019 13:48:22 +0000 (15:48 +0200)
1  2 
dracut-init.sh
dracut.sh

diff --cc dracut-init.sh
index a2dba68f425d70d2ef996eabcc82b4d534bdb415,2fa1046667828d57c0761f1557cfc76edba8585b..c9043d64b4896239ddf3ac7a5acfa58fd8bc6b97
@@@ -150,10 -150,10 +150,14 @@@ dracut_module_included() 
      [[ " $mods_to_load $modules_loaded " == *\ $*\ * ]]
  }
  
 +dracut_no_switch_root() {
 +    >"$initdir/lib/dracut/no-switch-root"
 +}
 +
+ dracut_module_path() {
+     echo ${dracutbasedir}/modules.d/??${1} | { read a b; echo "$a"; }
+ }
  if ! [[ $DRACUT_INSTALL ]]; then
      DRACUT_INSTALL=$(find_binary dracut-install)
  fi
diff --cc dracut.sh
Simple merge