--- mcore-src/trunk/mcore-tools/dracut/module-setup.sh.in 2014/01/20 10:11:41 2297 +++ mcore-src/trunk/mcore-tools/dracut/mcored/module-setup.sh.in 2014/07/11 13:58:30 2330 @@ -4,7 +4,7 @@ local _program . $dracutfunctions - for _program in iwconfig wpa_supplicant \ + for _program in iwconfig wpa_supplicant localectl \ chroot systemd-nspawn vncpasswd hostname mcored; do if ! type -P $_program >/dev/null; then derror "Could not find program \"$_program\" required by mcored." @@ -16,7 +16,7 @@ } depends() { - echo network + echo busybox systemd network } install() { @@ -31,15 +31,9 @@ dracut_install iwconfig wpa_supplicant chroot systemd-nspawn # mcored config stuff - dracut_install hwinfo vncpasswd + dracut_install hwinfo vncpasswd localectl # mcored - # install all busybox modules - dracut_install busybox - for __file in $(cat @@DATADIR@@/busybox/busybox.links) - do - inst_symlink ${__file} - done # install things which are needed but not provided by our busybox dracut_install find install sslsvd touch inst @@SYSCONFDIR@@/mageversion @@ -47,16 +41,11 @@ inst @@SSLDIR@@/private/mcored.key inst_dir @@MCORE_CHROOTDIR@@ inst @@CONFDDIR@@/mcored - inst @@SYSCONFDIR@@/mcore/mcore.conf inst @@SYSCONFDIR@@/mcoredpasswd - for __file in $(find @@MCORE_LIBDIR@@/include -type f) + for __file in $(find @@SYSCONFDIR@@/mcore @@MCORE_LIBDIR@@ -type f) do inst ${__file} done - inst @@MCORE_LIBDIR@@/mcored - inst @@MCORE_LIBDIR@@/mcore-generate-certificate - inst @@MCORE_LIBDIR@@/mcorepasswd - inst @@MCORE_LIBDIR@@/VERSION inst_symlink @@SBINDIR@@/mcored inst_symlink @@SBINDIR@@/mcorepasswd